X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/1b46aa87565547ff7af21dfec1c2d7d89ff4873d..refs/pull/3693/head:/tests/Entity/PageEditorTest.php

diff --git a/tests/Entity/PageEditorTest.php b/tests/Entity/PageEditorTest.php
index f489e6b03..e5aa549b3 100644
--- a/tests/Entity/PageEditorTest.php
+++ b/tests/Entity/PageEditorTest.php
@@ -18,38 +18,41 @@ class PageEditorTest extends TestCase
         $this->page = Page::query()->first();
     }
 
-    public function test_default_editor_is_wysiwyg()
+    public function test_default_editor_is_wysiwyg_for_new_pages()
     {
         $this->assertEquals('wysiwyg', setting('app-editor'));
-        $this->asAdmin()->get($this->page->getUrl() . '/edit')
-            ->assertElementExists('#html-editor');
+        $resp = $this->asAdmin()->get($this->page->book->getUrl('/create-page'));
+        $this->withHtml($this->followRedirects($resp))->assertElementExists('#html-editor');
     }
 
-    public function test_markdown_setting_shows_markdown_editor()
+    public function test_markdown_setting_shows_markdown_editor_for_new_pages()
     {
         $this->setSettings(['app-editor' => 'markdown']);
-        $this->asAdmin()->get($this->page->getUrl() . '/edit')
+
+        $resp = $this->asAdmin()->get($this->page->book->getUrl('/create-page'));
+        $this->withHtml($this->followRedirects($resp))
             ->assertElementNotExists('#html-editor')
             ->assertElementExists('#markdown-editor');
     }
 
     public function test_markdown_content_given_to_editor()
     {
-        $this->setSettings(['app-editor' => 'markdown']);
-
         $mdContent = '# hello. This is a test';
         $this->page->markdown = $mdContent;
+        $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()
     {
-        $this->setSettings(['app-editor' => 'markdown']);
-        $this->asAdmin()->get($this->page->getUrl() . '/edit')
-            ->assertElementContains('[name="markdown"]', $this->page->html);
+        $this->page->editor = 'markdown';
+        $this->page->save();
+
+        $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()
@@ -88,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()
@@ -113,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()
@@ -125,8 +128,8 @@ class PageEditorTest extends TestCase
 
         $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()
@@ -139,49 +142,64 @@ 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("<h2>A Header</h2>\n<p>Some content with <strong>bold</strong> text!</p>", true);
     }
 
-    public function test_page_editor_depends_on_content_type()
+    public function test_page_editor_changes_with_editor_property()
     {
-        /** @var Page $page */
-        $page = Page::query()->first();
+        $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor"]');
 
-        $resp = $this->asAdmin()->get($page->getUrl('/edit'));
-        $resp->assertElementExists('[component="wysiwyg-editor"]');
-
-        $page->html = '';
-        $page->markdown = "## A Header\n\nSome content with **bold** text!";
-        $page->save();
+        $this->page->markdown = "## A Header\n\nSome content with **bold** text!";
+        $this->page->editor = 'markdown';
+        $this->page->save();
 
-        $resp = $this->asAdmin()->get($page->getUrl('/edit'));
-        $resp->assertElementExists('[component="markdown-editor"]');
+        $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
+        $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=';
+        $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=';
+        $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=';
+        $this->withHtml($resp)->assertElementNotExists("a[href*=\"${editLink}\"]");
+    }
+
+    public function test_page_editor_type_switch_does_not_work_without_change_editor_permissions()
     {
         /** @var Page $page */
         $page = Page::query()->first();
+        $page->html = '<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>';
+        $page->save();
 
-        $resp = $this->asAdmin()->get($page->getUrl('/edit'));
-        $editLink = $page->getUrl('/edit') . '?editor=';
-        $resp->assertElementContains("a[href=\"${editLink}markdown-clean\"]", '(Clean Content)');
-        $resp->assertElementContains("a[href=\"${editLink}markdown-stable\"]", '(Stable Content)');
-
-        $resp = $this->asAdmin()->get($page->getUrl('/edit?editor=markdown-stable'));
-        $editLink = $page->getUrl('/edit') . '?editor=';
-        $resp->assertElementContains("a[href=\"${editLink}wysiwyg\"]", 'Switch to WYSIWYG Editor');
+        $resp = $this->asEditor()->get($page->getUrl('/edit?editor=markdown-stable'));
+        $resp->assertStatus(200);
+        $this->withHtml($resp)->assertElementExists('[component="wysiwyg-editor"]');
+        $this->withHtml($resp)->assertElementNotExists('[component="markdown-editor"]');
     }
 
-    public function test_editor_type_switch_options_dont_show_if_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->html = '<h2>A Header</h2><p>Some <strong>bold</strong> content.</p>';
+        $page->editor = 'wysiwyg';
+        $page->save();
 
-        $resp = $this->asEditor()->get($page->getUrl('/edit'));
-        $editLink = $page->getUrl('/edit') . '?editor=';
-        $resp->assertElementNotExists("a[href*=\"${editLink}\"]");
+        $this->asEditor()->put($page->getUrl(), ['name' => $page->name, 'markdown' => '## Updated content abc']);
+        $this->assertEquals('wysiwyg', $page->refresh()->editor);
     }
-
 }