ZIP Imports: Added API examples, finished testing

[bookstack] / tests / Entity / PageDraftTest.php

diff --git a/tests/Entity/PageDraftTest.php b/tests/Entity/PageDraftTest.php
index 0e3980c6702217cd10043748a9d8ad89dbb18bcc..e99ba9b8189423f85922e0fe066550f25e467ee5 100644 (file)
--- a/tests/Entity/PageDraftTest.php
+++ b/tests/Entity/PageDraftTest.php
@@ -1,116 +1,244 @@
-<?php namespace Tests\Entity;
+<?php
+
+namespace Tests\Entity;

 
 use BookStack\Entities\Models\Page;
 
 use BookStack\Entities\Models\Page;

+use BookStack\Entities\Models\PageRevision;

 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Repos\PageRepo;

-use Tests\BrowserKitTest;
+use Tests\TestCase;

 
 

-class PageDraftTest extends BrowserKitTest
+class PageDraftTest extends TestCase

 {
 {

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

 
 

-    public function setUp(): void
+    protected function setUp(): void

     {
         parent::setUp();
     {
         parent::setUp();

-        $this->page = \BookStack\Entities\Models\Page::first();
-        $this->pageRepo = app(PageRepo::class);
+        $this->page = $this->entities->page();
+        $this->pageRepo = app()->make(PageRepo::class);

     }
 
     public function test_draft_content_shows_if_available()
     {
         $addedContent = '<p>test message content</p>';
     }
 
     public function test_draft_content_shows_if_available()
     {
         $addedContent = '<p>test message content</p>';

-        $this->asAdmin()->visit($this->page->getUrl('/edit'))
-            ->dontSeeInField('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]);
 
         $newContent = $this->page->html . $addedContent;
         $this->pageRepo->updatePageDraft($this->page, ['html' => $newContent]);

-        $this->asAdmin()->visit($this->page->getUrl('/edit'))
-            ->seeInField('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 = '<p>test message content</p>';
     }
 
     public function test_draft_not_visible_by_others()
     {
         $addedContent = '<p>test message content</p>';

-        $this->asAdmin()->visit($this->page->getUrl('/edit'))
-            ->dontSeeInField('html', $addedContent);
+        $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementNotContains('[name="html"]', $addedContent);

 
         $newContent = $this->page->html . $addedContent;
 
         $newContent = $this->page->html . $addedContent;

-        $newUser = $this->getEditor();
+        $newUser = $this->users->editor();

         $this->pageRepo->updatePageDraft($this->page, ['html' => $newContent]);
 
         $this->pageRepo->updatePageDraft($this->page, ['html' => $newContent]);
 

-        $this->actingAs($newUser)->visit($this->page->getUrl('/edit'))
-            ->dontSeeInField('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()
     {
         $this->asAdmin();
         $this->pageRepo->updatePageDraft($this->page, ['html' => 'test content']);
     }
 
     public function test_alert_message_shows_if_editing_draft()
     {
         $this->asAdmin();
         $this->pageRepo->updatePageDraft($this->page, ['html' => 'test content']);

-        $this->asAdmin()->visit($this->page->getUrl('/edit'))
-            ->see('You are currently editing a draft');
+        $this->asAdmin()->get($this->page->getUrl('/edit'))
+            ->assertSee('You are currently editing a draft');

     }
 
     public function test_alert_message_shows_if_someone_else_editing()
     {
     }
 
     public function test_alert_message_shows_if_someone_else_editing()
     {

-        $nonEditedPage = \BookStack\Entities\Models\Page::take(10)->get()->last();
+        $nonEditedPage = Page::query()->take(10)->get()->last();

         $addedContent = '<p>test message content</p>';
         $addedContent = '<p>test message content</p>';

-        $this->asAdmin()->visit($this->page->getUrl('/edit'))
-            ->dontSeeInField('html', $addedContent);
+        $resp = $this->asAdmin()->get($this->page->getUrl('/edit'));
+        $this->withHtml($resp)->assertElementNotContains('[name="html"]', $addedContent);

 
         $newContent = $this->page->html . $addedContent;
 
         $newContent = $this->page->html . $addedContent;

-        $newUser = $this->getEditor();
+        $newUser = $this->users->editor();

         $this->pageRepo->updatePageDraft($this->page, ['html' => $newContent]);
 
         $this->actingAs($newUser)
         $this->pageRepo->updatePageDraft($this->page, ['html' => $newContent]);
 
         $this->actingAs($newUser)

-            ->visit($this->page->getUrl('/edit'))
-            ->see('Admin has started editing this page');
-            $this->flushSession();
-        $this->visit($nonEditedPage->getUrl() . '/edit')
-            ->dontSeeInElement('.notification', 'Admin has started editing this page');
+            ->get($this->page->getUrl('/edit'))
+            ->assertSee('Admin has started editing this page');
+        $this->flushSession();
+        $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()
+    {
+        $admin = $this->users->admin();
+        $editor = $this->users->editor();
+        $page = $this->entities->page();
+
+        $this->actingAs($editor)->put('/ajax/page/' . $page->id . '/save-draft', [
+            'name' => $page->name,
+            'html' => '<p>updated draft</p>',
+        ]);
+
+        /** @var PageRevision $draft */
+        $draft = $page->allRevisions()
+            ->where('type', '=', 'update_draft')
+            ->where('created_by', '=', $editor->id)
+            ->first();
+        $draft->created_at = now()->subMinute(1);
+        $draft->save();
+
+        $this->actingAs($admin)->put($page->refresh()->getUrl(), [
+            'name' => $page->name,
+            'html' => '<p>admin update</p>',
+        ]);
+
+        $resp = $this->actingAs($editor)->put('/ajax/page/' . $page->id . '/save-draft', [
+            'name' => $page->name,
+            'html' => '<p>updated draft again</p>',
+        ]);
+
+        $resp->assertJson([
+            'warning' => 'This page has been updated since this draft was created. It is recommended that you discard this draft or take care not to overwrite any page changes.',
+        ]);
+    }
+
+    public function test_draft_save_shows_alert_if_draft_edit_started_by_someone_else()
+    {
+        $admin = $this->users->admin();
+        $editor = $this->users->editor();
+        $page = $this->entities->page();
+
+        $this->actingAs($admin)->put('/ajax/page/' . $page->id . '/save-draft', [
+            'name' => $page->name,
+            'html' => '<p>updated draft</p>',
+        ]);
+
+        $resp = $this->actingAs($editor)->put('/ajax/page/' . $page->id . '/save-draft', [
+            'name' => $page->name,
+            'html' => '<p>updated draft again</p>',
+        ]);
+
+        $resp->assertJson([
+            'warning' => 'Admin has started editing this page in the last 60 minutes. Take care not to overwrite each other\'s updates!',
+        ]);

     }
 
     public function test_draft_pages_show_on_homepage()
     {
     }
 
     public function test_draft_pages_show_on_homepage()
     {

-        $book = \BookStack\Entities\Models\Book::first();
-        $this->asAdmin()->visit('/')
-            ->dontSeeInElement('#recent-drafts', 'New Page')
-            ->visit($book->getUrl() . '/create-page')
-            ->visit('/')
-            ->seeInElement('#recent-drafts', 'New Page');
+        $book = $this->entities->book();
+        $resp = $this->asAdmin()->get('/');
+        $this->withHtml($resp)->assertElementNotContains('#recent-drafts', 'New Page');
+
+        $this->get($book->getUrl() . '/create-page');
+
+        $this->withHtml($this->get('/'))->assertElementContains('#recent-drafts', 'New Page');

     }
 
     public function test_draft_pages_not_visible_by_others()
     {
     }
 
     public function test_draft_pages_not_visible_by_others()
     {

-        $book = \BookStack\Entities\Models\Book::first();
+        $book = $this->entities->book();

         $chapter = $book->chapters->first();
         $chapter = $book->chapters->first();

-        $newUser = $this->getEditor();
-
-        $this->actingAs($newUser)->visit('/')
-            ->visit($book->getUrl('/create-page'))
-            ->visit($chapter->getUrl('/create-page'))
-            ->visit($book->getUrl())
-            ->seeInElement('.book-contents', 'New Page');
-
-        $this->asAdmin()
-            ->visit($book->getUrl())
-            ->dontSeeInElement('.book-contents', 'New Page')
-            ->visit($chapter->getUrl())
-            ->dontSeeInElement('.book-contents', 'New Page');
+        $newUser = $this->users->editor();
+
+        $this->actingAs($newUser)->get($book->getUrl('/create-page'));
+        $this->get($chapter->getUrl('/create-page'));
+        $resp = $this->get($book->getUrl());
+        $this->withHtml($resp)->assertElementContains('.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()
     {
         $this->asAdmin();
     }
 
     public function test_page_html_in_ajax_fetch_response()
     {
         $this->asAdmin();

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

 
 

-        $this->getJson('/ajax/page/' . $page->id);
-        $this->seeJson([
+        $this->getJson('/ajax/page/' . $page->id)->assertJson([

             'html' => $page->html,
         ]);
     }
 
             'html' => $page->html,
         ]);
     }
 

+    public function test_user_draft_removed_on_user_drafts_delete_call()
+    {
+        $editor = $this->users->editor();
+        $page = $this->entities->page();
+
+        $this->actingAs($editor)->put('/ajax/page/' . $page->id . '/save-draft', [
+            'name' => $page->name,
+            'html' => '<p>updated draft again</p>',
+        ]);
+
+        $revisionData = [
+            'type' => 'update_draft',
+            'created_by' => $editor->id,
+            'page_id' => $page->id,
+        ];
+
+        $this->assertDatabaseHas('page_revisions', $revisionData);
+
+        $resp = $this->delete("/page-revisions/user-drafts/{$page->id}");
+
+        $resp->assertOk();
+        $this->assertDatabaseMissing('page_revisions', $revisionData);
+    }
+
+    public function test_updating_page_draft_with_markdown_retains_markdown_content()
+    {
+        $book = $this->entities->book();
+        $this->asEditor()->get($book->getUrl('/create-page'));
+        /** @var Page $draft */
+        $draft = Page::query()->where('draft', '=', true)->where('book_id', '=', $book->id)->firstOrFail();
+
+        $resp = $this->put('/ajax/page/' . $draft->id . '/save-draft', [
+            'name'     => 'My updated draft',
+            'markdown' => "# My markdown page\n\n[A link](https://example.com)",
+            'html'     => '<p>checking markdown takes priority over this</p>',
+        ]);
+        $resp->assertOk();
+
+        $this->assertDatabaseHas('pages', [
+            'id'       => $draft->id,
+            'draft'    => true,
+            'name'     => 'My updated draft',
+            'markdown' => "# My markdown page\n\n[A link](https://example.com)",
+        ]);
+
+        $draft->refresh();
+        $this->assertStringContainsString('href="https://example.com"', $draft->html);
+    }
+
+    public function test_slug_generated_on_draft_publish_to_page_when_no_name_change()
+    {
+        $book = $this->entities->book();
+        $this->asEditor()->get($book->getUrl('/create-page'));
+        /** @var Page $draft */
+        $draft = Page::query()->where('draft', '=', true)->where('book_id', '=', $book->id)->firstOrFail();
+
+        $this->put('/ajax/page/' . $draft->id . '/save-draft', [
+            'name'     => 'My page',
+            'markdown' => 'Update test',
+        ])->assertOk();
+
+        $draft->refresh();
+        $this->assertEmpty($draft->slug);
+
+        $this->post($draft->getUrl(), [
+            'name'     => 'My page',
+            'markdown' => '# My markdown page',
+        ]);
+
+        $this->assertDatabaseHas('pages', [
+            'id'    => $draft->id,
+            'draft' => false,
+            'slug'  => 'my-page',
+        ]);
+    }

 }
 }