X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/756b55bbffedb6e5fde91f9fbc61f5a382f20705..refs/pull/3693/head:/tests/Entity/PageTest.php

diff --git a/tests/Entity/PageTest.php b/tests/Entity/PageTest.php
index 313fc77f0..734516e87 100644
--- a/tests/Entity/PageTest.php
+++ b/tests/Entity/PageTest.php
@@ -14,12 +14,12 @@ class PageTest extends TestCase
     {
         /** @var Chapter $chapter */
         $chapter = Chapter::query()->first();
-        $page = factory(Page::class)->make([
+        $page = Page::factory()->make([
             'name' => 'My First Page',
         ]);
 
         $resp = $this->asEditor()->get($chapter->getUrl());
-        $resp->assertElementContains('a[href="' . $chapter->getUrl('/create-page') . '"]', 'New Page');
+        $this->withHtml($resp)->assertElementContains('a[href="' . $chapter->getUrl('/create-page') . '"]', 'New Page');
 
         $resp = $this->get($chapter->getUrl('/create-page'));
         /** @var Page $draftPage */
@@ -30,7 +30,7 @@ class PageTest extends TestCase
         $resp->assertRedirect($draftPage->getUrl());
 
         $resp = $this->get($draftPage->getUrl());
-        $resp->assertElementContains('form[action="' . $draftPage->getUrl() . '"][method="POST"]', 'Save Page');
+        $this->withHtml($resp)->assertElementContains('form[action="' . $draftPage->getUrl() . '"][method="POST"]', 'Save Page');
 
         $resp = $this->post($draftPage->getUrl(), $draftPage->only('name', 'html'));
         $draftPage->refresh();
@@ -98,7 +98,7 @@ class PageTest extends TestCase
         $this->assertTrue($page->deletions()->count() === 1);
 
         $redirectReq = $this->get($deleteReq->baseResponse->headers->get('location'));
-        $redirectReq->assertNotificationContains('Page Successfully Deleted');
+        $this->assertNotificationContains($redirectReq, 'Page Successfully Deleted');
     }
 
     public function test_page_full_delete_removes_all_revisions()
@@ -257,8 +257,59 @@ class PageTest extends TestCase
         $user = $this->getEditor();
         $content = $this->createEntityChainBelongingToUser($user);
 
-        $this->asAdmin()->get('/pages/recently-updated')
-            ->assertElementContains('.entity-list .page:nth-child(1)', $content['page']->name);
+        $resp = $this->asAdmin()->get('/pages/recently-updated');
+        $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', $content['page']->name);
+    }
+
+    public function test_recently_updated_pages_view_shows_updated_by_details()
+    {
+        $user = $this->getEditor();
+        /** @var Page $page */
+        $page = Page::query()->first();
+
+        $this->actingAs($user)->put($page->getUrl(), [
+            'name' => 'Updated title',
+            'html' => '<p>Updated content</p>',
+        ]);
+
+        $resp = $this->asAdmin()->get('/pages/recently-updated');
+        $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', 'Updated 1 second ago by ' . $user->name);
+    }
+
+    public function test_recently_updated_pages_view_shows_parent_chain()
+    {
+        $user = $this->getEditor();
+        /** @var Page $page */
+        $page = Page::query()->whereNotNull('chapter_id')->first();
+
+        $this->actingAs($user)->put($page->getUrl(), [
+            'name' => 'Updated title',
+            'html' => '<p>Updated content</p>',
+        ]);
+
+        $resp = $this->asAdmin()->get('/pages/recently-updated');
+        $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', $page->chapter->getShortName(42));
+        $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', $page->book->getShortName(42));
+    }
+
+    public function test_recently_updated_pages_view_does_not_show_parent_if_not_visible()
+    {
+        $user = $this->getEditor();
+        /** @var Page $page */
+        $page = Page::query()->whereNotNull('chapter_id')->first();
+
+        $this->actingAs($user)->put($page->getUrl(), [
+            'name' => 'Updated title',
+            'html' => '<p>Updated content</p>',
+        ]);
+
+        $this->setEntityRestrictions($page->book);
+        $this->setEntityRestrictions($page, ['view'], [$user->roles->first()]);
+
+        $resp = $this->get('/pages/recently-updated');
+        $resp->assertDontSee($page->book->getShortName(42));
+        $resp->assertDontSee($page->chapter->getShortName(42));
+        $this->withHtml($resp)->assertElementContains('.entity-list .page:nth-child(1)', 'Updated title');
     }
 
     public function test_recently_updated_pages_on_home()
@@ -269,15 +320,15 @@ class PageTest extends TestCase
             'updated_at' => Carbon::now()->subSecond(1),
         ]);
 
-        $this->asAdmin()->get('/')
-            ->assertElementNotContains('#recently-updated-pages', $page->name);
+        $resp = $this->asAdmin()->get('/');
+        $this->withHtml($resp)->assertElementNotContains('#recently-updated-pages', $page->name);
 
         $this->put($page->getUrl(), [
             'name' => $page->name,
             'html' => $page->html,
         ]);
 
-        $this->get('/')
-            ->assertElementContains('#recently-updated-pages', $page->name);
+        $resp = $this->get('/');
+        $this->withHtml($resp)->assertElementContains('#recently-updated-pages', $page->name);
     }
 }