Move logFailedAccess into Activity

[bookstack] / tests / Entity / PageDraftTest.php

diff --git a/tests/Entity/PageDraftTest.php b/tests/Entity/PageDraftTest.php
index 233f300ee339a7fed34fb6eeb64c587c2006ee65..e83f78a10a8a8f2d566ece9586a115dd24d4c323 100644 (file)
--- a/tests/Entity/PageDraftTest.php
+++ b/tests/Entity/PageDraftTest.php
@@ -1,64 +1,70 @@
-<?php
+<?php namespace Tests;

 
 

+use BookStack\Entities\Repos\PageRepo;

 
 

-class PageDraftTest extends TestCase
+class PageDraftTest extends BrowserKitTest

 {
     protected $page;
 {
     protected $page;

-    protected $entityRepo;

 
 

-    public function setUp()
+    /**
+     * @var PageRepo
+     */
+    protected $pageRepo;
+
+    public function setUp(): void

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

-        $this->page = \BookStack\Page::first();
-        $this->entityRepo = app('\BookStack\Repos\EntityRepo');
+        $this->page = \BookStack\Entities\Page::first();
+        $this->pageRepo = app(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')
+        $this->asAdmin()->visit($this->page->getUrl('/edit'))

             ->dontSeeInField('html', $addedContent);
 
         $newContent = $this->page->html . $addedContent;
             ->dontSeeInField('html', $addedContent);
 
         $newContent = $this->page->html . $addedContent;

-        $this->entityRepo->updatePageDraft($this->page, ['html' => $newContent]);
-        $this->asAdmin()->visit($this->page->getUrl() . '/edit')
+        $this->pageRepo->updatePageDraft($this->page, ['html' => $newContent]);
+        $this->asAdmin()->visit($this->page->getUrl('/edit'))

             ->seeInField('html', $newContent);
     }
 
     public function test_draft_not_visible_by_others()
     {
         $addedContent = '<p>test message content</p>';
             ->seeInField('html', $newContent);
     }
 
     public function test_draft_not_visible_by_others()
     {
         $addedContent = '<p>test message content</p>';

-        $this->asAdmin()->visit($this->page->getUrl() . '/edit')
+        $this->asAdmin()->visit($this->page->getUrl('/edit'))

             ->dontSeeInField('html', $addedContent);
 
         $newContent = $this->page->html . $addedContent;
         $newUser = $this->getEditor();
             ->dontSeeInField('html', $addedContent);
 
         $newContent = $this->page->html . $addedContent;
         $newUser = $this->getEditor();

-        $this->entityRepo->updatePageDraft($this->page, ['html' => $newContent]);
-        $this->actingAs($newUser)->visit($this->page->getUrl() . '/edit')
+        $this->pageRepo->updatePageDraft($this->page, ['html' => $newContent]);
+
+        $this->actingAs($newUser)->visit($this->page->getUrl('/edit'))

             ->dontSeeInField('html', $newContent);
     }
 
     public function test_alert_message_shows_if_editing_draft()
     {
         $this->asAdmin();
             ->dontSeeInField('html', $newContent);
     }
 
     public function test_alert_message_shows_if_editing_draft()
     {
         $this->asAdmin();

-        $this->entityRepo->updatePageDraft($this->page, ['html' => 'test content']);
-        $this->asAdmin()->visit($this->page->getUrl() . '/edit')
+        $this->pageRepo->updatePageDraft($this->page, ['html' => 'test content']);
+        $this->asAdmin()->visit($this->page->getUrl('/edit'))

             ->see('You are currently editing a draft');
     }
 
     public function test_alert_message_shows_if_someone_else_editing()
     {
             ->see('You are currently editing a draft');
     }
 
     public function test_alert_message_shows_if_someone_else_editing()
     {

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

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

-        $this->asAdmin()->visit($this->page->getUrl() . '/edit')
+        $this->asAdmin()->visit($this->page->getUrl('/edit'))

             ->dontSeeInField('html', $addedContent);
 
         $newContent = $this->page->html . $addedContent;
         $newUser = $this->getEditor();
             ->dontSeeInField('html', $addedContent);
 
         $newContent = $this->page->html . $addedContent;
         $newUser = $this->getEditor();

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

 
         $this->actingAs($newUser)
 
         $this->actingAs($newUser)

-            ->visit($this->page->getUrl() . '/edit')
+            ->visit($this->page->getUrl('/edit'))

             ->see('Admin has started editing this page');
             $this->flushSession();
         $this->visit($nonEditedPage->getUrl() . '/edit')
             ->see('Admin has started editing this page');
             $this->flushSession();
         $this->visit($nonEditedPage->getUrl() . '/edit')


@@ -67,31 +73,31 @@ class PageDraftTest extends TestCase
 
     public function test_draft_pages_show_on_homepage()
     {
 
     public function test_draft_pages_show_on_homepage()
     {

-        $book = \BookStack\Book::first();
+        $book = \BookStack\Entities\Book::first();

         $this->asAdmin()->visit('/')
             ->dontSeeInElement('#recent-drafts', 'New Page')
         $this->asAdmin()->visit('/')
             ->dontSeeInElement('#recent-drafts', 'New Page')

-            ->visit($book->getUrl() . '/page/create')
+            ->visit($book->getUrl() . '/create-page')

             ->visit('/')
             ->seeInElement('#recent-drafts', 'New Page');
     }
 
     public function test_draft_pages_not_visible_by_others()
     {
             ->visit('/')
             ->seeInElement('#recent-drafts', 'New Page');
     }
 
     public function test_draft_pages_not_visible_by_others()
     {

-        $book = \BookStack\Book::first();
+        $book = \BookStack\Entities\Book::first();

         $chapter = $book->chapters->first();
         $newUser = $this->getEditor();
 
         $this->actingAs($newUser)->visit('/')
         $chapter = $book->chapters->first();
         $newUser = $this->getEditor();
 
         $this->actingAs($newUser)->visit('/')

-            ->visit($book->getUrl() . '/page/create')
-            ->visit($chapter->getUrl() . '/create-page')
+            ->visit($book->getUrl('/create-page'))
+            ->visit($chapter->getUrl('/create-page'))

             ->visit($book->getUrl())
             ->visit($book->getUrl())

-            ->seeInElement('.page-list', 'New Page');
-        
+            ->seeInElement('.book-contents', 'New Page');
+

         $this->asAdmin()
             ->visit($book->getUrl())
         $this->asAdmin()
             ->visit($book->getUrl())

-            ->dontSeeInElement('.page-list', 'New Page')
+            ->dontSeeInElement('.book-contents', 'New Page')

             ->visit($chapter->getUrl())
             ->visit($chapter->getUrl())

-            ->dontSeeInElement('.page-list', 'New Page');
+            ->dontSeeInElement('.book-contents', 'New Page');

     }
 
 }
     }
 
 }