Fixed OIDC Logout

[bookstack] / tests / Entity / PageEditorTest.php

diff --git a/tests/Entity/PageEditorTest.php b/tests/Entity/PageEditorTest.php
index 3fe7b33cd594a2279504a32029b521bb525f43a2..b2fb859554354e9536c651ca6224e11a014f6a9d 100644 (file)
--- a/tests/Entity/PageEditorTest.php
+++ b/tests/Entity/PageEditorTest.php
@@ -2,27 +2,25 @@
 
 namespace Tests\Entity;
 
 
 namespace Tests\Entity;
 

-use BookStack\Entities\Models\Book;

 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use Tests\TestCase;
 
 class PageEditorTest extends TestCase
 {
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 use Tests\TestCase;
 
 class PageEditorTest extends TestCase
 {

-    /** @var Page */
-    protected $page;
+    protected Page $page;

 
     protected function setUp(): void
     {
         parent::setUp();
 
     protected function setUp(): void
     {
         parent::setUp();

-        $this->page = Page::query()->first();
+        $this->page = $this->entities->page();

     }
 
     public function test_default_editor_is_wysiwyg_for_new_pages()
     {
         $this->assertEquals('wysiwyg', setting('app-editor'));
         $resp = $this->asAdmin()->get($this->page->book->getUrl('/create-page'));
     }
 
     public function test_default_editor_is_wysiwyg_for_new_pages()
     {
         $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()
     }
 
     public function test_markdown_setting_shows_markdown_editor_for_new_pages()


@@ -30,7 +28,7 @@ class PageEditorTest extends TestCase
         $this->setSettings(['app-editor' => 'markdown']);
 
         $resp = $this->asAdmin()->get($this->page->book->getUrl('/create-page'));
         $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');
     }
             ->assertElementNotExists('#html-editor')
             ->assertElementExists('#markdown-editor');
     }


@@ -42,8 +40,8 @@ class PageEditorTest extends TestCase
         $this->page->editor = 'markdown';
         $this->page->save();
 
         $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()
     }
 
     public function test_html_content_given_to_editor_if_no_markdown()


@@ -51,15 +49,14 @@ class PageEditorTest extends TestCase
         $this->page->editor = 'markdown';
         $this->page->save();
 
         $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()
     {
         $this->setSettings(['app-editor' => 'markdown']);
     }
 
     public function test_empty_markdown_still_saves_without_error()
     {
         $this->setSettings(['app-editor' => 'markdown']);

-        /** @var Book $book */
-        $book = Book::query()->first();
+        $book = $this->entities->book();

 
         $this->asEditor()->get($book->getUrl('/create-page'));
         $draft = Page::query()->where('book_id', '=', $book->id)
 
         $this->asEditor()->get($book->getUrl('/create-page'));
         $draft = Page::query()->where('book_id', '=', $book->id)


@@ -81,8 +78,7 @@ class PageEditorTest extends TestCase
 
     public function test_back_link_in_editor_has_correct_url()
     {
 
     public function test_back_link_in_editor_has_correct_url()
     {

-        /** @var Book $book */
-        $book = Book::query()->whereHas('pages')->whereHas('chapters')->firstOrFail();
+        $book = $this->entities->bookHasChaptersAndPages();

         $this->asEditor()->get($book->getUrl('/create-page'));
         /** @var Chapter $chapter */
         $chapter = $book->chapters()->firstOrFail();
         $this->asEditor()->get($book->getUrl('/create-page'));
         /** @var Chapter $chapter */
         $chapter = $book->chapters()->firstOrFail();


@@ -91,110 +87,105 @@ class PageEditorTest extends TestCase
 
         // Book draft goes back to book
         $resp = $this->get($book->getUrl("/draft/{$draft->id}"));
 
         // 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}"));
 
         // 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'));
 
         // 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()
     {
     }
 
     public function test_switching_from_html_to_clean_markdown_works()
     {

-        /** @var Page $page */
-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $page->html = '<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>';
         $page->save();
 
         $resp = $this->asAdmin()->get($page->getUrl('/edit?editor=markdown-clean'));
         $resp->assertStatus(200);
         $resp->assertSee("## A Header\n\nSome **bold** content.");
         $page->html = '<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>';
         $page->save();
 
         $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()
     {
     }
 
     public function test_switching_from_html_to_stable_markdown_works()
     {

-        /** @var Page $page */
-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $page->html = '<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>';
         $page->save();
 
         $resp = $this->asAdmin()->get($page->getUrl('/edit?editor=markdown-stable'));
         $resp->assertStatus(200);
         $page->html = '<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>';
         $page->save();
 
         $resp = $this->asAdmin()->get($page->getUrl('/edit?editor=markdown-stable'));
         $resp->assertStatus(200);

-        $resp->assertSee("<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>", true);
-        $resp->assertElementExists('[component="markdown-editor"]');
+        $resp->assertSee('<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>', true);
+        $this->withHtml($resp)->assertElementExists('[component="markdown-editor"]');

     }
 
     public function test_switching_from_markdown_to_wysiwyg_works()
     {
     }
 
     public function test_switching_from_markdown_to_wysiwyg_works()
     {

-        /** @var Page $page */
-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $page->html = '';
         $page->markdown = "## A Header\n\nSome content with **bold** text!";
         $page->save();
 
         $resp = $this->asAdmin()->get($page->getUrl('/edit?editor=wysiwyg'));
         $resp->assertStatus(200);
         $page->html = '';
         $page->markdown = "## A Header\n\nSome content with **bold** text!";
         $page->save();
 
         $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("<h2>A Header</h2>\n<p>Some content with <strong>bold</strong> text!</p>", true);
     }
 
     public function test_page_editor_changes_with_editor_property()
     {
         $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
         $resp->assertSee("<h2>A Header</h2>\n<p>Some content with <strong>bold</strong> text!</p>", 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'));
 
         $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=';
     }
 
     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 = $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=';
     }
 
     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()
     {
     }
 
     public function test_page_editor_type_switch_does_not_work_without_change_editor_permissions()
     {

-        /** @var Page $page */
-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $page->html = '<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>';
         $page->save();
 
         $resp = $this->asEditor()->get($page->getUrl('/edit?editor=markdown-stable'));
         $resp->assertStatus(200);
         $page->html = '<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>';
         $page->save();
 
         $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()
     {
     }
 
     public function test_page_save_does_not_change_active_editor_without_change_editor_permissions()
     {

-        /** @var Page $page */
-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $page->html = '<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>';
         $page->editor = 'wysiwyg';
         $page->save();
         $page->html = '<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>';
         $page->editor = 'wysiwyg';
         $page->save();


@@ -202,5 +193,4 @@ class PageEditorTest extends TestCase
         $this->asEditor()->put($page->getUrl(), ['name' => $page->name, 'markdown' => '## Updated content abc']);
         $this->assertEquals('wysiwyg', $page->refresh()->editor);
     }
         $this->asEditor()->put($page->getUrl(), ['name' => $page->name, 'markdown' => '## Updated content abc']);
         $this->assertEquals('wysiwyg', $page->refresh()->editor);
     }

-

 }
 }