X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/b94b945fb03e21a1997cfe6e50148967586cb26d..refs/pull/3593/head:/tests/Entity/PageDraftTest.php diff --git a/tests/Entity/PageDraftTest.php b/tests/Entity/PageDraftTest.php index e83f78a10..0b44e5f0b 100644 --- a/tests/Entity/PageDraftTest.php +++ b/tests/Entity/PageDraftTest.php @@ -1,9 +1,18 @@ -page = \BookStack\Entities\Page::first(); - $this->pageRepo = app(PageRepo::class); + $this->page = Page::query()->first(); + $this->pageRepo = app()->make(PageRepo::class); } public function test_draft_content_shows_if_available() { $addedContent = '

test message content

'; - $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]); - $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 = '

test message content

'; - $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; $newUser = $this->getEditor(); $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']); - $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() { - $nonEditedPage = \BookStack\Entities\Page::take(10)->get()->last(); + $nonEditedPage = Page::query()->take(10)->get()->last(); $addedContent = '

test message content

'; - $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; $newUser = $this->getEditor(); $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->getAdmin(); + $editor = $this->getEditor(); + /** @var Page $page */ + $page = Page::query()->first(); + + $this->actingAs($editor)->put('/ajax/page/' . $page->id . '/save-draft', [ + 'name' => $page->name, + 'html' => '

updated draft

', + ]); + + /** @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' => '

admin update

', + ]); + + $resp = $this->actingAs($editor)->put('/ajax/page/' . $page->id . '/save-draft', [ + 'name' => $page->name, + 'html' => '

updated draft again

', + ]); + + $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->getAdmin(); + $editor = $this->getEditor(); + /** @var Page $page */ + $page = Page::query()->first(); + + $this->actingAs($admin)->put('/ajax/page/' . $page->id . '/save-draft', [ + 'name' => $page->name, + 'html' => '

updated draft

', + ]); + + $resp = $this->actingAs($editor)->put('/ajax/page/' . $page->id . '/save-draft', [ + 'name' => $page->name, + 'html' => '

updated draft again

', + ]); + + $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() { - $book = \BookStack\Entities\Book::first(); - $this->asAdmin()->visit('/') - ->dontSeeInElement('#recent-drafts', 'New Page') - ->visit($book->getUrl() . '/create-page') - ->visit('/') - ->seeInElement('#recent-drafts', 'New Page'); + /** @var Book $book */ + $book = Book::query()->first(); + $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() { - $book = \BookStack\Entities\Book::first(); + /** @var Book $book */ + $book = Book::query()->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'); + $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(); + /** @var Page $page */ + $page = Page::query()->first(); + + $this->getJson('/ajax/page/' . $page->id)->assertJson([ + 'html' => $page->html, + ]); } + public function test_updating_page_draft_with_markdown_retains_markdown_content() + { + /** @var Book $book */ + $book = Book::query()->first(); + $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' => '

checking markdown takes priority over this

', + ]); + $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); + } }