X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/33a2999a57854495fcea8c1acf1b75b04a28a0bf..refs/pull/446/head:/tests/Permissions/RolesTest.php diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php index 24b8ae0f5..eda5d092a 100644 --- a/tests/Permissions/RolesTest.php +++ b/tests/Permissions/RolesTest.php @@ -1,5 +1,11 @@ make()->toArray(); $roleData['permissions'] = array_flip($permissions); return $permissionRepo->saveNewRole($roleData); @@ -107,16 +113,16 @@ class RolesTest extends BrowserKitTest public function test_manage_user_permission() { - $this->actingAs($this->user)->visit('/')->visit('/settings/users') + $this->actingAs($this->user)->visit('/settings/users') ->seePageIs('/'); $this->giveUserPermissions($this->user, ['users-manage']); - $this->actingAs($this->user)->visit('/')->visit('/settings/users') + $this->actingAs($this->user)->visit('/settings/users') ->seePageIs('/settings/users'); } public function test_user_roles_manage_permission() { - $this->actingAs($this->user)->visit('/')->visit('/settings/roles') + $this->actingAs($this->user)->visit('/settings/roles') ->seePageIs('/')->visit('/settings/roles/1')->seePageIs('/'); $this->giveUserPermissions($this->user, ['user-roles-manage']); $this->actingAs($this->user)->visit('/settings/roles') @@ -126,10 +132,10 @@ class RolesTest extends BrowserKitTest public function test_settings_manage_permission() { - $this->actingAs($this->user)->visit('/')->visit('/settings') + $this->actingAs($this->user)->visit('/settings') ->seePageIs('/'); $this->giveUserPermissions($this->user, ['settings-manage']); - $this->actingAs($this->user)->visit('/')->visit('/settings') + $this->actingAs($this->user)->visit('/settings') ->seePageIs('/settings')->press('Save Settings')->see('Settings Saved'); } @@ -181,27 +187,26 @@ class RolesTest extends BrowserKitTest * @param string $permission * @param array $accessUrls Urls that are only accessible after having the permission * @param array $visibles Check this text, In the buttons toolbar, is only visible with the permission - * @param null $callback */ private function checkAccessPermission($permission, $accessUrls = [], $visibles = []) { foreach ($accessUrls as $url) { - $this->actingAs($this->user)->visit('/')->visit($url) + $this->actingAs($this->user)->visit($url) ->seePageIs('/'); } foreach ($visibles as $url => $text) { - $this->actingAs($this->user)->visit('/')->visit($url) + $this->actingAs($this->user)->visit($url) ->dontSeeInElement('.action-buttons',$text); } $this->giveUserPermissions($this->user, [$permission]); foreach ($accessUrls as $url) { - $this->actingAs($this->user)->visit('/')->visit($url) + $this->actingAs($this->user)->visit($url) ->seePageIs($url); } foreach ($visibles as $url => $text) { - $this->actingAs($this->user)->visit('/')->visit($url) + $this->actingAs($this->user)->visit($url) ->see($text); } } @@ -391,8 +396,8 @@ class RolesTest extends BrowserKitTest public function test_page_create_own_permissions() { - $book = \BookStack\Book::take(1)->get()->first(); - $chapter = \BookStack\Chapter::take(1)->get()->first(); + $book = \BookStack\Book::first(); + $chapter = \BookStack\Chapter::first(); $entities = $this->createEntityChainBelongingToUser($this->user); $ownBook = $entities['book']; @@ -405,7 +410,7 @@ class RolesTest extends BrowserKitTest $accessUrls = [$createUrl, $createUrlChapter]; foreach ($accessUrls as $url) { - $this->actingAs($this->user)->visit('/')->visit($url) + $this->actingAs($this->user)->visit($url) ->seePageIs('/'); } @@ -417,7 +422,7 @@ class RolesTest extends BrowserKitTest $this->giveUserPermissions($this->user, ['page-create-own']); foreach ($accessUrls as $index => $url) { - $this->actingAs($this->user)->visit('/')->visit($url); + $this->actingAs($this->user)->visit($url); $expectedUrl = \BookStack\Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl(); $this->seePageIs($expectedUrl); } @@ -449,7 +454,7 @@ class RolesTest extends BrowserKitTest $accessUrls = [$createUrl, $createUrlChapter]; foreach ($accessUrls as $url) { - $this->actingAs($this->user)->visit('/')->visit($url) + $this->actingAs($this->user)->visit($url) ->seePageIs('/'); } @@ -461,7 +466,7 @@ class RolesTest extends BrowserKitTest $this->giveUserPermissions($this->user, ['page-create-all']); foreach ($accessUrls as $index => $url) { - $this->actingAs($this->user)->visit('/')->visit($url); + $this->actingAs($this->user)->visit($url); $expectedUrl = \BookStack\Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl(); $this->seePageIs($expectedUrl); } @@ -578,8 +583,6 @@ class RolesTest extends BrowserKitTest ->see('Cannot be deleted'); } - - public function test_image_delete_own_permission() { $this->giveUserPermissions($this->user, ['image-update-all']); @@ -618,4 +621,40 @@ class RolesTest extends BrowserKitTest ->dontSeeInDatabase('images', ['id' => $image->id]); } + public function test_role_permission_removal() + { + // To cover issue fixed in f99c8ff99aee9beb8c692f36d4b84dc6e651e50a. + $page = Page::first(); + $viewerRole = \BookStack\Role::getRole('viewer'); + $viewer = $this->getViewer(); + $this->actingAs($viewer)->visit($page->getUrl())->assertResponseOk(); + + $this->asAdmin()->put('/settings/roles/' . $viewerRole->id, [ + 'display_name' => $viewerRole->display_name, + 'description' => $viewerRole->description, + 'permission' => [] + ])->assertResponseStatus(302); + + $this->expectException(HttpException::class); + $this->actingAs($viewer)->visit($page->getUrl())->assertResponseStatus(404); + } + + public function test_empty_state_actions_not_visible_without_permission() + { + $admin = $this->getAdmin(); + // Book links + $book = factory(\BookStack\Book::class)->create(['created_by' => $admin->id, 'updated_by' => $admin->id]); + $this->updateEntityPermissions($book); + $this->actingAs($this->getViewer())->visit($book->getUrl()) + ->dontSee('Create a new page') + ->dontSee('Add a chapter'); + + // Chapter links + $chapter = factory(\BookStack\Chapter::class)->create(['created_by' => $admin->id, 'updated_by' => $admin->id, 'book_id' => $book->id]); + $this->updateEntityPermissions($chapter); + $this->actingAs($this->getViewer())->visit($chapter->getUrl()) + ->dontSee('Create a new page') + ->dontSee('Sort the current book'); + } + }