From f1e1a745b0acb6717470f7eae970a2ab09e2d05b Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Fri, 18 Dec 2020 21:42:43 +0000
Subject: [PATCH] Fixed failing home test after changes in last commit

Also made a restriction test more reliable.
Also renamed restrictionstest to entitypermissionstest to be more
consistent with newer app wording.
---
 tests/HomepageTest.php                              |  4 ++--
 ...strictionsTest.php => EntityPermissionsTest.php} | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)
 rename tests/Permissions/{RestrictionsTest.php => EntityPermissionsTest.php} (99%)

diff --git a/tests/HomepageTest.php b/tests/HomepageTest.php
index 3bc85b39e..943a3160a 100644
--- a/tests/HomepageTest.php
+++ b/tests/HomepageTest.php
@@ -98,16 +98,16 @@ class HomepageTest extends TestCase
     {
         $editor = $this->getEditor();
         setting()->putUser($editor, 'bookshelves_view_type', 'grid');
+        $shelf = Bookshelf::query()->firstOrFail();
 
         $this->setSettings(['app-homepage-type' => 'bookshelves']);
 
         $this->asEditor();
         $homeVisit = $this->get('/');
         $homeVisit->assertSee('Shelves');
-        $homeVisit->assertSee('bookshelf-grid-item grid-card');
         $homeVisit->assertSee('grid-card-content');
-        $homeVisit->assertSee('grid-card-footer');
         $homeVisit->assertSee('featured-image-container');
+        $homeVisit->assertElementContains('.grid-card', $shelf->name);
 
         $this->setSettings(['app-homepage-type' => false]);
         $this->test_default_homepage_visible();
diff --git a/tests/Permissions/RestrictionsTest.php b/tests/Permissions/EntityPermissionsTest.php
similarity index 99%
rename from tests/Permissions/RestrictionsTest.php
rename to tests/Permissions/EntityPermissionsTest.php
index c3c6aa44f..1e6d1cc32 100644
--- a/tests/Permissions/RestrictionsTest.php
+++ b/tests/Permissions/EntityPermissionsTest.php
@@ -6,9 +6,10 @@ use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 use BookStack\Auth\User;
 use BookStack\Entities\Models\Page;
+use Illuminate\Support\Str;
 use Tests\BrowserKitTest;
 
-class RestrictionsTest extends BrowserKitTest
+class EntityPermissionsTest extends BrowserKitTest
 {
 
     /**
@@ -642,11 +643,15 @@ class RestrictionsTest extends BrowserKitTest
     public function test_page_visible_if_has_permissions_when_book_not_visible()
     {
         $book = Book::first();
-
-        $this->setEntityRestrictions($book, []);
-
         $bookChapter = $book->chapters->first();
         $bookPage = $bookChapter->pages->first();
+
+        foreach ([$book, $bookChapter, $bookPage] as $entity) {
+            $entity->name = Str::random(24);
+            $entity->save();
+        }
+
+        $this->setEntityRestrictions($book, []);
         $this->setEntityRestrictions($bookPage, ['view']);
 
         $this->actingAs($this->viewer);