Fixed OIDC Logout

[bookstack] / tests / Entity / ConvertTest.php

diff --git a/tests/Entity/ConvertTest.php b/tests/Entity/ConvertTest.php
index 9791f77e44979f408049327db2b3675748127eaf..decda52243f7d39d4169a5b0d4fb2a13e08dc726 100644 (file)
--- a/tests/Entity/ConvertTest.php
+++ b/tests/Entity/ConvertTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Entity;
 
 
 namespace Tests\Entity;
 

-use BookStack\Actions\ActivityType;
-use BookStack\Actions\Tag;
+use BookStack\Activity\ActivityType;
+use BookStack\Activity\Models\Tag;

 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 use BookStack\Entities\Models\Chapter;


@@ -14,19 +14,17 @@ class ConvertTest extends TestCase
 {
     public function test_chapter_edit_view_shows_convert_option()
     {
 {
     public function test_chapter_edit_view_shows_convert_option()
     {

-        /** @var Chapter $chapter */
-        $chapter = Chapter::query()->first();
+        $chapter = $this->entities->chapter();

 
         $resp = $this->asEditor()->get($chapter->getUrl('/edit'));
         $resp->assertSee('Convert to Book');
         $resp->assertSee('Convert Chapter');
 
         $resp = $this->asEditor()->get($chapter->getUrl('/edit'));
         $resp->assertSee('Convert to Book');
         $resp->assertSee('Convert Chapter');

-        $resp->assertElementExists('form[action$="/convert-to-book"] button');
+        $this->withHtml($resp)->assertElementExists('form[action$="/convert-to-book"] button');

     }
 
     public function test_convert_chapter_to_book()
     {
     }
 
     public function test_convert_chapter_to_book()
     {

-        /** @var Chapter $chapter */
-        $chapter = Chapter::query()->whereHas('pages')->first();
+        $chapter = $this->entities->chapterHasPages();

         $chapter->tags()->save(new Tag(['name' => 'Category', 'value' => 'Penguins']));
         /** @var Page $childPage */
         $childPage = $chapter->pages()->first();
         $chapter->tags()->save(new Tag(['name' => 'Category', 'value' => 'Penguins']));
         /** @var Page $childPage */
         $childPage = $chapter->pages()->first();


@@ -50,18 +48,17 @@ class ConvertTest extends TestCase
 
     public function test_convert_chapter_to_book_requires_permissions()
     {
 
     public function test_convert_chapter_to_book_requires_permissions()
     {

-        /** @var Chapter $chapter */
-        $chapter = Chapter::query()->first();
-        $user = $this->getViewer();
+        $chapter = $this->entities->chapter();
+        $user = $this->users->viewer();

 
         $permissions = ['chapter-delete-all', 'book-create-all', 'chapter-update-all'];
 
         $permissions = ['chapter-delete-all', 'book-create-all', 'chapter-update-all'];

-        $this->giveUserPermissions($user, $permissions);
+        $this->permissions->grantUserRolePermissions($user, $permissions);

 
         foreach ($permissions as $permission) {
 
         foreach ($permissions as $permission) {

-            $this->removePermissionFromUser($user, $permission);
+            $this->permissions->removeUserRolePermissions($user, [$permission]);

             $resp = $this->actingAs($user)->post($chapter->getUrl('/convert-to-book'));
             $this->assertPermissionError($resp);
             $resp = $this->actingAs($user)->post($chapter->getUrl('/convert-to-book'));
             $this->assertPermissionError($resp);

-            $this->giveUserPermissions($user, [$permission]);
+            $this->permissions->grantUserRolePermissions($user, [$permission]);

         }
 
         $resp = $this->actingAs($user)->post($chapter->getUrl('/convert-to-book'));
         }
 
         $resp = $this->actingAs($user)->post($chapter->getUrl('/convert-to-book'));


@@ -71,13 +68,13 @@ class ConvertTest extends TestCase
 
     public function test_book_edit_view_shows_convert_option()
     {
 
     public function test_book_edit_view_shows_convert_option()
     {

-        $book = Book::query()->first();
+        $book = $this->entities->book();

 
         $resp = $this->asEditor()->get($book->getUrl('/edit'));
         $resp->assertSee('Convert to Shelf');
         $resp->assertSee('Convert Book');
         $resp->assertSee('Note that permissions on shelves do not auto-cascade to content');
 
         $resp = $this->asEditor()->get($book->getUrl('/edit'));
         $resp->assertSee('Convert to Shelf');
         $resp->assertSee('Convert Book');
         $resp->assertSee('Note that permissions on shelves do not auto-cascade to content');

-        $resp->assertElementExists('form[action$="/convert-to-shelf"] button');
+        $this->withHtml($resp)->assertElementExists('form[action$="/convert-to-shelf"] button');

     }
 
     public function test_book_convert_to_shelf()
     }
 
     public function test_book_convert_to_shelf()


@@ -124,18 +121,17 @@ class ConvertTest extends TestCase
 
     public function test_book_convert_to_shelf_requires_permissions()
     {
 
     public function test_book_convert_to_shelf_requires_permissions()
     {

-        /** @var Book $book */
-        $book = Book::query()->first();
-        $user = $this->getViewer();
+        $book = $this->entities->book();
+        $user = $this->users->viewer();

 
         $permissions = ['book-delete-all', 'bookshelf-create-all', 'book-update-all', 'book-create-all'];
 
         $permissions = ['book-delete-all', 'bookshelf-create-all', 'book-update-all', 'book-create-all'];

-        $this->giveUserPermissions($user, $permissions);
+        $this->permissions->grantUserRolePermissions($user, $permissions);

 
         foreach ($permissions as $permission) {
 
         foreach ($permissions as $permission) {

-            $this->removePermissionFromUser($user, $permission);
+            $this->permissions->removeUserRolePermissions($user, [$permission]);

             $resp = $this->actingAs($user)->post($book->getUrl('/convert-to-shelf'));
             $this->assertPermissionError($resp);
             $resp = $this->actingAs($user)->post($book->getUrl('/convert-to-shelf'));
             $this->assertPermissionError($resp);

-            $this->giveUserPermissions($user, [$permission]);
+            $this->permissions->grantUserRolePermissions($user, [$permission]);

         }
 
         $resp = $this->actingAs($user)->post($book->getUrl('/convert-to-shelf'));
         }
 
         $resp = $this->actingAs($user)->post($book->getUrl('/convert-to-shelf'));