some crossed out text%A', $page->html);
$pageView = $this->get($page->getUrl());
- $pageView->assertElementExists('.page-content p > s');
+ $this->withHtml($pageView)->assertElementExists('.page-content p > s');
}
public function test_page_markdown_single_html_comment_saving()
diff --git a/tests/Entity/PageDraftTest.php b/tests/Entity/PageDraftTest.php
index cac1babea..0b44e5f0b 100644
--- a/tests/Entity/PageDraftTest.php
+++ b/tests/Entity/PageDraftTest.php
@@ -31,27 +31,27 @@ class PageDraftTest extends TestCase
{
$addedContent = 'test message content
';
- $this->asAdmin()->get($this->page->getUrl('/edit'))
- ->assertElementNotContains('[name="html"]', $addedContent);
+ $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
+ $this->withHtml($resp)->assertElementNotContains('[name="html"]', $addedContent);
$newContent = $this->page->html . $addedContent;
$this->pageRepo->updatePageDraft($this->page, ['html' => $newContent]);
- $this->asAdmin()->get($this->page->getUrl('/edit'))
- ->assertElementContains('[name="html"]', $newContent);
+ $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
+ $this->withHtml($resp)->assertElementContains('[name="html"]', $newContent);
}
public function test_draft_not_visible_by_others()
{
$addedContent = 'test message content
';
- $this->asAdmin()->get($this->page->getUrl('/edit'))
- ->assertElementNotContains('[name="html"]', $addedContent);
+ $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
+ $this->withHtml($resp)->assertElementNotContains('[name="html"]', $addedContent);
$newContent = $this->page->html . $addedContent;
$newUser = $this->getEditor();
$this->pageRepo->updatePageDraft($this->page, ['html' => $newContent]);
- $this->actingAs($newUser)->get($this->page->getUrl('/edit'))
- ->assertElementNotContains('[name="html"]', $newContent);
+ $resp = $this->actingAs($newUser)->get($this->page->getUrl('/edit'));
+ $this->withHtml($resp)->assertElementNotContains('[name="html"]', $newContent);
}
public function test_alert_message_shows_if_editing_draft()
@@ -66,8 +66,8 @@ class PageDraftTest extends TestCase
{
$nonEditedPage = Page::query()->take(10)->get()->last();
$addedContent = 'test message content
';
- $this->asAdmin()->get($this->page->getUrl('/edit'))
- ->assertElementNotContains('[name="html"]', $addedContent);
+ $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
+ $this->withHtml($resp)->assertElementNotContains('[name="html"]', $addedContent);
$newContent = $this->page->html . $addedContent;
$newUser = $this->getEditor();
@@ -77,8 +77,8 @@ class PageDraftTest extends TestCase
->get($this->page->getUrl('/edit'))
->assertSee('Admin has started editing this page');
$this->flushSession();
- $this->get($nonEditedPage->getUrl() . '/edit')
- ->assertElementNotContains('.notification', 'Admin has started editing this page');
+ $resp = $this->get($nonEditedPage->getUrl() . '/edit');
+ $this->withHtml($resp)->assertElementNotContains('.notification', 'Admin has started editing this page');
}
public function test_draft_save_shows_alert_if_draft_older_than_last_page_update()
@@ -142,12 +142,12 @@ class PageDraftTest extends TestCase
{
/** @var Book $book */
$book = Book::query()->first();
- $this->asAdmin()->get('/')
- ->assertElementNotContains('#recent-drafts', 'New Page');
+ $resp = $this->asAdmin()->get('/');
+ $this->withHtml($resp)->assertElementNotContains('#recent-drafts', 'New Page');
$this->get($book->getUrl() . '/create-page');
- $this->get('/')->assertElementContains('#recent-drafts', 'New Page');
+ $this->withHtml($this->get('/'))->assertElementContains('#recent-drafts', 'New Page');
}
public function test_draft_pages_not_visible_by_others()
@@ -159,13 +159,13 @@ class PageDraftTest extends TestCase
$this->actingAs($newUser)->get($book->getUrl('/create-page'));
$this->get($chapter->getUrl('/create-page'));
- $this->get($book->getUrl())
- ->assertElementContains('.book-contents', 'New Page');
+ $resp = $this->get($book->getUrl());
+ $this->withHtml($resp)->assertElementContains('.book-contents', 'New Page');
- $this->asAdmin()->get($book->getUrl())
- ->assertElementNotContains('.book-contents', 'New Page');
- $this->get($chapter->getUrl())
- ->assertElementNotContains('.book-contents', 'New Page');
+ $resp = $this->asAdmin()->get($book->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.book-contents', 'New Page');
+ $resp = $this->get($chapter->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.book-contents', 'New Page');
}
public function test_page_html_in_ajax_fetch_response()
diff --git a/tests/Entity/PageEditorTest.php b/tests/Entity/PageEditorTest.php
index d4e565435..e5aa549b3 100644
--- a/tests/Entity/PageEditorTest.php
+++ b/tests/Entity/PageEditorTest.php
@@ -22,7 +22,7 @@ class PageEditorTest extends TestCase
{
$this->assertEquals('wysiwyg', setting('app-editor'));
$resp = $this->asAdmin()->get($this->page->book->getUrl('/create-page'));
- $this->followRedirects($resp)->assertElementExists('#html-editor');
+ $this->withHtml($this->followRedirects($resp))->assertElementExists('#html-editor');
}
public function test_markdown_setting_shows_markdown_editor_for_new_pages()
@@ -30,7 +30,7 @@ class PageEditorTest extends TestCase
$this->setSettings(['app-editor' => 'markdown']);
$resp = $this->asAdmin()->get($this->page->book->getUrl('/create-page'));
- $this->followRedirects($resp)
+ $this->withHtml($this->followRedirects($resp))
->assertElementNotExists('#html-editor')
->assertElementExists('#markdown-editor');
}
@@ -42,8 +42,8 @@ class PageEditorTest extends TestCase
$this->page->editor = 'markdown';
$this->page->save();
- $this->asAdmin()->get($this->page->getUrl('/edit'))
- ->assertElementContains('[name="markdown"]', $mdContent);
+ $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
+ $this->withHtml($resp)->assertElementContains('[name="markdown"]', $mdContent);
}
public function test_html_content_given_to_editor_if_no_markdown()
@@ -51,8 +51,8 @@ class PageEditorTest extends TestCase
$this->page->editor = 'markdown';
$this->page->save();
- $this->asAdmin()->get($this->page->getUrl() . '/edit')
- ->assertElementContains('[name="markdown"]', $this->page->html);
+ $resp = $this->asAdmin()->get($this->page->getUrl() . '/edit');
+ $this->withHtml($resp)->assertElementContains('[name="markdown"]', $this->page->html);
}
public function test_empty_markdown_still_saves_without_error()
@@ -91,19 +91,19 @@ class PageEditorTest extends TestCase
// Book draft goes back to book
$resp = $this->get($book->getUrl("/draft/{$draft->id}"));
- $resp->assertElementContains('a[href="' . $book->getUrl() . '"]', 'Back');
+ $this->withHtml($resp)->assertElementContains('a[href="' . $book->getUrl() . '"]', 'Back');
// Chapter draft goes back to chapter
$draft->chapter_id = $chapter->id;
$draft->save();
$resp = $this->get($book->getUrl("/draft/{$draft->id}"));
- $resp->assertElementContains('a[href="' . $chapter->getUrl() . '"]', 'Back');
+ $this->withHtml($resp)->assertElementContains('a[href="' . $chapter->getUrl() . '"]', 'Back');
// Saved page goes back to page
$this->post($book->getUrl("/draft/{$draft->id}"), ['name' => 'Updated', 'html' => 'Updated']);
$draft->refresh();
$resp = $this->get($draft->getUrl('/edit'));
- $resp->assertElementContains('a[href="' . $draft->getUrl() . '"]', 'Back');
+ $this->withHtml($resp)->assertElementContains('a[href="' . $draft->getUrl() . '"]', 'Back');
}
public function test_switching_from_html_to_clean_markdown_works()
@@ -116,7 +116,7 @@ class PageEditorTest extends TestCase
$resp = $this->asAdmin()->get($page->getUrl('/edit?editor=markdown-clean'));
$resp->assertStatus(200);
$resp->assertSee("## A Header\n\nSome **bold** content.");
- $resp->assertElementExists('#markdown-editor');
+ $this->withHtml($resp)->assertElementExists('#markdown-editor');
}
public function test_switching_from_html_to_stable_markdown_works()
@@ -129,7 +129,7 @@ class PageEditorTest extends TestCase
$resp = $this->asAdmin()->get($page->getUrl('/edit?editor=markdown-stable'));
$resp->assertStatus(200);
$resp->assertSee('A Header
Some bold content.
', true);
- $resp->assertElementExists('[component="markdown-editor"]');
+ $this->withHtml($resp)->assertElementExists('[component="markdown-editor"]');
}
public function test_switching_from_markdown_to_wysiwyg_works()
@@ -142,40 +142,40 @@ class PageEditorTest extends TestCase
$resp = $this->asAdmin()->get($page->getUrl('/edit?editor=wysiwyg'));
$resp->assertStatus(200);
- $resp->assertElementExists('[component="wysiwyg-editor"]');
+ $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor"]');
$resp->assertSee("A Header
\nSome content with bold text!
", true);
}
public function test_page_editor_changes_with_editor_property()
{
$resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
- $resp->assertElementExists('[component="wysiwyg-editor"]');
+ $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor"]');
$this->page->markdown = "## A Header\n\nSome content with **bold** text!";
$this->page->editor = 'markdown';
$this->page->save();
$resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
- $resp->assertElementExists('[component="markdown-editor"]');
+ $this->withHtml($resp)->assertElementExists('[component="markdown-editor"]');
}
public function test_editor_type_switch_options_show()
{
$resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
$editLink = $this->page->getUrl('/edit') . '?editor=';
- $resp->assertElementContains("a[href=\"${editLink}markdown-clean\"]", '(Clean Content)');
- $resp->assertElementContains("a[href=\"${editLink}markdown-stable\"]", '(Stable Content)');
+ $this->withHtml($resp)->assertElementContains("a[href=\"${editLink}markdown-clean\"]", '(Clean Content)');
+ $this->withHtml($resp)->assertElementContains("a[href=\"${editLink}markdown-stable\"]", '(Stable Content)');
$resp = $this->asAdmin()->get($this->page->getUrl('/edit?editor=markdown-stable'));
$editLink = $this->page->getUrl('/edit') . '?editor=';
- $resp->assertElementContains("a[href=\"${editLink}wysiwyg\"]", 'Switch to WYSIWYG Editor');
+ $this->withHtml($resp)->assertElementContains("a[href=\"${editLink}wysiwyg\"]", 'Switch to WYSIWYG Editor');
}
public function test_editor_type_switch_options_dont_show_if_without_change_editor_permissions()
{
$resp = $this->asEditor()->get($this->page->getUrl('/edit'));
$editLink = $this->page->getUrl('/edit') . '?editor=';
- $resp->assertElementNotExists("a[href*=\"${editLink}\"]");
+ $this->withHtml($resp)->assertElementNotExists("a[href*=\"${editLink}\"]");
}
public function test_page_editor_type_switch_does_not_work_without_change_editor_permissions()
@@ -187,8 +187,8 @@ class PageEditorTest extends TestCase
$resp = $this->asEditor()->get($page->getUrl('/edit?editor=markdown-stable'));
$resp->assertStatus(200);
- $resp->assertElementExists('[component="wysiwyg-editor"]');
- $resp->assertElementNotExists('[component="markdown-editor"]');
+ $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor"]');
+ $this->withHtml($resp)->assertElementNotExists('[component="markdown-editor"]');
}
public function test_page_save_does_not_change_active_editor_without_change_editor_permissions()
diff --git a/tests/Entity/PageRevisionTest.php b/tests/Entity/PageRevisionTest.php
index ce203ea36..cc4900249 100644
--- a/tests/Entity/PageRevisionTest.php
+++ b/tests/Entity/PageRevisionTest.php
@@ -211,11 +211,11 @@ class PageRevisionTest extends TestCase
$this->asAdmin()->put($page->getUrl(), ['name' => 'Updated page', 'html' => 'new page html']);
$resp = $this->get($page->refresh()->getUrl('/revisions'));
- $resp->assertElementContains('td', '(WYSIWYG)');
- $resp->assertElementNotContains('td', '(Markdown)');
+ $this->withHtml($resp)->assertElementContains('td', '(WYSIWYG)');
+ $this->withHtml($resp)->assertElementNotContains('td', '(Markdown)');
$this->asAdmin()->put($page->getUrl(), ['name' => 'Updated page', 'markdown' => '# Some markdown content']);
$resp = $this->get($page->refresh()->getUrl('/revisions'));
- $resp->assertElementContains('td', '(Markdown)');
+ $this->withHtml($resp)->assertElementContains('td', '(Markdown)');
}
}
diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php
index efe5400a0..734516e87 100644
--- a/tests/Entity/PageTest.php
+++ b/tests/Entity/PageTest.php
@@ -19,7 +19,7 @@ class PageTest extends TestCase
]);
$resp = $this->asEditor()->get($chapter->getUrl());
- $resp->assertElementContains('a[href="' . $chapter->getUrl('/create-page') . '"]', 'New Page');
+ $this->withHtml($resp)->assertElementContains('a[href="' . $chapter->getUrl('/create-page') . '"]', 'New Page');
$resp = $this->get($chapter->getUrl('/create-page'));
/** @var Page $draftPage */
@@ -30,7 +30,7 @@ class PageTest extends TestCase
$resp->assertRedirect($draftPage->getUrl());
$resp = $this->get($draftPage->getUrl());
- $resp->assertElementContains('form[action="' . $draftPage->getUrl() . '"][method="POST"]', 'Save Page');
+ $this->withHtml($resp)->assertElementContains('form[action="' . $draftPage->getUrl() . '"][method="POST"]', 'Save Page');
$resp = $this->post($draftPage->getUrl(), $draftPage->only('name', 'html'));
$draftPage->refresh();
@@ -98,7 +98,7 @@ class PageTest extends TestCase
$this->assertTrue($page->deletions()->count() === 1);
$redirectReq = $this->get($deleteReq->baseResponse->headers->get('location'));
- $redirectReq->assertNotificationContains('Page Successfully Deleted');
+ $this->assertNotificationContains($redirectReq, 'Page Successfully Deleted');
}
public function test_page_full_delete_removes_all_revisions()
@@ -257,8 +257,8 @@ class PageTest extends TestCase
$user = $this->getEditor();
$content = $this->createEntityChainBelongingToUser($user);
- $this->asAdmin()->get('/pages/recently-updated')
- ->assertElementContains('.entity-list .page:nth-child(1)', $content['page']->name);
+ $resp = $this->asAdmin()->get('/pages/recently-updated');
+ $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', $content['page']->name);
}
public function test_recently_updated_pages_view_shows_updated_by_details()
@@ -273,7 +273,7 @@ class PageTest extends TestCase
]);
$resp = $this->asAdmin()->get('/pages/recently-updated');
- $resp->assertElementContains('.entity-list .page:nth-child(1)', 'Updated 1 second ago by ' . $user->name);
+ $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', 'Updated 1 second ago by ' . $user->name);
}
public function test_recently_updated_pages_view_shows_parent_chain()
@@ -288,8 +288,8 @@ class PageTest extends TestCase
]);
$resp = $this->asAdmin()->get('/pages/recently-updated');
- $resp->assertElementContains('.entity-list .page:nth-child(1)', $page->chapter->getShortName(42));
- $resp->assertElementContains('.entity-list .page:nth-child(1)', $page->book->getShortName(42));
+ $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', $page->chapter->getShortName(42));
+ $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', $page->book->getShortName(42));
}
public function test_recently_updated_pages_view_does_not_show_parent_if_not_visible()
@@ -309,7 +309,7 @@ class PageTest extends TestCase
$resp = $this->get('/pages/recently-updated');
$resp->assertDontSee($page->book->getShortName(42));
$resp->assertDontSee($page->chapter->getShortName(42));
- $resp->assertElementContains('.entity-list .page:nth-child(1)', 'Updated title');
+ $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', 'Updated title');
}
public function test_recently_updated_pages_on_home()
@@ -320,15 +320,15 @@ class PageTest extends TestCase
'updated_at' => Carbon::now()->subSecond(1),
]);
- $this->asAdmin()->get('/')
- ->assertElementNotContains('#recently-updated-pages', $page->name);
+ $resp = $this->asAdmin()->get('/');
+ $this->withHtml($resp)->assertElementNotContains('#recently-updated-pages', $page->name);
$this->put($page->getUrl(), [
'name' => $page->name,
'html' => $page->html,
]);
- $this->get('/')
- ->assertElementContains('#recently-updated-pages', $page->name);
+ $resp = $this->get('/');
+ $this->withHtml($resp)->assertElementContains('#recently-updated-pages', $page->name);
}
}
diff --git a/tests/Entity/SortTest.php b/tests/Entity/SortTest.php
index 7b10278b0..8792e70db 100644
--- a/tests/Entity/SortTest.php
+++ b/tests/Entity/SortTest.php
@@ -247,7 +247,7 @@ class SortTest extends TestCase
$bookToSort = Book::query()->first();
$resp = $this->asAdmin()->get($bookToSort->getUrl());
- $resp->assertElementExists('a[href="' . $bookToSort->getUrl('/sort') . '"]');
+ $this->withHtml($resp)->assertElementExists('a[href="' . $bookToSort->getUrl('/sort') . '"]');
$resp = $this->get($bookToSort->getUrl('/sort'));
$resp->assertStatus(200);
@@ -456,14 +456,14 @@ class SortTest extends TestCase
$book->pages()->whereNotIn('id', $pages->pluck('id'))->delete();
$resp = $this->asEditor()->get($book->getUrl());
- $resp->assertElementContains('.content-wrap a.page:nth-child(1)', $pages[0]->name);
- $resp->assertElementContains('.content-wrap a.page:nth-child(2)', $pages[1]->name);
+ $this->withHtml($resp)->assertElementContains('.content-wrap a.page:nth-child(1)', $pages[0]->name);
+ $this->withHtml($resp)->assertElementContains('.content-wrap a.page:nth-child(2)', $pages[1]->name);
$pages[0]->forceFill(['priority' => 10])->save();
$pages[1]->forceFill(['priority' => 5])->save();
$resp = $this->asEditor()->get($book->getUrl());
- $resp->assertElementContains('.content-wrap a.page:nth-child(1)', $pages[1]->name);
- $resp->assertElementContains('.content-wrap a.page:nth-child(2)', $pages[0]->name);
+ $this->withHtml($resp)->assertElementContains('.content-wrap a.page:nth-child(1)', $pages[1]->name);
+ $this->withHtml($resp)->assertElementContains('.content-wrap a.page:nth-child(2)', $pages[0]->name);
}
}
diff --git a/tests/Entity/TagTest.php b/tests/Entity/TagTest.php
index 160dd62d8..6d03ed95a 100644
--- a/tests/Entity/TagTest.php
+++ b/tests/Entity/TagTest.php
@@ -94,10 +94,10 @@ class TagTest extends TestCase
$page = $this->getEntityWithTags(Page::class, $tags);
$resp = $this->asEditor()->get('/search?term=[category]');
$resp->assertSee($page->name);
- $resp->assertElementContains('[href="' . $page->getUrl() . '"]', 'category');
- $resp->assertElementContains('[href="' . $page->getUrl() . '"]', 'buckets');
- $resp->assertElementContains('[href="' . $page->getUrl() . '"]', 'color');
- $resp->assertElementContains('[href="' . $page->getUrl() . '"]', 'red');
+ $this->withHtml($resp)->assertElementContains('[href="' . $page->getUrl() . '"]', 'category');
+ $this->withHtml($resp)->assertElementContains('[href="' . $page->getUrl() . '"]', 'buckets');
+ $this->withHtml($resp)->assertElementContains('[href="' . $page->getUrl() . '"]', 'color');
+ $this->withHtml($resp)->assertElementContains('[href="' . $page->getUrl() . '"]', 'red');
}
public function test_tags_index_shows_tag_name_as_expected_with_right_counts()
@@ -109,23 +109,24 @@ class TagTest extends TestCase
$resp = $this->asEditor()->get('/tags');
$resp->assertSee('Category');
- $resp->assertElementCount('.tag-item', 1);
+ $html = $this->withHtml($resp);
+ $html->assertElementCount('.tag-item', 1);
$resp->assertDontSee('GreatTestContent');
$resp->assertDontSee('OtherTestContent');
- $resp->assertElementContains('a[title="Total tag usages"]', '2');
- $resp->assertElementContains('a[title="Assigned to Pages"]', '2');
- $resp->assertElementContains('a[title="Assigned to Books"]', '0');
- $resp->assertElementContains('a[title="Assigned to Chapters"]', '0');
- $resp->assertElementContains('a[title="Assigned to Shelves"]', '0');
- $resp->assertElementContains('a[href$="/tags?name=Category"]', '2 unique values');
+ $html->assertElementContains('a[title="Total tag usages"]', '2');
+ $html->assertElementContains('a[title="Assigned to Pages"]', '2');
+ $html->assertElementContains('a[title="Assigned to Books"]', '0');
+ $html->assertElementContains('a[title="Assigned to Chapters"]', '0');
+ $html->assertElementContains('a[title="Assigned to Shelves"]', '0');
+ $html->assertElementContains('a[href$="/tags?name=Category"]', '2 unique values');
/** @var Book $book */
$book = Book::query()->first();
$book->tags()->create(['name' => 'Category', 'value' => 'GreatTestContent']);
$resp = $this->asEditor()->get('/tags');
- $resp->assertElementContains('a[title="Total tag usages"]', '3');
- $resp->assertElementContains('a[title="Assigned to Books"]', '1');
- $resp->assertElementContains('a[href$="/tags?name=Category"]', '2 unique values');
+ $this->withHtml($resp)->assertElementContains('a[title="Total tag usages"]', '3');
+ $this->withHtml($resp)->assertElementContains('a[title="Assigned to Books"]', '1');
+ $this->withHtml($resp)->assertElementContains('a[href$="/tags?name=Category"]', '2 unique values');
}
public function test_tag_index_can_be_searched()
@@ -135,14 +136,14 @@ class TagTest extends TestCase
$page->tags()->create(['name' => 'Category', 'value' => 'GreatTestContent']);
$resp = $this->asEditor()->get('/tags?search=cat');
- $resp->assertElementContains('.tag-item .tag-name', 'Category');
+ $this->withHtml($resp)->assertElementContains('.tag-item .tag-name', 'Category');
$resp = $this->asEditor()->get('/tags?search=content');
- $resp->assertElementContains('.tag-item .tag-name', 'Category');
- $resp->assertElementContains('.tag-item .tag-value', 'GreatTestContent');
+ $this->withHtml($resp)->assertElementContains('.tag-item .tag-name', 'Category');
+ $this->withHtml($resp)->assertElementContains('.tag-item .tag-value', 'GreatTestContent');
$resp = $this->asEditor()->get('/tags?search=other');
- $resp->assertElementNotExists('.tag-item .tag-name');
+ $this->withHtml($resp)->assertElementNotExists('.tag-item .tag-name');
}
public function test_tag_index_search_will_show_mulitple_values_of_a_single_tag_name()
@@ -153,8 +154,8 @@ class TagTest extends TestCase
$page->tags()->create(['name' => 'Animal', 'value' => 'Catdog']);
$resp = $this->asEditor()->get('/tags?search=cat');
- $resp->assertElementContains('.tag-item .tag-value', 'Catfish');
- $resp->assertElementContains('.tag-item .tag-value', 'Catdog');
+ $this->withHtml($resp)->assertElementContains('.tag-item .tag-value', 'Catfish');
+ $this->withHtml($resp)->assertElementContains('.tag-item .tag-value', 'Catdog');
}
public function test_tag_index_can_be_scoped_to_specific_tag_name()
@@ -170,9 +171,9 @@ class TagTest extends TestCase
$resp->assertSee('GreatTestContent');
$resp->assertSee('OtherTestContent');
$resp->assertDontSee('OtherTagName');
- $resp->assertElementCount('table .tag-item', 2);
$resp->assertSee('Active Filter:');
- $resp->assertElementContains('form[action$="/tags"]', 'Clear Filter');
+ $this->withHtml($resp)->assertElementCount('table .tag-item', 2);
+ $this->withHtml($resp)->assertElementContains('form[action$="/tags"]', 'Clear Filter');
}
public function test_tags_index_adheres_to_page_permissions()
diff --git a/tests/FavouriteTest.php b/tests/FavouriteTest.php
index a0f11886e..6a5c82eab 100644
--- a/tests/FavouriteTest.php
+++ b/tests/FavouriteTest.php
@@ -15,8 +15,8 @@ class FavouriteTest extends TestCase
$editor = $this->getEditor();
$resp = $this->actingAs($editor)->get($page->getUrl());
- $resp->assertElementContains('button', 'Favourite');
- $resp->assertElementExists('form[method="POST"][action$="/favourites/add"]');
+ $this->withHtml($resp)->assertElementContains('button', 'Favourite');
+ $this->withHtml($resp)->assertElementExists('form[method="POST"][action$="/favourites/add"]');
$resp = $this->post('/favourites/add', [
'type' => get_class($page),
@@ -43,8 +43,8 @@ class FavouriteTest extends TestCase
]);
$resp = $this->actingAs($editor)->get($page->getUrl());
- $resp->assertElementContains('button', 'Unfavourite');
- $resp->assertElementExists('form[method="POST"][action$="/favourites/remove"]');
+ $this->withHtml($resp)->assertElementContains('button', 'Unfavourite');
+ $this->withHtml($resp)->assertElementExists('form[method="POST"][action$="/favourites/remove"]');
$resp = $this->post('/favourites/remove', [
'type' => get_class($page),
@@ -69,15 +69,17 @@ class FavouriteTest extends TestCase
foreach ($entities as $entity) {
$resp = $this->get($entity->getUrl());
- $resp->assertElementExists('form[method="POST"][action$="/favourites/add"]');
+ $this->withHtml($resp)->assertElementExists('form[method="POST"][action$="/favourites/add"]');
}
}
public function test_header_contains_link_to_favourites_page_when_logged_in()
{
$this->setSettings(['app-public' => 'true']);
- $this->get('/')->assertElementNotContains('header', 'My Favourites');
- $this->actingAs($this->getViewer())->get('/')->assertElementContains('header a', 'My Favourites');
+ $resp = $this->get('/');
+ $this->withHtml($resp)->assertElementNotContains('header', 'My Favourites');
+ $resp = $this->actingAs($this->getViewer())->get('/');
+ $this->withHtml($resp)->assertElementContains('header a', 'My Favourites');
}
public function test_favourites_shown_on_homepage()
@@ -85,15 +87,15 @@ class FavouriteTest extends TestCase
$editor = $this->getEditor();
$resp = $this->actingAs($editor)->get('/');
- $resp->assertElementNotExists('#top-favourites');
+ $this->withHtml($resp)->assertElementNotExists('#top-favourites');
/** @var Page $page */
$page = Page::query()->first();
$page->favourites()->save((new Favourite())->forceFill(['user_id' => $editor->id]));
$resp = $this->get('/');
- $resp->assertElementExists('#top-favourites');
- $resp->assertElementContains('#top-favourites', $page->name);
+ $this->withHtml($resp)->assertElementExists('#top-favourites');
+ $this->withHtml($resp)->assertElementContains('#top-favourites', $page->name);
}
public function test_favourites_list_page_shows_favourites_and_has_working_pagination()
diff --git a/tests/HelpTest.php b/tests/HelpTest.php
index cd983dbeb..9cf80717f 100644
--- a/tests/HelpTest.php
+++ b/tests/HelpTest.php
@@ -8,8 +8,8 @@ class HelpTest extends TestCase
{
$resp = $this->get('/help/wysiwyg');
$resp->assertOk();
- $resp->assertElementExists('a[href="https://www.tiny.cloud/"]');
- $resp->assertElementExists('a[href="' . url('/libs/tinymce/license.txt') . '"]');
+ $this->withHtml($resp)->assertElementExists('a[href="https://www.tiny.cloud/"]');
+ $this->withHtml($resp)->assertElementExists('a[href="' . url('/libs/tinymce/license.txt') . '"]');
}
public function test_tiny_license_exists_where_expected()
diff --git a/tests/HomepageTest.php b/tests/HomepageTest.php
index 900650a70..1d968a2c9 100644
--- a/tests/HomepageTest.php
+++ b/tests/HomepageTest.php
@@ -49,7 +49,7 @@ class HomepageTest extends TestCase
$homeVisit = $this->get('/');
$homeVisit->assertSee($name);
- $homeVisit->assertElementNotExists('#home-default');
+ $this->withHtml($homeVisit)->assertElementNotExists('#home-default');
$pageDeleteReq = $this->delete($customPage->getUrl());
$pageDeleteReq->assertStatus(302);
@@ -148,7 +148,7 @@ class HomepageTest extends TestCase
$homeVisit->assertSee('Shelves');
$homeVisit->assertSee('grid-card-content');
$homeVisit->assertSee('featured-image-container');
- $homeVisit->assertElementContains('.grid-card', $shelf->name);
+ $this->withHtml($homeVisit)->assertElementContains('.grid-card', $shelf->name);
$this->setSettings(['app-homepage-type' => false]);
$this->test_default_homepage_visible();
@@ -166,21 +166,21 @@ class HomepageTest extends TestCase
// Ensure initially visible
$homeVisit = $this->get('/');
- $homeVisit->assertElementContains('.content-wrap', $shelf->name);
- $homeVisit->assertElementContains('.content-wrap', $book->name);
+ $this->withHtml($homeVisit)->assertElementContains('.content-wrap', $shelf->name);
+ $this->withHtml($homeVisit)->assertElementContains('.content-wrap', $book->name);
// Ensure book no longer visible without view permission
$editor->roles()->detach();
$this->giveUserPermissions($editor, ['bookshelf-view-all']);
$homeVisit = $this->get('/');
- $homeVisit->assertElementContains('.content-wrap', $shelf->name);
- $homeVisit->assertElementNotContains('.content-wrap', $book->name);
+ $this->withHtml($homeVisit)->assertElementContains('.content-wrap', $shelf->name);
+ $this->withHtml($homeVisit)->assertElementNotContains('.content-wrap', $book->name);
// Ensure is visible again with entity-level view permission
$this->setEntityRestrictions($book, ['view'], [$editor->roles()->first()]);
$homeVisit = $this->get('/');
- $homeVisit->assertElementContains('.content-wrap', $shelf->name);
- $homeVisit->assertElementContains('.content-wrap', $book->name);
+ $this->withHtml($homeVisit)->assertElementContains('.content-wrap', $shelf->name);
+ $this->withHtml($homeVisit)->assertElementContains('.content-wrap', $book->name);
}
public function test_new_users_dont_have_any_recently_viewed()
@@ -190,6 +190,6 @@ class HomepageTest extends TestCase
$user->attachRole($viewRole);
$homeVisit = $this->actingAs($user)->get('/');
- $homeVisit->assertElementContains('#recently-viewed', 'You have not viewed any pages');
+ $this->withHtml($homeVisit)->assertElementContains('#recently-viewed', 'You have not viewed any pages');
}
}
diff --git a/tests/OpenGraphTest.php b/tests/OpenGraphTest.php
index 43389ad78..3f807f024 100644
--- a/tests/OpenGraphTest.php
+++ b/tests/OpenGraphTest.php
@@ -9,6 +9,7 @@ use BookStack\Entities\Models\Page;
use BookStack\Entities\Repos\BaseRepo;
use BookStack\Entities\Repos\BookRepo;
use Illuminate\Support\Str;
+use Illuminate\Testing\TestResponse;
use Tests\Uploads\UsesImages;
class OpenGraphTest extends TestCase
diff --git a/tests/Permissions/EntityPermissionsTest.php b/tests/Permissions/EntityPermissionsTest.php
index abd5065f5..7f8120106 100644
--- a/tests/Permissions/EntityPermissionsTest.php
+++ b/tests/Permissions/EntityPermissionsTest.php
@@ -138,13 +138,11 @@ class EntityPermissionsTest extends TestCase
$book = Book::query()->first();
$bookUrl = $book->getUrl();
- $this->actingAs($this->viewer)
- ->get($bookUrl)
- ->assertElementNotContains('.actions', 'New Page')
+ $resp = $this->actingAs($this->viewer)->get($bookUrl);
+ $this->withHtml($resp)->assertElementNotContains('.actions', 'New Page')
->assertElementNotContains('.actions', 'New Chapter');
- $this->actingAs($this->user)
- ->get($bookUrl)
- ->assertElementContains('.actions', 'New Page')
+ $resp = $this->actingAs($this->user)->get($bookUrl);
+ $this->withHtml($resp)->assertElementContains('.actions', 'New Page')
->assertElementContains('.actions', 'New Chapter');
$this->setRestrictionsForTestRoles($book, ['view', 'delete', 'update']);
@@ -155,8 +153,8 @@ class EntityPermissionsTest extends TestCase
$this->get($bookUrl . '/create-page')->assertRedirect('/');
$this->get('/')->assertSee('You do not have permission');
- $this->get($bookUrl)
- ->assertElementNotContains('.actions', 'New Page')
+ $resp = $this->get($bookUrl);
+ $this->withHtml($resp)->assertElementNotContains('.actions', 'New Page')
->assertElementNotContains('.actions', 'New Chapter');
$this->setRestrictionsForTestRoles($book, ['view', 'create']);
@@ -176,8 +174,8 @@ class EntityPermissionsTest extends TestCase
]);
$resp->assertRedirect($book->getUrl('/page/test-page'));
- $this->get($bookUrl)
- ->assertElementContains('.actions', 'New Page')
+ $resp = $this->get($bookUrl);
+ $this->withHtml($resp)->assertElementContains('.actions', 'New Page')
->assertElementContains('.actions', 'New Chapter');
}
@@ -262,15 +260,14 @@ class EntityPermissionsTest extends TestCase
$chapter = Chapter::query()->first();
$chapterUrl = $chapter->getUrl();
- $this->actingAs($this->user)
- ->get($chapterUrl)
- ->assertElementContains('.actions', 'New Page');
+ $resp = $this->actingAs($this->user)->get($chapterUrl);
+ $this->withHtml($resp)->assertElementContains('.actions', 'New Page');
$this->setRestrictionsForTestRoles($chapter, ['view', 'delete', 'update']);
$this->get($chapterUrl . '/create-page')->assertRedirect('/');
$this->get('/')->assertSee('You do not have permission');
- $this->get($chapterUrl)->assertElementNotContains('.actions', 'New Page');
+ $this->withHtml($this->get($chapterUrl))->assertElementNotContains('.actions', 'New Page');
$this->setRestrictionsForTestRoles($chapter, ['view', 'create']);
@@ -283,7 +280,7 @@ class EntityPermissionsTest extends TestCase
]);
$resp->assertRedirect($chapter->book->getUrl('/page/test-page'));
- $this->get($chapterUrl)->assertElementContains('.actions', 'New Page');
+ $this->withHtml($this->get($chapterUrl))->assertElementContains('.actions', 'New Page');
}
public function test_chapter_update_restriction()
@@ -356,9 +353,9 @@ class EntityPermissionsTest extends TestCase
$page = Page::query()->first();
$pageUrl = $page->getUrl();
- $this->actingAs($this->user)
- ->get($pageUrl . '/edit')
- ->assertElementExists('input[name="name"][value="' . $page->name . '"]');
+ $resp = $this->actingAs($this->user)
+ ->get($pageUrl . '/edit');
+ $this->withHtml($resp)->assertElementExists('input[name="name"][value="' . $page->name . '"]');
$this->setRestrictionsForTestRoles($page, ['view', 'delete']);
@@ -367,9 +364,9 @@ class EntityPermissionsTest extends TestCase
$this->setRestrictionsForTestRoles($page, ['view', 'update']);
- $this->get($pageUrl . '/edit')
- ->assertOk()
- ->assertElementExists('input[name="name"][value="' . $page->name . '"]');
+ $resp = $this->get($pageUrl . '/edit')
+ ->assertOk();
+ $this->withHtml($resp)->assertElementExists('input[name="name"][value="' . $page->name . '"]');
}
public function test_page_delete_restriction()
@@ -446,9 +443,8 @@ class EntityPermissionsTest extends TestCase
$this->setRestrictionsForTestRoles($page, []);
- $this->actingAs($this->user)
- ->get($page2->getUrl())
- ->assertElementNotContains('.sidebar-page-list', $page->name);
+ $resp = $this->actingAs($this->user)->get($page2->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.sidebar-page-list', $page->name);
}
public function test_restricted_pages_not_visible_in_book_navigation_on_chapters()
@@ -459,9 +455,8 @@ class EntityPermissionsTest extends TestCase
$this->setRestrictionsForTestRoles($page, []);
- $this->actingAs($this->user)
- ->get($chapter->getUrl())
- ->assertElementNotContains('.sidebar-page-list', $page->name);
+ $resp = $this->actingAs($this->user)->get($chapter->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.sidebar-page-list', $page->name);
}
public function test_restricted_pages_not_visible_on_chapter_pages()
@@ -538,9 +533,8 @@ class EntityPermissionsTest extends TestCase
$book = Book::query()->first();
$bookUrl = $book->getUrl();
- $this->actingAs($this->viewer)
- ->get($bookUrl)
- ->assertElementNotContains('.actions', 'New Page')
+ $resp = $this->actingAs($this->viewer)->get($bookUrl);
+ $this->withHtml($resp)->assertElementNotContains('.actions', 'New Page')
->assertElementNotContains('.actions', 'New Chapter');
$this->setRestrictionsForTestRoles($book, ['view', 'delete', 'update']);
@@ -549,7 +543,8 @@ class EntityPermissionsTest extends TestCase
$this->get('/')->assertSee('You do not have permission');
$this->get($bookUrl . '/create-page')->assertRedirect('/');
$this->get('/')->assertSee('You do not have permission');
- $this->get($bookUrl)->assertElementNotContains('.actions', 'New Page')
+ $resp = $this->get($bookUrl);
+ $this->withHtml($resp)->assertElementNotContains('.actions', 'New Page')
->assertElementNotContains('.actions', 'New Chapter');
$this->setRestrictionsForTestRoles($book, ['view', 'create']);
@@ -569,8 +564,8 @@ class EntityPermissionsTest extends TestCase
]);
$resp->assertRedirect($book->getUrl('/page/test-page'));
- $this->get($bookUrl)
- ->assertElementContains('.actions', 'New Page')
+ $resp = $this->get($bookUrl);
+ $this->withHtml($resp)->assertElementContains('.actions', 'New Page')
->assertElementContains('.actions', 'New Chapter');
}
diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php
index fe2139e59..7593b7b11 100644
--- a/tests/Permissions/RolesTest.php
+++ b/tests/Permissions/RolesTest.php
@@ -12,8 +12,8 @@ use BookStack\Entities\Models\Chapter;
use BookStack\Entities\Models\Entity;
use BookStack\Entities\Models\Page;
use BookStack\Uploads\Image;
+use Illuminate\Testing\TestResponse;
use Tests\TestCase;
-use Tests\TestResponse;
class RolesTest extends TestCase
{
@@ -59,13 +59,13 @@ class RolesTest extends TestCase
// Creation
$resp = $this->asAdmin()->get('/settings/features');
- $resp->assertElementContains('a[href="' . url('/settings/roles') . '"]', 'Roles');
+ $this->withHtml($resp)->assertElementContains('a[href="' . url('/settings/roles') . '"]', 'Roles');
$resp = $this->get('/settings/roles');
- $resp->assertElementContains('a[href="' . url('/settings/roles/new') . '"]', 'Create New Role');
+ $this->withHtml($resp)->assertElementContains('a[href="' . url('/settings/roles/new') . '"]', 'Create New Role');
$resp = $this->get('/settings/roles/new');
- $resp->assertElementContains('form[action="' . url('/settings/roles/new') . '"]', 'Save Role');
+ $this->withHtml($resp)->assertElementContains('form[action="' . url('/settings/roles/new') . '"]', 'Save Role');
$resp = $this->post('/settings/roles/new', [
'display_name' => $testRoleName,
@@ -89,7 +89,7 @@ class RolesTest extends TestCase
$resp = $this->get('/settings/roles/' . $role->id);
$resp->assertSee($testRoleName);
$resp->assertSee($testRoleDesc);
- $resp->assertElementContains('form[action="' . url('/settings/roles/' . $role->id) . '"]', 'Save Role');
+ $this->withHtml($resp)->assertElementContains('form[action="' . url('/settings/roles/' . $role->id) . '"]', 'Save Role');
$resp = $this->put('/settings/roles/' . $role->id, [
'display_name' => $testRoleUpdateName,
@@ -105,11 +105,11 @@ class RolesTest extends TestCase
// Deleting
$resp = $this->get('/settings/roles/' . $role->id);
- $resp->assertElementContains('a[href="' . url("/settings/roles/delete/$role->id") . '"]', 'Delete Role');
+ $this->withHtml($resp)->assertElementContains('a[href="' . url("/settings/roles/delete/$role->id") . '"]', 'Delete Role');
$resp = $this->get("/settings/roles/delete/$role->id");
$resp->assertSee($testRoleUpdateName);
- $resp->assertElementContains('form[action="' . url("/settings/roles/delete/$role->id") . '"]', 'Confirm');
+ $this->withHtml($resp)->assertElementContains('form[action="' . url("/settings/roles/delete/$role->id") . '"]', 'Confirm');
$resp = $this->delete("/settings/roles/delete/$role->id");
$resp->assertRedirect('/settings/roles');
@@ -154,7 +154,7 @@ class RolesTest extends TestCase
$this->assertCount(1, $roleB->users()->get());
$deletePage = $this->asAdmin()->get("/settings/roles/delete/$roleB->id");
- $deletePage->assertElementExists('select[name=migrate_role_id]');
+ $this->withHtml($deletePage)->assertElementExists('select[name=migrate_role_id]');
$this->asAdmin()->delete("/settings/roles/delete/$roleB->id", [
'migrate_role_id' => $roleA->id,
]);
@@ -168,7 +168,7 @@ class RolesTest extends TestCase
/** @var Role $role */
$role = Role::query()->first();
$resp = $this->asAdmin()->get("/settings/roles/{$role->id}");
- $resp->assertElementContains('a[href$="/roles/new?copy_from=' . $role->id . '"]', 'Copy');
+ $this->withHtml($resp)->assertElementContains('a[href$="/roles/new?copy_from=' . $role->id . '"]', 'Copy');
}
public function test_copy_from_param_on_create_prefills_with_other_role_data()
@@ -177,7 +177,7 @@ class RolesTest extends TestCase
$role = Role::query()->first();
$resp = $this->asAdmin()->get("/settings/roles/new?copy_from={$role->id}");
$resp->assertOk();
- $resp->assertElementExists('input[name="display_name"][value="' . ($role->display_name . ' (Copy)') . '"]');
+ $this->withHtml($resp)->assertElementExists('input[name="display_name"][value="' . ($role->display_name . ' (Copy)') . '"]');
}
public function test_manage_user_permission()
@@ -203,9 +203,9 @@ class RolesTest extends TestCase
$originalEmail = $this->user->email;
$this->actingAs($this->user);
- $this->get($userProfileUrl)
- ->assertOk()
- ->assertElementExists('input[name=email][disabled]');
+ $resp = $this->get($userProfileUrl)
+ ->assertOk();
+ $this->withHtml($resp)->assertElementExists('input[name=email][disabled]');
$this->put($userProfileUrl, [
'name' => 'my_new_name',
'email' => 'new_email@example.com',
@@ -218,9 +218,9 @@ class RolesTest extends TestCase
$this->giveUserPermissions($this->user, ['users-manage']);
- $this->get($userProfileUrl)
- ->assertOk()
- ->assertElementNotExists('input[name=email][disabled]')
+ $resp = $this->get($userProfileUrl)
+ ->assertOk();
+ $this->withHtml($resp)->assertElementNotExists('input[name=email][disabled]')
->assertElementExists('input[name=email]');
$this->put($userProfileUrl, [
'name' => 'my_new_name_2',
@@ -315,8 +315,8 @@ class RolesTest extends TestCase
}
foreach ($visibles as $url => $text) {
- $this->actingAs($this->user)->get($url)
- ->assertElementNotContains('.action-buttons', $text);
+ $resp = $this->actingAs($this->user)->get($url);
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', $text);
}
$this->giveUserPermissions($this->user, [$permission]);
@@ -357,7 +357,8 @@ class RolesTest extends TestCase
$ownShelf->getUrl() => 'Edit',
]);
- $this->get($otherShelf->getUrl())->assertElementNotContains('.action-buttons', 'Edit');
+ $resp = $this->get($otherShelf->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Edit');
$this->get($otherShelf->getUrl('/edit'))->assertRedirect('/');
}
@@ -387,7 +388,8 @@ class RolesTest extends TestCase
$ownShelf->getUrl() => 'Delete',
]);
- $this->get($otherShelf->getUrl())->assertElementNotContains('.action-buttons', 'Delete');
+ $resp = $this->get($otherShelf->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Delete');
$this->get($otherShelf->getUrl('/delete'))->assertRedirect('/');
$this->get($ownShelf->getUrl());
@@ -435,7 +437,8 @@ class RolesTest extends TestCase
$ownBook->getUrl() => 'Edit',
]);
- $this->get($otherBook->getUrl())->assertElementNotContains('.action-buttons', 'Edit');
+ $resp = $this->get($otherBook->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Edit');
$this->get($otherBook->getUrl('/edit'))->assertRedirect('/');
}
@@ -462,7 +465,8 @@ class RolesTest extends TestCase
$ownBook->getUrl() => 'Delete',
]);
- $this->get($otherBook->getUrl())->assertElementNotContains('.action-buttons', 'Delete');
+ $resp = $this->get($otherBook->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Delete');
$this->get($otherBook->getUrl('/delete'))->assertRedirect('/');
$this->get($ownBook->getUrl());
$this->delete($ownBook->getUrl())->assertRedirect('/books');
@@ -501,7 +505,8 @@ class RolesTest extends TestCase
'description' => 'chapter desc',
])->assertRedirect($ownBook->getUrl('/chapter/test-chapter'));
- $this->get($book->getUrl())->assertElementNotContains('.action-buttons', 'New Chapter');
+ $resp = $this->get($book->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'New Chapter');
$this->get($book->getUrl('/create-chapter'))->assertRedirect('/');
}
@@ -532,7 +537,8 @@ class RolesTest extends TestCase
$ownChapter->getUrl() => 'Edit',
]);
- $this->get($otherChapter->getUrl())->assertElementNotContains('.action-buttons', 'Edit');
+ $resp = $this->get($otherChapter->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Edit');
$this->get($otherChapter->getUrl('/edit'))->assertRedirect('/');
}
@@ -560,11 +566,13 @@ class RolesTest extends TestCase
]);
$bookUrl = $ownChapter->book->getUrl();
- $this->get($otherChapter->getUrl())->assertElementNotContains('.action-buttons', 'Delete');
+ $resp = $this->get($otherChapter->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Delete');
$this->get($otherChapter->getUrl('/delete'))->assertRedirect('/');
$this->get($ownChapter->getUrl());
$this->delete($ownChapter->getUrl())->assertRedirect($bookUrl);
- $this->get($bookUrl)->assertElementNotContains('.book-content', $ownChapter->name);
+ $resp = $this->get($bookUrl);
+ $this->withHtml($resp)->assertElementNotContains('.book-content', $ownChapter->name);
}
public function test_chapter_delete_all_permission()
@@ -581,7 +589,8 @@ class RolesTest extends TestCase
$bookUrl = $otherChapter->book->getUrl();
$this->get($otherChapter->getUrl());
$this->delete($otherChapter->getUrl())->assertRedirect($bookUrl);
- $this->get($bookUrl)->assertElementNotContains('.book-content', $otherChapter->name);
+ $resp = $this->get($bookUrl);
+ $this->withHtml($resp)->assertElementNotContains('.book-content', $otherChapter->name);
}
public function test_page_create_own_permissions()
@@ -624,10 +633,12 @@ class RolesTest extends TestCase
'html' => 'page desc',
])->assertRedirect($ownBook->getUrl('/page/test-page'));
- $this->get($book->getUrl())->assertElementNotContains('.action-buttons', 'New Page');
+ $resp = $this->get($book->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'New Page');
$this->get($book->getUrl('/create-page'))->assertRedirect('/');
- $this->get($chapter->getUrl())->assertElementNotContains('.action-buttons', 'New Page');
+ $resp = $this->get($chapter->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'New Page');
$this->get($chapter->getUrl('/create-page'))->assertRedirect('/');
}
@@ -687,7 +698,8 @@ class RolesTest extends TestCase
$ownPage->getUrl() => 'Edit',
]);
- $this->get($otherPage->getUrl())->assertElementNotContains('.action-buttons', 'Edit');
+ $resp = $this->get($otherPage->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Edit');
$this->get($otherPage->getUrl() . '/edit')->assertRedirect('/');
}
@@ -715,11 +727,13 @@ class RolesTest extends TestCase
]);
$parent = $ownPage->chapter ?? $ownPage->book;
- $this->get($otherPage->getUrl())->assertElementNotContains('.action-buttons', 'Delete');
+ $resp = $this->get($otherPage->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Delete');
$this->get($otherPage->getUrl('/delete'))->assertRedirect('/');
$this->get($ownPage->getUrl());
$this->delete($ownPage->getUrl())->assertRedirect($parent->getUrl());
- $this->get($parent->getUrl())->assertElementNotContains('.book-content', $ownPage->name);
+ $resp = $this->get($parent->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.book-content', $ownPage->name);
}
public function test_page_delete_all_permission()
@@ -748,8 +762,8 @@ class RolesTest extends TestCase
$user = User::query()->first();
$adminRole = Role::getSystemRole('admin');
$publicRole = Role::getSystemRole('public');
- $this->asAdmin()->get('/settings/users/' . $user->id)
- ->assertElementExists('[name="roles[' . $adminRole->id . ']"]')
+ $resp = $this->asAdmin()->get('/settings/users/' . $user->id);
+ $this->withHtml($resp)->assertElementExists('[name="roles[' . $adminRole->id . ']"]')
->assertElementExists('[name="roles[' . $publicRole->id . ']"]');
}
@@ -762,8 +776,8 @@ class RolesTest extends TestCase
public function test_public_role_visible_in_default_role_setting()
{
- $this->asAdmin()->get('/settings/registration')
- ->assertElementExists('[data-system-role-name="admin"]')
+ $resp = $this->asAdmin()->get('/settings/registration');
+ $this->withHtml($resp)->assertElementExists('[data-system-role-name="admin"]')
->assertElementExists('[data-system-role-name="public"]');
}
diff --git a/tests/PublicActionTest.php b/tests/PublicActionTest.php
index ced40d0a8..178e23e2e 100644
--- a/tests/PublicActionTest.php
+++ b/tests/PublicActionTest.php
@@ -28,7 +28,8 @@ class PublicActionTest extends TestCase
public function test_login_link_visible()
{
$this->setSettings(['app-public' => 'true']);
- $this->get('/')->assertElementExists('a[href="' . url('/login') . '"]');
+ $resp = $this->get('/');
+ $this->withHtml($resp)->assertElementExists('a[href="' . url('/login') . '"]');
}
public function test_register_link_visible_when_enabled()
@@ -96,12 +97,12 @@ class PublicActionTest extends TestCase
$chapter = Chapter::query()->first();
$resp = $this->get($chapter->getUrl());
$resp->assertSee('New Page');
- $resp->assertElementExists('a[href="' . $chapter->getUrl('/create-page') . '"]');
+ $this->withHtml($resp)->assertElementExists('a[href="' . $chapter->getUrl('/create-page') . '"]');
$resp = $this->get($chapter->getUrl('/create-page'));
$resp->assertSee('Continue');
$resp->assertSee('Page Name');
- $resp->assertElementExists('form[action="' . $chapter->getUrl('/create-guest-page') . '"]');
+ $this->withHtml($resp)->assertElementExists('form[action="' . $chapter->getUrl('/create-guest-page') . '"]');
$resp = $this->post($chapter->getUrl('/create-guest-page'), ['name' => 'My guest page']);
$resp->assertRedirect($chapter->book->getUrl('/page/my-guest-page/edit'));
diff --git a/tests/RecycleBinTest.php b/tests/RecycleBinTest.php
index f3e30c0d0..0e0524338 100644
--- a/tests/RecycleBinTest.php
+++ b/tests/RecycleBinTest.php
@@ -63,11 +63,12 @@ class RecycleBinTest extends TestCase
$this->actingAs($editor)->delete($book->getUrl());
$viewReq = $this->asAdmin()->get('/settings/recycle-bin');
- $viewReq->assertElementContains('table.table', $page->name);
- $viewReq->assertElementContains('table.table', $editor->name);
- $viewReq->assertElementContains('table.table', $book->name);
- $viewReq->assertElementContains('table.table', $book->pages_count . ' Pages');
- $viewReq->assertElementContains('table.table', $book->chapters_count . ' Chapters');
+ $html = $this->withHtml($viewReq);
+ $html->assertElementContains('table.table', $page->name);
+ $html->assertElementContains('table.table', $editor->name);
+ $html->assertElementContains('table.table', $book->name);
+ $html->assertElementContains('table.table', $book->pages_count . ' Pages');
+ $html->assertElementContains('table.table', $book->chapters_count . ' Chapters');
}
public function test_recycle_bin_empty()
@@ -90,7 +91,7 @@ class RecycleBinTest extends TestCase
$itemCount = 2 + $book->pages->count() + $book->chapters->count();
$redirectReq = $this->get('/settings/recycle-bin');
- $redirectReq->assertNotificationContains('Deleted ' . $itemCount . ' total items from the recycle bin');
+ $this->assertNotificationContains($redirectReq, 'Deleted ' . $itemCount . ' total items from the recycle bin');
}
public function test_entity_restore()
@@ -111,7 +112,7 @@ class RecycleBinTest extends TestCase
$itemCount = 1 + $book->pages->count() + $book->chapters->count();
$redirectReq = $this->get('/settings/recycle-bin');
- $redirectReq->assertNotificationContains('Restored ' . $itemCount . ' total items from the recycle bin');
+ $this->assertNotificationContains($redirectReq, 'Restored ' . $itemCount . ' total items from the recycle bin');
}
public function test_permanent_delete()
@@ -130,7 +131,7 @@ class RecycleBinTest extends TestCase
$itemCount = 1 + $book->pages->count() + $book->chapters->count();
$redirectReq = $this->get('/settings/recycle-bin');
- $redirectReq->assertNotificationContains('Deleted ' . $itemCount . ' total items from the recycle bin');
+ $this->assertNotificationContains($redirectReq, 'Deleted ' . $itemCount . ' total items from the recycle bin');
}
public function test_permanent_delete_for_each_type()
@@ -264,6 +265,6 @@ class RecycleBinTest extends TestCase
$pageRestoreView = $this->asAdmin()->get("/settings/recycle-bin/{$pageDeletion->id}/restore");
$pageRestoreView->assertSee('The parent of this item has also been deleted.');
- $pageRestoreView->assertElementContains('a[href$="/settings/recycle-bin/' . $bookDeletion->id . '/restore"]', 'Restore Parent');
+ $this->withHtml($pageRestoreView)->assertElementContains('a[href$="/settings/recycle-bin/' . $bookDeletion->id . '/restore"]', 'Restore Parent');
}
}
diff --git a/tests/SecurityHeaderTest.php b/tests/SecurityHeaderTest.php
index d8ba5873f..00459ec69 100644
--- a/tests/SecurityHeaderTest.php
+++ b/tests/SecurityHeaderTest.php
@@ -3,6 +3,7 @@
namespace Tests;
use BookStack\Util\CspService;
+use Illuminate\Testing\TestResponse;
class SecurityHeaderTest extends TestCase
{
diff --git a/tests/Settings/FooterLinksTest.php b/tests/Settings/FooterLinksTest.php
index 4b822ba4c..f0bf65e77 100644
--- a/tests/Settings/FooterLinksTest.php
+++ b/tests/Settings/FooterLinksTest.php
@@ -44,8 +44,11 @@ class FooterLinksTest extends TestCase
['label' => 'Another Link', 'url' => 'https://example.com/link-b'],
]]);
- $this->get('/login')->assertElementContains('footer a[href="https://example.com/link-a"]', 'My custom link');
- $this->asEditor()->get('/')->assertElementContains('footer a[href="https://example.com/link-b"]', 'Another link');
+ $resp = $this->get('/login');
+ $this->withHtml($resp)->assertElementContains('footer a[href="https://example.com/link-a"]', 'My custom link');
+
+ $resp = $this->asEditor()->get('/');
+ $this->withHtml($resp)->assertElementContains('footer a[href="https://example.com/link-b"]', 'Another link');
}
public function test_using_translation_system_for_labels()
@@ -56,7 +59,7 @@ class FooterLinksTest extends TestCase
]]);
$resp = $this->get('/login');
- $resp->assertElementContains('footer a[href="https://example.com/privacy"]', 'Privacy Policy');
- $resp->assertElementContains('footer a[href="https://example.com/terms"]', 'Terms of Service');
+ $this->withHtml($resp)->assertElementContains('footer a[href="https://example.com/privacy"]', 'Privacy Policy');
+ $this->withHtml($resp)->assertElementContains('footer a[href="https://example.com/terms"]', 'Terms of Service');
}
}
diff --git a/tests/Settings/SettingsTest.php b/tests/Settings/SettingsTest.php
index 48840fc0b..e2ac6f27c 100644
--- a/tests/Settings/SettingsTest.php
+++ b/tests/Settings/SettingsTest.php
@@ -28,8 +28,8 @@ class SettingsTest extends TestCase
foreach ($categories as $category => $title) {
$resp = $this->get("/settings/{$category}");
- $resp->assertElementContains('h1', $title);
- $resp->assertElementExists("form[action$=\"/settings/{$category}\"]");
+ $this->withHtml($resp)->assertElementContains('h1', $title);
+ $this->withHtml($resp)->assertElementExists("form[action$=\"/settings/{$category}\"]");
}
}
diff --git a/tests/SharedTestHelpers.php b/tests/SharedTestHelpers.php
deleted file mode 100644
index bc7b10266..000000000
--- a/tests/SharedTestHelpers.php
+++ /dev/null
@@ -1,385 +0,0 @@
-actingAs($this->getAdmin());
- }
-
- /**
- * Get the current admin user.
- */
- public function getAdmin(): User
- {
- if (is_null($this->admin)) {
- $adminRole = Role::getSystemRole('admin');
- $this->admin = $adminRole->users->first();
- }
-
- return $this->admin;
- }
-
- /**
- * Set the current user context to be an editor.
- */
- public function asEditor()
- {
- return $this->actingAs($this->getEditor());
- }
-
- /**
- * Get a editor user.
- */
- protected function getEditor(): User
- {
- if ($this->editor === null) {
- $editorRole = Role::getRole('editor');
- $this->editor = $editorRole->users->first();
- }
-
- return $this->editor;
- }
-
- /**
- * Get an instance of a user with 'viewer' permissions.
- */
- protected function getViewer(array $attributes = []): User
- {
- $user = Role::getRole('viewer')->users()->first();
- if (!empty($attributes)) {
- $user->forceFill($attributes)->save();
- }
-
- return $user;
- }
-
- /**
- * Get a user that's not a system user such as the guest user.
- */
- public function getNormalUser(): User
- {
- return User::query()->where('system_name', '=', null)->get()->last();
- }
-
- /**
- * Regenerate the permission for an entity.
- */
- protected function regenEntityPermissions(Entity $entity): void
- {
- $entity->rebuildPermissions();
- $entity->load('jointPermissions');
- }
-
- /**
- * Create and return a new bookshelf.
- */
- public function newShelf(array $input = ['name' => 'test shelf', 'description' => 'My new test shelf']): Bookshelf
- {
- return app(BookshelfRepo::class)->create($input, []);
- }
-
- /**
- * Create and return a new book.
- */
- public function newBook(array $input = ['name' => 'test book', 'description' => 'My new test book']): Book
- {
- return app(BookRepo::class)->create($input);
- }
-
- /**
- * Create and return a new test chapter.
- */
- public function newChapter(array $input, Book $book): Chapter
- {
- return app(ChapterRepo::class)->create($input, $book);
- }
-
- /**
- * Create and return a new test page.
- */
- public function newPage(array $input = ['name' => 'test page', 'html' => 'My new test page']): Page
- {
- $book = Book::query()->first();
- $pageRepo = app(PageRepo::class);
- $draftPage = $pageRepo->getNewDraftPage($book);
-
- return $pageRepo->publishDraft($draftPage, $input);
- }
-
- /**
- * Quickly sets an array of settings.
- */
- protected function setSettings(array $settingsArray): void
- {
- $settings = app(SettingService::class);
- foreach ($settingsArray as $key => $value) {
- $settings->put($key, $value);
- }
- }
-
- /**
- * Manually set some permissions on an entity.
- */
- protected function setEntityRestrictions(Entity $entity, array $actions = [], array $roles = []): void
- {
- $entity->restricted = true;
- $entity->permissions()->delete();
-
- $permissions = [];
- foreach ($actions as $action) {
- foreach ($roles as $role) {
- $permissions[] = [
- 'role_id' => $role->id,
- 'action' => strtolower($action),
- ];
- }
- }
- $entity->permissions()->createMany($permissions);
-
- $entity->save();
- $entity->load('permissions');
- $this->app->make(JointPermissionBuilder::class)->rebuildForEntity($entity);
- $entity->load('jointPermissions');
- }
-
- /**
- * Give the given user some permissions.
- */
- protected function giveUserPermissions(User $user, array $permissions = []): void
- {
- $newRole = $this->createNewRole($permissions);
- $user->attachRole($newRole);
- $user->load('roles');
- $user->clearPermissionCache();
- }
-
- /**
- * Completely remove the given permission name from the given user.
- */
- protected function removePermissionFromUser(User $user, string $permissionName)
- {
- $permissionBuilder = app()->make(JointPermissionBuilder::class);
-
- /** @var RolePermission $permission */
- $permission = RolePermission::query()->where('name', '=', $permissionName)->firstOrFail();
-
- $roles = $user->roles()->whereHas('permissions', function ($query) use ($permission) {
- $query->where('id', '=', $permission->id);
- })->get();
-
- /** @var Role $role */
- foreach ($roles as $role) {
- $role->detachPermission($permission);
- $permissionBuilder->rebuildForRole($role);
- }
-
- $user->clearPermissionCache();
- }
-
- /**
- * Create a new basic role for testing purposes.
- */
- protected function createNewRole(array $permissions = []): Role
- {
- $permissionRepo = app(PermissionsRepo::class);
- $roleData = Role::factory()->make()->toArray();
- $roleData['permissions'] = array_flip($permissions);
-
- return $permissionRepo->saveNewRole($roleData);
- }
-
- /**
- * Create a group of entities that belong to a specific user.
- *
- * @return array{book: Book, chapter: Chapter, page: Page}
- */
- protected function createEntityChainBelongingToUser(User $creatorUser, ?User $updaterUser = null): array
- {
- if (empty($updaterUser)) {
- $updaterUser = $creatorUser;
- }
-
- $userAttrs = ['created_by' => $creatorUser->id, 'owned_by' => $creatorUser->id, 'updated_by' => $updaterUser->id];
- $book = Book::factory()->create($userAttrs);
- $chapter = Chapter::factory()->create(array_merge(['book_id' => $book->id], $userAttrs));
- $page = Page::factory()->create(array_merge(['book_id' => $book->id, 'chapter_id' => $chapter->id], $userAttrs));
-
- $this->app->make(JointPermissionBuilder::class)->rebuildForEntity($book);
-
- return compact('book', 'chapter', 'page');
- }
-
- /**
- * Mock the HttpFetcher service and return the given data on fetch.
- */
- protected function mockHttpFetch($returnData, int $times = 1)
- {
- $mockHttp = Mockery::mock(HttpFetcher::class);
- $this->app[HttpFetcher::class] = $mockHttp;
- $mockHttp->shouldReceive('fetch')
- ->times($times)
- ->andReturn($returnData);
- }
-
- /**
- * Mock the http client used in BookStack.
- * Returns a reference to the container which holds all history of http transactions.
- *
- * @link https://docs.guzzlephp.org/en/stable/testing.html#history-middleware
- */
- protected function &mockHttpClient(array $responses = []): array
- {
- $container = [];
- $history = Middleware::history($container);
- $mock = new MockHandler($responses);
- $handlerStack = new HandlerStack($mock);
- $handlerStack->push($history);
- $this->app[ClientInterface::class] = new Client(['handler' => $handlerStack]);
-
- return $container;
- }
-
- /**
- * Run a set test with the given env variable.
- * Remembers the original and resets the value after test.
- */
- protected function runWithEnv(string $name, $value, callable $callback)
- {
- Env::disablePutenv();
- $originalVal = $_SERVER[$name] ?? null;
-
- if (is_null($value)) {
- unset($_SERVER[$name]);
- } else {
- $_SERVER[$name] = $value;
- }
-
- $this->refreshApplication();
- $callback();
-
- if (is_null($originalVal)) {
- unset($_SERVER[$name]);
- } else {
- $_SERVER[$name] = $originalVal;
- }
- }
-
- /**
- * Check the keys and properties in the given map to include
- * exist, albeit not exclusively, within the map to check.
- */
- protected function assertArrayMapIncludes(array $mapToInclude, array $mapToCheck, string $message = ''): void
- {
- $passed = true;
-
- foreach ($mapToInclude as $key => $value) {
- if (!isset($mapToCheck[$key]) || $mapToCheck[$key] !== $mapToInclude[$key]) {
- $passed = false;
- }
- }
-
- $toIncludeStr = print_r($mapToInclude, true);
- $toCheckStr = print_r($mapToCheck, true);
- self::assertThat($passed, self::isTrue(), "Failed asserting that given map:\n\n{$toCheckStr}\n\nincludes:\n\n{$toIncludeStr}");
- }
-
- /**
- * Assert a permission error has occurred.
- */
- protected function assertPermissionError($response)
- {
- PHPUnit::assertTrue($this->isPermissionError($response->baseResponse ?? $response->response), 'Failed asserting the response contains a permission error.');
- }
-
- /**
- * Assert a permission error has occurred.
- */
- protected function assertNotPermissionError($response)
- {
- PHPUnit::assertFalse($this->isPermissionError($response->baseResponse ?? $response->response), 'Failed asserting the response does not contain a permission error.');
- }
-
- /**
- * Check if the given response is a permission error.
- */
- private function isPermissionError($response): bool
- {
- return $response->status() === 302
- && (
- (
- $response->headers->get('Location') === url('/')
- && strpos(session()->pull('error', ''), 'You do not have permission to access') === 0
- )
- ||
- (
- $response instanceof JsonResponse &&
- $response->json(['error' => 'You do not have permission to perform the requested action.'])
- )
- );
- }
-
- /**
- * Assert that the session has a particular error notification message set.
- */
- protected function assertSessionError(string $message)
- {
- $error = session()->get('error');
- PHPUnit::assertTrue($error === $message, "Failed asserting the session contains an error. \nFound: {$error}\nExpecting: {$message}");
- }
-
- /**
- * Set a test handler as the logging interface for the application.
- * Allows capture of logs for checking against during tests.
- */
- protected function withTestLogger(): TestHandler
- {
- $monolog = new Logger('testing');
- $testHandler = new TestHandler();
- $monolog->pushHandler($testHandler);
-
- Log::extend('testing', function () use ($monolog) {
- return $monolog;
- });
- Log::setDefaultDriver('testing');
-
- return $testHandler;
- }
-}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 98e0dfbac..95e58b267 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,60 +2,411 @@
namespace Tests;
+use BookStack\Auth\Permissions\JointPermissionBuilder;
+use BookStack\Auth\Permissions\PermissionsRepo;
+use BookStack\Auth\Permissions\RolePermission;
+use BookStack\Auth\Role;
+use BookStack\Auth\User;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Models\Chapter;
use BookStack\Entities\Models\Entity;
+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Repos\BookRepo;
+use BookStack\Entities\Repos\BookshelfRepo;
+use BookStack\Entities\Repos\ChapterRepo;
+use BookStack\Entities\Repos\PageRepo;
+use BookStack\Settings\SettingService;
+use BookStack\Uploads\HttpFetcher;
+use GuzzleHttp\Client;
+use GuzzleHttp\Handler\MockHandler;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Middleware;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Env;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Testing\Assert as PHPUnit;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
+use Psr\Http\Client\ClientInterface;
+use Ssddanbrown\AssertHtml\TestsHtml;
abstract class TestCase extends BaseTestCase
{
use CreatesApplication;
use DatabaseTransactions;
- use SharedTestHelpers;
+ use TestsHtml;
+
+ protected ?User $admin = null;
+ protected ?User $editor = null;
/**
* The base URL to use while testing the application.
- *
- * @var string
*/
- protected $baseUrl = 'http://localhost';
+ protected string $baseUrl = 'http://localhost';
+
+ /**
+ * Set the current user context to be an admin.
+ */
+ public function asAdmin()
+ {
+ return $this->actingAs($this->getAdmin());
+ }
+
+ /**
+ * Get the current admin user.
+ */
+ public function getAdmin(): User
+ {
+ if (is_null($this->admin)) {
+ $adminRole = Role::getSystemRole('admin');
+ $this->admin = $adminRole->users->first();
+ }
+
+ return $this->admin;
+ }
+
+ /**
+ * Set the current user context to be an editor.
+ */
+ public function asEditor()
+ {
+ return $this->actingAs($this->getEditor());
+ }
+
+ /**
+ * Get a editor user.
+ */
+ protected function getEditor(): User
+ {
+ if ($this->editor === null) {
+ $editorRole = Role::getRole('editor');
+ $this->editor = $editorRole->users->first();
+ }
+
+ return $this->editor;
+ }
+
+ /**
+ * Get an instance of a user with 'viewer' permissions.
+ */
+ protected function getViewer(array $attributes = []): User
+ {
+ $user = Role::getRole('viewer')->users()->first();
+ if (!empty($attributes)) {
+ $user->forceFill($attributes)->save();
+ }
+
+ return $user;
+ }
+
+ /**
+ * Get a user that's not a system user such as the guest user.
+ */
+ public function getNormalUser(): User
+ {
+ return User::query()->where('system_name', '=', null)->get()->last();
+ }
+
+ /**
+ * Regenerate the permission for an entity.
+ */
+ protected function regenEntityPermissions(Entity $entity): void
+ {
+ $entity->rebuildPermissions();
+ $entity->load('jointPermissions');
+ }
+
+ /**
+ * Create and return a new bookshelf.
+ */
+ public function newShelf(array $input = ['name' => 'test shelf', 'description' => 'My new test shelf']): Bookshelf
+ {
+ return app(BookshelfRepo::class)->create($input, []);
+ }
+
+ /**
+ * Create and return a new book.
+ */
+ public function newBook(array $input = ['name' => 'test book', 'description' => 'My new test book']): Book
+ {
+ return app(BookRepo::class)->create($input);
+ }
+
+ /**
+ * Create and return a new test chapter.
+ */
+ public function newChapter(array $input, Book $book): Chapter
+ {
+ return app(ChapterRepo::class)->create($input, $book);
+ }
+
+ /**
+ * Create and return a new test page.
+ */
+ public function newPage(array $input = ['name' => 'test page', 'html' => 'My new test page']): Page
+ {
+ $book = Book::query()->first();
+ $pageRepo = app(PageRepo::class);
+ $draftPage = $pageRepo->getNewDraftPage($book);
+
+ return $pageRepo->publishDraft($draftPage, $input);
+ }
+
+ /**
+ * Quickly sets an array of settings.
+ */
+ protected function setSettings(array $settingsArray): void
+ {
+ $settings = app(SettingService::class);
+ foreach ($settingsArray as $key => $value) {
+ $settings->put($key, $value);
+ }
+ }
+
+ /**
+ * Manually set some permissions on an entity.
+ */
+ protected function setEntityRestrictions(Entity $entity, array $actions = [], array $roles = []): void
+ {
+ $entity->restricted = true;
+ $entity->permissions()->delete();
+
+ $permissions = [];
+ foreach ($actions as $action) {
+ foreach ($roles as $role) {
+ $permissions[] = [
+ 'role_id' => $role->id,
+ 'action' => strtolower($action),
+ ];
+ }
+ }
+ $entity->permissions()->createMany($permissions);
+
+ $entity->save();
+ $entity->load('permissions');
+ $this->app->make(JointPermissionBuilder::class)->rebuildForEntity($entity);
+ $entity->load('jointPermissions');
+ }
+
+ /**
+ * Give the given user some permissions.
+ */
+ protected function giveUserPermissions(User $user, array $permissions = []): void
+ {
+ $newRole = $this->createNewRole($permissions);
+ $user->attachRole($newRole);
+ $user->load('roles');
+ $user->clearPermissionCache();
+ }
+
+ /**
+ * Completely remove the given permission name from the given user.
+ */
+ protected function removePermissionFromUser(User $user, string $permissionName)
+ {
+ $permissionBuilder = app()->make(JointPermissionBuilder::class);
+
+ /** @var RolePermission $permission */
+ $permission = RolePermission::query()->where('name', '=', $permissionName)->firstOrFail();
+
+ $roles = $user->roles()->whereHas('permissions', function ($query) use ($permission) {
+ $query->where('id', '=', $permission->id);
+ })->get();
+
+ /** @var Role $role */
+ foreach ($roles as $role) {
+ $role->detachPermission($permission);
+ $permissionBuilder->rebuildForRole($role);
+ }
+
+ $user->clearPermissionCache();
+ }
+
+ /**
+ * Create a new basic role for testing purposes.
+ */
+ protected function createNewRole(array $permissions = []): Role
+ {
+ $permissionRepo = app(PermissionsRepo::class);
+ $roleData = Role::factory()->make()->toArray();
+ $roleData['permissions'] = array_flip($permissions);
+
+ return $permissionRepo->saveNewRole($roleData);
+ }
+
+ /**
+ * Create a group of entities that belong to a specific user.
+ *
+ * @return array{book: Book, chapter: Chapter, page: Page}
+ */
+ protected function createEntityChainBelongingToUser(User $creatorUser, ?User $updaterUser = null): array
+ {
+ if (empty($updaterUser)) {
+ $updaterUser = $creatorUser;
+ }
+
+ $userAttrs = ['created_by' => $creatorUser->id, 'owned_by' => $creatorUser->id, 'updated_by' => $updaterUser->id];
+ $book = Book::factory()->create($userAttrs);
+ $chapter = Chapter::factory()->create(array_merge(['book_id' => $book->id], $userAttrs));
+ $page = Page::factory()->create(array_merge(['book_id' => $book->id, 'chapter_id' => $chapter->id], $userAttrs));
+
+ $this->app->make(JointPermissionBuilder::class)->rebuildForEntity($book);
+
+ return compact('book', 'chapter', 'page');
+ }
+
+ /**
+ * Mock the HttpFetcher service and return the given data on fetch.
+ */
+ protected function mockHttpFetch($returnData, int $times = 1)
+ {
+ $mockHttp = Mockery::mock(HttpFetcher::class);
+ $this->app[HttpFetcher::class] = $mockHttp;
+ $mockHttp->shouldReceive('fetch')
+ ->times($times)
+ ->andReturn($returnData);
+ }
+
+ /**
+ * Mock the http client used in BookStack.
+ * Returns a reference to the container which holds all history of http transactions.
+ *
+ * @link https://docs.guzzlephp.org/en/stable/testing.html#history-middleware
+ */
+ protected function &mockHttpClient(array $responses = []): array
+ {
+ $container = [];
+ $history = Middleware::history($container);
+ $mock = new MockHandler($responses);
+ $handlerStack = new HandlerStack($mock);
+ $handlerStack->push($history);
+ $this->app[ClientInterface::class] = new Client(['handler' => $handlerStack]);
+
+ return $container;
+ }
+
+ /**
+ * Run a set test with the given env variable.
+ * Remembers the original and resets the value after test.
+ */
+ protected function runWithEnv(string $name, $value, callable $callback)
+ {
+ Env::disablePutenv();
+ $originalVal = $_SERVER[$name] ?? null;
+
+ if (is_null($value)) {
+ unset($_SERVER[$name]);
+ } else {
+ $_SERVER[$name] = $value;
+ }
+
+ $this->refreshApplication();
+ $callback();
+
+ if (is_null($originalVal)) {
+ unset($_SERVER[$name]);
+ } else {
+ $_SERVER[$name] = $originalVal;
+ }
+ }
+
+ /**
+ * Check the keys and properties in the given map to include
+ * exist, albeit not exclusively, within the map to check.
+ */
+ protected function assertArrayMapIncludes(array $mapToInclude, array $mapToCheck, string $message = ''): void
+ {
+ $passed = true;
+
+ foreach ($mapToInclude as $key => $value) {
+ if (!isset($mapToCheck[$key]) || $mapToCheck[$key] !== $mapToInclude[$key]) {
+ $passed = false;
+ }
+ }
+
+ $toIncludeStr = print_r($mapToInclude, true);
+ $toCheckStr = print_r($mapToCheck, true);
+ self::assertThat($passed, self::isTrue(), "Failed asserting that given map:\n\n{$toCheckStr}\n\nincludes:\n\n{$toIncludeStr}");
+ }
+
+ /**
+ * Assert a permission error has occurred.
+ */
+ protected function assertPermissionError($response)
+ {
+ PHPUnit::assertTrue($this->isPermissionError($response->baseResponse ?? $response->response), 'Failed asserting the response contains a permission error.');
+ }
+
+ /**
+ * Assert a permission error has occurred.
+ */
+ protected function assertNotPermissionError($response)
+ {
+ PHPUnit::assertFalse($this->isPermissionError($response->baseResponse ?? $response->response), 'Failed asserting the response does not contain a permission error.');
+ }
+
+ /**
+ * Check if the given response is a permission error.
+ */
+ private function isPermissionError($response): bool
+ {
+ return $response->status() === 302
+ && (
+ (
+ $response->headers->get('Location') === url('/')
+ && strpos(session()->pull('error', ''), 'You do not have permission to access') === 0
+ )
+ ||
+ (
+ $response instanceof JsonResponse &&
+ $response->json(['error' => 'You do not have permission to perform the requested action.'])
+ )
+ );
+ }
+
+ /**
+ * Assert that the session has a particular error notification message set.
+ */
+ protected function assertSessionError(string $message)
+ {
+ $error = session()->get('error');
+ PHPUnit::assertTrue($error === $message, "Failed asserting the session contains an error. \nFound: {$error}\nExpecting: {$message}");
+ }
/**
* Assert the session contains a specific entry.
- *
- * @param string $key
- *
- * @return $this
*/
- protected function assertSessionHas(string $key)
+ protected function assertSessionHas(string $key): self
{
$this->assertTrue(session()->has($key), "Session does not contain a [{$key}] entry");
return $this;
}
- /**
- * Override of the get method so we can get visibility of custom TestResponse methods.
- *
- * @param string $uri
- * @param array $headers
- *
- * @return TestResponse
- */
- public function get($uri, array $headers = [])
+ protected function assertNotificationContains(\Illuminate\Testing\TestResponse $resp, string $text)
{
- return parent::get($uri, $headers);
+ return $this->withHtml($resp)->assertElementContains('[notification]', $text);
}
/**
- * Create the test response instance from the given response.
- *
- * @param \Illuminate\Http\Response $response
- *
- * @return TestResponse
+ * Set a test handler as the logging interface for the application.
+ * Allows capture of logs for checking against during tests.
*/
- protected function createTestResponse($response)
+ protected function withTestLogger(): TestHandler
{
- return TestResponse::fromBaseResponse($response);
+ $monolog = new Logger('testing');
+ $testHandler = new TestHandler();
+ $monolog->pushHandler($testHandler);
+
+ Log::extend('testing', function () use ($monolog) {
+ return $monolog;
+ });
+ Log::setDefaultDriver('testing');
+
+ return $testHandler;
}
/**
diff --git a/tests/TestEmailTest.php b/tests/TestEmailTest.php
index e0350371a..97f98225d 100644
--- a/tests/TestEmailTest.php
+++ b/tests/TestEmailTest.php
@@ -12,8 +12,8 @@ class TestEmailTest extends TestCase
{
$pageView = $this->asAdmin()->get('/settings/maintenance');
$formCssSelector = 'form[action$="/settings/maintenance/send-test-email"]';
- $pageView->assertElementExists($formCssSelector);
- $pageView->assertElementContains($formCssSelector . ' button', 'Send Test Email');
+ $this->withHtml($pageView)->assertElementExists($formCssSelector);
+ $this->withHtml($pageView)->assertElementContains($formCssSelector . ' button', 'Send Test Email');
}
public function test_send_test_email_endpoint_sends_email_and_redirects_user_and_shows_notification()
diff --git a/tests/TestResponse.php b/tests/TestResponse.php
deleted file mode 100644
index 888bacdfc..000000000
--- a/tests/TestResponse.php
+++ /dev/null
@@ -1,196 +0,0 @@
-crawlerInstance)) {
- $this->crawlerInstance = new Crawler($this->getContent());
- }
-
- return $this->crawlerInstance;
- }
-
- /**
- * Get the HTML of the first element at the given selector.
- */
- public function getElementHtml(string $selector): string
- {
- return $this->crawler()->filter($selector)->first()->outerHtml();
- }
-
- /**
- * Assert the response contains the specified element.
- *
- * @return $this
- */
- public function assertElementExists(string $selector)
- {
- $elements = $this->crawler()->filter($selector);
- PHPUnit::assertTrue(
- $elements->count() > 0,
- 'Unable to find element matching the selector: ' . PHP_EOL . PHP_EOL .
- "[{$selector}]" . PHP_EOL . PHP_EOL .
- 'within' . PHP_EOL . PHP_EOL .
- "[{$this->getContent()}]."
- );
-
- return $this;
- }
-
- /**
- * Assert the response contains the given count of elements
- * that match the given css selector.
- *
- * @return $this
- */
- public function assertElementCount(string $selector, int $count)
- {
- $elements = $this->crawler()->filter($selector);
- PHPUnit::assertTrue(
- $elements->count() === $count,
- 'Unable to ' . $count . ' element(s) matching the selector: ' . PHP_EOL . PHP_EOL .
- "[{$selector}]" . PHP_EOL . PHP_EOL .
- 'found ' . $elements->count() . ' within' . PHP_EOL . PHP_EOL .
- "[{$this->getContent()}]."
- );
-
- return $this;
- }
-
- /**
- * Assert the response does not contain the specified element.
- *
- * @return $this
- */
- public function assertElementNotExists(string $selector)
- {
- $elements = $this->crawler()->filter($selector);
- PHPUnit::assertTrue(
- $elements->count() === 0,
- 'Found elements matching the selector: ' . PHP_EOL . PHP_EOL .
- "[{$selector}]" . PHP_EOL . PHP_EOL .
- 'within' . PHP_EOL . PHP_EOL .
- "[{$this->getContent()}]."
- );
-
- return $this;
- }
-
- /**
- * Assert the response includes a specific element containing the given text.
- * If an nth match is provided, only that will be checked otherwise all matching
- * elements will be checked for the given text.
- *
- * @return $this
- */
- public function assertElementContains(string $selector, string $text, ?int $nthMatch = null)
- {
- $elements = $this->crawler()->filter($selector);
- $matched = false;
- $pattern = $this->getEscapedPattern($text);
-
- if (!is_null($nthMatch)) {
- $elements = $elements->eq($nthMatch - 1);
- }
-
- foreach ($elements as $element) {
- $element = new Crawler($element);
- if (preg_match("/$pattern/i", $element->text())) {
- $matched = true;
- break;
- }
- }
-
- PHPUnit::assertTrue(
- $matched,
- 'Unable to find element of selector: ' . PHP_EOL . PHP_EOL .
- ($nthMatch ? ("at position {$nthMatch}" . PHP_EOL . PHP_EOL) : '') .
- "[{$selector}]" . PHP_EOL . PHP_EOL .
- 'containing text' . PHP_EOL . PHP_EOL .
- "[{$text}]" . PHP_EOL . PHP_EOL .
- 'within' . PHP_EOL . PHP_EOL .
- "[{$this->getContent()}]."
- );
-
- return $this;
- }
-
- /**
- * Assert the response does not include a specific element containing the given text.
- * If an nth match is provided, only that will be checked otherwise all matching
- * elements will be checked for the given text.
- *
- * @return $this
- */
- public function assertElementNotContains(string $selector, string $text, ?int $nthMatch = null)
- {
- $elements = $this->crawler()->filter($selector);
- $matched = false;
- $pattern = $this->getEscapedPattern($text);
-
- if (!is_null($nthMatch)) {
- $elements = $elements->eq($nthMatch - 1);
- }
-
- foreach ($elements as $element) {
- $element = new Crawler($element);
- if (preg_match("/$pattern/i", $element->html())) {
- $matched = true;
- break;
- }
- }
-
- PHPUnit::assertTrue(
- !$matched,
- 'Found element of selector: ' . PHP_EOL . PHP_EOL .
- ($nthMatch ? ("at position {$nthMatch}" . PHP_EOL . PHP_EOL) : '') .
- "[{$selector}]" . PHP_EOL . PHP_EOL .
- 'containing text' . PHP_EOL . PHP_EOL .
- "[{$text}]" . PHP_EOL . PHP_EOL .
- 'within' . PHP_EOL . PHP_EOL .
- "[{$this->getContent()}]."
- );
-
- return $this;
- }
-
- /**
- * Assert there's a notification within the view containing the given text.
- *
- * @return $this
- */
- public function assertNotificationContains(string $text)
- {
- return $this->assertElementContains('[notification]', $text);
- }
-
- /**
- * Get the escaped text pattern for the constraint.
- *
- * @return string
- */
- protected function getEscapedPattern(string $text)
- {
- $rawPattern = preg_quote($text, '/');
- $escapedPattern = preg_quote(e($text), '/');
-
- return $rawPattern == $escapedPattern
- ? $rawPattern : "({$rawPattern}|{$escapedPattern})";
- }
-}
diff --git a/tests/ThemeTest.php b/tests/ThemeTest.php
index 23b55a8ba..12a25a6d4 100644
--- a/tests/ThemeTest.php
+++ b/tests/ThemeTest.php
@@ -37,7 +37,7 @@ class ThemeTest extends TestCase
file_put_contents($translationPath . '/entities.php', $customTranslations);
$homeRequest = $this->actingAs($this->getViewer())->get('/');
- $homeRequest->assertElementContains('header nav', 'Sandwiches');
+ $this->withHtml($homeRequest)->assertElementContains('header nav', 'Sandwiches');
});
}
diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index 01754d2de..c006f9612 100644
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -104,11 +104,13 @@ class ImageTest extends TestCase
$pageId = $imgDetails['page']->id;
$firstPageRequest = $this->get("/images/gallery?page=1&uploaded_to={$pageId}");
- $firstPageRequest->assertSuccessful()->assertElementExists('div');
+ $firstPageRequest->assertSuccessful();
+ $this->withHtml($firstPageRequest)->assertElementExists('div');
$firstPageRequest->assertSuccessful()->assertSeeText($image->name);
$secondPageRequest = $this->get("/images/gallery?page=2&uploaded_to={$pageId}");
- $secondPageRequest->assertSuccessful()->assertElementNotExists('div');
+ $secondPageRequest->assertSuccessful();
+ $this->withHtml($secondPageRequest)->assertElementNotExists('div');
$namePartial = substr($imgDetails['name'], 0, 3);
$searchHitRequest = $this->get("/images/gallery?page=1&uploaded_to={$pageId}&search={$namePartial}");
@@ -117,7 +119,8 @@ class ImageTest extends TestCase
$namePartial = Str::random(16);
$searchFailRequest = $this->get("/images/gallery?page=1&uploaded_to={$pageId}&search={$namePartial}");
$searchFailRequest->assertSuccessful()->assertDontSee($imgDetails['name']);
- $searchFailRequest->assertSuccessful()->assertElementNotExists('div');
+ $searchFailRequest->assertSuccessful();
+ $this->withHtml($searchFailRequest)->assertElementNotExists('div');
}
public function test_image_usage()
diff --git a/tests/User/UserApiTokenTest.php b/tests/User/UserApiTokenTest.php
index d3404b72e..716f3614c 100644
--- a/tests/User/UserApiTokenTest.php
+++ b/tests/User/UserApiTokenTest.php
@@ -93,10 +93,10 @@ class UserApiTokenTest extends TestCase
$token = ApiToken::query()->latest()->first();
$resp = $this->get($editor->getEditUrl());
- $resp->assertElementExists('#api_tokens');
- $resp->assertElementContains('#api_tokens', $token->name);
- $resp->assertElementContains('#api_tokens', $token->token_id);
- $resp->assertElementContains('#api_tokens', $token->expires_at->format('Y-m-d'));
+ $this->withHtml($resp)->assertElementExists('#api_tokens');
+ $this->withHtml($resp)->assertElementContains('#api_tokens', $token->name);
+ $this->withHtml($resp)->assertElementContains('#api_tokens', $token->token_id);
+ $this->withHtml($resp)->assertElementContains('#api_tokens', $token->expires_at->format('Y-m-d'));
}
public function test_secret_shown_once_after_creation()
@@ -161,7 +161,7 @@ class UserApiTokenTest extends TestCase
$resp = $this->get($tokenUrl . '/delete');
$resp->assertSeeText('Delete Token');
$resp->assertSeeText($token->name);
- $resp->assertElementExists('form[action="' . $tokenUrl . '"]');
+ $this->withHtml($resp)->assertElementExists('form[action="' . $tokenUrl . '"]');
$resp = $this->delete($tokenUrl);
$resp->assertRedirect($editor->getEditUrl('#api_tokens'));
diff --git a/tests/User/UserManagementTest.php b/tests/User/UserManagementTest.php
index 5870b6827..3102b7bde 100644
--- a/tests/User/UserManagementTest.php
+++ b/tests/User/UserManagementTest.php
@@ -22,10 +22,10 @@ class UserManagementTest extends TestCase
$adminRole = Role::getRole('admin');
$resp = $this->asAdmin()->get('/settings/users');
- $resp->assertElementContains('a[href="' . url('/settings/users/create') . '"]', 'Add New User');
+ $this->withHtml($resp)->assertElementContains('a[href="' . url('/settings/users/create') . '"]', 'Add New User');
- $this->get('/settings/users/create')
- ->assertElementContains('form[action="' . url('/settings/users/create') . '"]', 'Save');
+ $resp =$this->get('/settings/users/create');
+ $this->withHtml($resp)->assertElementContains('form[action="' . url('/settings/users/create') . '"]', 'Save');
$resp = $this->post('/settings/users/create', [
'name' => $user->name,
@@ -166,7 +166,7 @@ class UserManagementTest extends TestCase
$guest = User::getDefault();
$resp = $this->asAdmin()->get('/settings/users/' . $guest->id);
$resp->assertSee('Guest');
- $resp->assertElementNotExists('#password');
+ $this->withHtml($resp)->assertElementNotExists('#password');
}
public function test_guest_profile_cannot_be_deleted()
@@ -175,7 +175,7 @@ class UserManagementTest extends TestCase
$resp = $this->asAdmin()->get('/settings/users/' . $guestUser->id . '/delete');
$resp->assertSee('Delete User');
$resp->assertSee('Guest');
- $resp->assertElementContains('form[action$="/settings/users/' . $guestUser->id . '"] button', 'Confirm');
+ $this->withHtml($resp)->assertElementContains('form[action$="/settings/users/' . $guestUser->id . '"] button', 'Confirm');
$resp = $this->delete('/settings/users/' . $guestUser->id);
$resp->assertRedirect('/settings/users/' . $guestUser->id);
@@ -189,7 +189,7 @@ class UserManagementTest extends TestCase
foreach ($langs as $lang) {
config()->set('app.locale', $lang);
$resp = $this->asAdmin()->get('/settings/users/create');
- $resp->assertElementExists('select[name="language"] option[value="' . $lang . '"][selected]');
+ $this->withHtml($resp)->assertElementExists('select[name="language"] option[value="' . $lang . '"][selected]');
}
}
diff --git a/tests/User/UserPreferencesTest.php b/tests/User/UserPreferencesTest.php
index b39c2c47c..7f305285a 100644
--- a/tests/User/UserPreferencesTest.php
+++ b/tests/User/UserPreferencesTest.php
@@ -81,8 +81,8 @@ class UserPreferencesTest extends TestCase
public function test_toggle_dark_mode()
{
$home = $this->actingAs($this->getEditor())->get('/');
- $home->assertElementNotExists('.dark-mode');
$home->assertSee('Dark Mode');
+ $this->withHtml($home)->assertElementNotExists('.dark-mode');
$this->assertEquals(false, setting()->getForCurrentUser('dark-mode-enabled', false));
$prefChange = $this->patch('/settings/users/toggle-dark-mode');
@@ -90,7 +90,7 @@ class UserPreferencesTest extends TestCase
$this->assertEquals(true, setting()->getForCurrentUser('dark-mode-enabled'));
$home = $this->actingAs($this->getEditor())->get('/');
- $home->assertElementExists('.dark-mode');
+ $this->withHtml($home)->assertElementExists('.dark-mode');
$home->assertDontSee('Dark Mode');
$home->assertSee('Light Mode');
}
@@ -100,12 +100,12 @@ class UserPreferencesTest extends TestCase
config()->set('setting-defaults.user.dark-mode-enabled', false);
$this->assertEquals(false, setting()->getForCurrentUser('dark-mode-enabled'));
$home = $this->get('/login');
- $home->assertElementNotExists('.dark-mode');
+ $this->withHtml($home)->assertElementNotExists('.dark-mode');
config()->set('setting-defaults.user.dark-mode-enabled', true);
$this->assertEquals(true, setting()->getForCurrentUser('dark-mode-enabled'));
$home = $this->get('/login');
- $home->assertElementExists('.dark-mode');
+ $this->withHtml($home)->assertElementExists('.dark-mode');
}
public function test_books_view_type_preferences_when_list()
@@ -113,7 +113,8 @@ class UserPreferencesTest extends TestCase
$editor = $this->getEditor();
setting()->putUser($editor, 'books_view_type', 'list');
- $this->actingAs($editor)->get('/books')
+ $resp = $this->actingAs($editor)->get('/books');
+ $this->withHtml($resp)
->assertElementNotExists('.featured-image-container')
->assertElementExists('.content-wrap .entity-list-item');
}
@@ -123,8 +124,8 @@ class UserPreferencesTest extends TestCase
$editor = $this->getEditor();
setting()->putUser($editor, 'books_view_type', 'grid');
- $this->actingAs($editor)->get('/books')
- ->assertElementExists('.featured-image-container');
+ $resp = $this->actingAs($editor)->get('/books');
+ $this->withHtml($resp)->assertElementExists('.featured-image-container');
}
public function test_shelf_view_type_change()
@@ -134,17 +135,20 @@ class UserPreferencesTest extends TestCase
$shelf = Bookshelf::query()->first();
setting()->putUser($editor, 'bookshelf_view_type', 'list');
- $this->actingAs($editor)->get($shelf->getUrl())
+ $resp = $this->actingAs($editor)->get($shelf->getUrl())->assertSee('Grid View');
+ $this->withHtml($resp)
->assertElementNotExists('.featured-image-container')
- ->assertElementExists('.content-wrap .entity-list-item')
- ->assertSee('Grid View');
+ ->assertElementExists('.content-wrap .entity-list-item');
$req = $this->patch("/settings/users/{$editor->id}/switch-shelf-view", ['view_type' => 'grid']);
$req->assertRedirect($shelf->getUrl());
- $this->actingAs($editor)->get($shelf->getUrl())
- ->assertElementExists('.featured-image-container')
- ->assertElementNotExists('.content-wrap .entity-list-item')
+ $resp = $this->actingAs($editor)->get($shelf->getUrl())
->assertSee('List View');
+
+ $this->withHtml($resp)
+ ->assertElementExists('.featured-image-container')
+ ->assertElementNotExists('.content-wrap .entity-list-item');
+
}
}
diff --git a/tests/User/UserProfileTest.php b/tests/User/UserProfileTest.php
index 869368975..e6136962a 100644
--- a/tests/User/UserProfileTest.php
+++ b/tests/User/UserProfileTest.php
@@ -44,17 +44,17 @@ class UserProfileTest extends TestCase
{
$newUser = User::factory()->create();
- $this->asAdmin()->get('/user/' . $newUser->slug)
- ->assertSee($newUser->name)
- ->assertElementContains('#content-counts', '0 Books')
+ $resp = $this->asAdmin()->get('/user/' . $newUser->slug)
+ ->assertSee($newUser->name);
+ $this->withHtml($resp)->assertElementContains('#content-counts', '0 Books')
->assertElementContains('#content-counts', '0 Chapters')
->assertElementContains('#content-counts', '0 Pages');
$this->createEntityChainBelongingToUser($newUser, $newUser);
- $this->asAdmin()->get('/user/' . $newUser->slug)
- ->assertSee($newUser->name)
- ->assertElementContains('#content-counts', '1 Book')
+ $resp = $this->asAdmin()->get('/user/' . $newUser->slug)
+ ->assertSee($newUser->name);
+ $this->withHtml($resp)->assertElementContains('#content-counts', '1 Book')
->assertElementContains('#content-counts', '1 Chapter')
->assertElementContains('#content-counts', '1 Page');
}
@@ -67,8 +67,8 @@ class UserProfileTest extends TestCase
Activity::add(ActivityType::BOOK_UPDATE, $entities['book']);
Activity::add(ActivityType::PAGE_CREATE, $entities['page']);
- $this->asAdmin()->get('/user/' . $newUser->slug)
- ->assertElementContains('#recent-user-activity', 'updated book')
+ $resp = $this->asAdmin()->get('/user/' . $newUser->slug);
+ $this->withHtml($resp)->assertElementContains('#recent-user-activity', 'updated book')
->assertElementContains('#recent-user-activity', 'created page')
->assertElementContains('#recent-user-activity', $entities['page']->name);
}
@@ -82,8 +82,8 @@ class UserProfileTest extends TestCase
Activity::add(ActivityType::PAGE_CREATE, $entities['page']);
$linkSelector = '#recent-activity a[href$="/user/' . $newUser->slug . '"]';
- $this->asAdmin()->get('/')
- ->assertElementContains($linkSelector, $newUser->name);
+ $resp = $this->asAdmin()->get('/');
+ $this->withHtml($resp)->assertElementContains($linkSelector, $newUser->name);
}
public function test_profile_has_search_links_in_created_entity_lists()
@@ -99,7 +99,7 @@ class UserProfileTest extends TestCase
];
foreach ($expectedLinks as $link) {
- $resp->assertElementContains('[href$="' . $link . '"]', 'View All');
+ $this->withHtml($resp)->assertElementContains('[href$="' . $link . '"]', 'View All');
}
}
}