BookStack Code Mirror - bookstack/blobdiff - tests/Permissions/RolesTest.php

diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php

index 88d400259e0e683a8c4d3a21906b0842aa6e6e7e..971479e28aee66d8ed31a33e7c24a71b963d330e 100644 (file)

--- a/tests/Permissions/RolesTest.php

+++ b/tests/Permissions/RolesTest.php

@@ -22,7 +22,7 @@ class RolesTest extends TestCase

protected function setUp(): void

{

parent::setUp();

- $this->user = $this->getViewer();

+ $this->user = $this->users->viewer();

}

public function test_admin_can_see_settings()

@@ -42,7 +42,7 @@ class RolesTest extends TestCase

public function test_role_cannot_be_deleted_if_default()

{

- $newRole = $this->createNewRole();

+ $newRole = $this->users->createRole();

$this->setSettings(['registration-role' => $newRole->id]);

$deletePageUrl = '/settings/roles/delete/' . $newRole->id;

@@ -121,11 +121,11 @@ class RolesTest extends TestCase

{

/** @var Role $adminRole */

$adminRole = Role::query()->where('system_name', '=', 'admin')->first();

- $adminUser = $this->getAdmin();

+ $adminUser = $this->users->admin();

$adminRole->users()->where('id', '!=', $adminUser->id)->delete();

$this->assertEquals(1, $adminRole->users()->count());

- $viewerRole = $this->getViewer()->roles()->first();

+ $viewerRole = $this->users->viewer()->roles()->first();

$editUrl = '/settings/users/' . $adminUser->id;

$resp = $this->actingAs($adminUser)->put($editUrl, [

@@ -163,13 +163,29 @@ class RolesTest extends TestCase

$this->assertEquals($this->user->id, $roleA->users()->first()->id);

}

+ public function test_delete_with_empty_migrate_option_works()

+ {

+ $role = $this->users->attachNewRole($this->user);

+

+ $this->assertCount(1, $role->users()->get());

+

+ $deletePage = $this->asAdmin()->get("/settings/roles/delete/$role->id");

+ $this->withHtml($deletePage)->assertElementExists('select[name=migrate_role_id]');

+ $resp = $this->asAdmin()->delete("/settings/roles/delete/$role->id", [

+ 'migrate_role_id' => '',

+ ]);

+

+ $resp->assertRedirect('/settings/roles');

+ $this->assertDatabaseMissing('roles', ['id' => $role->id]);

+ }

+

public function test_entity_permissions_are_removed_on_delete()

{

/** @var Role $roleA */

$roleA = Role::query()->create(['display_name' => 'Entity Permissions Delete Test']);

$page = $this->entities->page();

- $this->entities->setPermissions($page, ['view'], [$roleA]);

+ $this->permissions->setEntityPermissions($page, ['view'], [$roleA]);

$this->assertDatabaseHas('entity_permissions', [

'role_id' => $roleA->id,

@@ -214,7 +230,7 @@ class RolesTest extends TestCase

public function test_manage_user_permission()

{

$this->actingAs($this->user)->get('/settings/users')->assertRedirect('/');

- $this->giveUserPermissions($this->user, ['users-manage']);

+ $this->permissions->grantUserRolePermissions($this->user, ['users-manage']);

$this->actingAs($this->user)->get('/settings/users')->assertOk();

}

@@ -222,9 +238,9 @@ class RolesTest extends TestCase

{

$usersLink = 'href="' . url('/settings/users') . '"';

$this->actingAs($this->user)->get('/')->assertDontSee($usersLink, false);

- $this->giveUserPermissions($this->user, ['users-manage']);

+ $this->permissions->grantUserRolePermissions($this->user, ['users-manage']);

$this->actingAs($this->user)->get('/')->assertSee($usersLink, false);

- $this->giveUserPermissions($this->user, ['settings-manage', 'users-manage']);

+ $this->permissions->grantUserRolePermissions($this->user, ['settings-manage', 'users-manage']);

$this->actingAs($this->user)->get('/')->assertDontSee($usersLink, false);

}

@@ -247,7 +263,7 @@ class RolesTest extends TestCase

'name' => 'my_new_name',

]);

- $this->giveUserPermissions($this->user, ['users-manage']);

+ $this->permissions->grantUserRolePermissions($this->user, ['users-manage']);

$resp = $this->get($userProfileUrl)

->assertOk();

@@ -269,7 +285,7 @@ class RolesTest extends TestCase

{

$this->actingAs($this->user)->get('/settings/roles')->assertRedirect('/');

$this->get('/settings/roles/1')->assertRedirect('/');

- $this->giveUserPermissions($this->user, ['user-roles-manage']);

+ $this->permissions->grantUserRolePermissions($this->user, ['user-roles-manage']);

$this->actingAs($this->user)->get('/settings/roles')->assertOk();

$this->get('/settings/roles/1')

->assertOk()

@@ -279,7 +295,7 @@ class RolesTest extends TestCase

public function test_settings_manage_permission()

{

$this->actingAs($this->user)->get('/settings/features')->assertRedirect('/');

- $this->giveUserPermissions($this->user, ['settings-manage']);

+ $this->permissions->grantUserRolePermissions($this->user, ['settings-manage']);

$this->get('/settings/features')->assertOk();

$resp = $this->post('/settings/features', []);

@@ -295,7 +311,7 @@ class RolesTest extends TestCase

$this->actingAs($this->user)->get($page->getUrl())->assertDontSee('Permissions');

$this->get($page->getUrl('/permissions'))->assertRedirect('/');

- $this->giveUserPermissions($this->user, ['restrictions-manage-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['restrictions-manage-all']);

$this->actingAs($this->user)->get($page->getUrl())->assertSee('Permissions');

@@ -325,7 +341,7 @@ class RolesTest extends TestCase

$this->actingAs($this->user)->get($page->getUrl())->assertDontSee('Permissions');

$this->get($page->getUrl('/permissions'))->assertRedirect('/');

- $this->giveUserPermissions($this->user, ['restrictions-manage-own']);

+ $this->permissions->grantUserRolePermissions($this->user, ['restrictions-manage-own']);

// Check can't restrict other's content

$this->actingAs($this->user)->get($otherUsersPage->getUrl())->assertDontSee('Permissions');

@@ -350,7 +366,7 @@ class RolesTest extends TestCase

$this->withHtml($resp)->assertElementNotContains('.action-buttons', $text);

}

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

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

foreach ($accessUrls as $url) {

$this->actingAs($this->user)->get($url)->assertOk();

@@ -380,7 +396,7 @@ class RolesTest extends TestCase

$otherShelf = Bookshelf::query()->first();

$ownShelf = $this->entities->newShelf(['name' => 'test-shelf', 'slug' => 'test-shelf']);

$ownShelf->forceFill(['owned_by' => $this->user->id, 'updated_by' => $this->user->id])->save();

- $this->entities->regenPermissions($ownShelf);

+ $this->permissions->regenerateForEntity($ownShelf);

$this->checkAccessPermission('bookshelf-update-own', [

$ownShelf->getUrl('/edit'),

@@ -406,12 +422,12 @@ class RolesTest extends TestCase

public function test_bookshelves_delete_own_permission()

{

- $this->giveUserPermissions($this->user, ['bookshelf-update-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['bookshelf-update-all']);

/** @var Bookshelf $otherShelf */

$otherShelf = Bookshelf::query()->first();

$ownShelf = $this->entities->newShelf(['name' => 'test-shelf', 'slug' => 'test-shelf']);

$ownShelf->forceFill(['owned_by' => $this->user->id, 'updated_by' => $this->user->id])->save();

- $this->entities->regenPermissions($ownShelf);

+ $this->permissions->regenerateForEntity($ownShelf);

$this->checkAccessPermission('bookshelf-delete-own', [

$ownShelf->getUrl('/delete'),

@@ -430,7 +446,7 @@ class RolesTest extends TestCase

public function test_bookshelves_delete_all_permission()

{

- $this->giveUserPermissions($this->user, ['bookshelf-update-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['bookshelf-update-all']);

/** @var Bookshelf $otherShelf */

$otherShelf = Bookshelf::query()->first();

$this->checkAccessPermission('bookshelf-delete-all', [

@@ -486,7 +502,7 @@ class RolesTest extends TestCase

public function test_books_delete_own_permission()

{

- $this->giveUserPermissions($this->user, ['book-update-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['book-update-all']);

/** @var Book $otherBook */

$otherBook = Book::query()->take(1)->get()->first();

$ownBook = $this->entities->createChainBelongingToUser($this->user)['book'];

@@ -506,7 +522,7 @@ class RolesTest extends TestCase

public function test_books_delete_all_permission()

{

- $this->giveUserPermissions($this->user, ['book-update-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['book-update-all']);

/** @var Book $otherBook */

$otherBook = Book::query()->take(1)->get()->first();

$this->checkAccessPermission('book-delete-all', [

@@ -585,7 +601,7 @@ class RolesTest extends TestCase

public function test_chapter_delete_own_permission()

{

- $this->giveUserPermissions($this->user, ['chapter-update-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['chapter-update-all']);

/** @var Chapter $otherChapter */

$otherChapter = Chapter::query()->first();

$ownChapter = $this->entities->createChainBelongingToUser($this->user)['chapter'];

@@ -607,7 +623,7 @@ class RolesTest extends TestCase

public function test_chapter_delete_all_permission()

{

- $this->giveUserPermissions($this->user, ['chapter-update-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['chapter-update-all']);

/** @var Chapter $otherChapter */

$otherChapter = Chapter::query()->first();

$this->checkAccessPermission('chapter-delete-all', [

@@ -645,7 +661,7 @@ class RolesTest extends TestCase

$ownChapter->getUrl() => 'New Page',

]);

- $this->giveUserPermissions($this->user, ['page-create-own']);

+ $this->permissions->grantUserRolePermissions($this->user, ['page-create-own']);

foreach ($accessUrls as $index => $url) {

$resp = $this->actingAs($this->user)->get($url);

@@ -688,7 +704,7 @@ class RolesTest extends TestCase

$chapter->getUrl() => 'New Page',

]);

- $this->giveUserPermissions($this->user, ['page-create-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['page-create-all']);

foreach ($accessUrls as $index => $url) {

$resp = $this->actingAs($this->user)->get($url);

@@ -742,7 +758,7 @@ class RolesTest extends TestCase

public function test_page_delete_own_permission()

{

- $this->giveUserPermissions($this->user, ['page-update-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['page-update-all']);

/** @var Page $otherPage */

$otherPage = Page::query()->first();

$ownPage = $this->entities->createChainBelongingToUser($this->user)['page'];

@@ -764,7 +780,7 @@ class RolesTest extends TestCase

public function test_page_delete_all_permission()

{

- $this->giveUserPermissions($this->user, ['page-update-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['page-update-all']);

/** @var Page $otherPage */

$otherPage = Page::query()->first();

@@ -823,7 +839,7 @@ class RolesTest extends TestCase

public function test_image_delete_own_permission()

{

- $this->giveUserPermissions($this->user, ['image-update-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['image-update-all']);

$page = $this->entities->page();

$image = Image::factory()->create([

'uploaded_to' => $page->id,

@@ -833,7 +849,7 @@ class RolesTest extends TestCase

$this->actingAs($this->user)->json('delete', '/images/' . $image->id)->assertStatus(403);

- $this->giveUserPermissions($this->user, ['image-delete-own']);

+ $this->permissions->grantUserRolePermissions($this->user, ['image-delete-own']);

$this->actingAs($this->user)->json('delete', '/images/' . $image->id)->assertOk();

$this->assertDatabaseMissing('images', ['id' => $image->id]);

@@ -841,18 +857,18 @@ class RolesTest extends TestCase

public function test_image_delete_all_permission()

{

- $this->giveUserPermissions($this->user, ['image-update-all']);

- $admin = $this->getAdmin();

+ $this->permissions->grantUserRolePermissions($this->user, ['image-update-all']);

+ $admin = $this->users->admin();

$page = $this->entities->page();

$image = Image::factory()->create(['uploaded_to' => $page->id, 'created_by' => $admin->id, 'updated_by' => $admin->id]);

$this->actingAs($this->user)->json('delete', '/images/' . $image->id)->assertStatus(403);

- $this->giveUserPermissions($this->user, ['image-delete-own']);

+ $this->permissions->grantUserRolePermissions($this->user, ['image-delete-own']);

$this->actingAs($this->user)->json('delete', '/images/' . $image->id)->assertStatus(403);

- $this->giveUserPermissions($this->user, ['image-delete-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['image-delete-all']);

$this->actingAs($this->user)->json('delete', '/images/' . $image->id)->assertOk();

$this->assertDatabaseMissing('images', ['id' => $image->id]);

@@ -863,13 +879,13 @@ class RolesTest extends TestCase

// To cover issue fixed in f99c8ff99aee9beb8c692f36d4b84dc6e651e50a.

$page = $this->entities->page();

$viewerRole = Role::getRole('viewer');

- $viewer = $this->getViewer();

+ $viewer = $this->users->viewer();

$this->actingAs($viewer)->get($page->getUrl())->assertOk();

$this->asAdmin()->put('/settings/roles/' . $viewerRole->id, [

'display_name' => $viewerRole->display_name,

'description' => $viewerRole->description,

- 'permission' => [],

+ 'permissions' => [],

])->assertStatus(302);

$this->actingAs($viewer)->get($page->getUrl())->assertStatus(404);

@@ -877,18 +893,18 @@ class RolesTest extends TestCase

public function test_empty_state_actions_not_visible_without_permission()

{

- $admin = $this->getAdmin();

+ $admin = $this->users->admin();

// Book links

$book = Book::factory()->create(['created_by' => $admin->id, 'updated_by' => $admin->id]);

- $this->entities->regenPermissions($book);

- $this->actingAs($this->getViewer())->get($book->getUrl())

+ $this->permissions->regenerateForEntity($book);

+ $this->actingAs($this->users->viewer())->get($book->getUrl())

->assertDontSee('Create a new page')

->assertDontSee('Add a chapter');

// Chapter links

$chapter = Chapter::factory()->create(['created_by' => $admin->id, 'updated_by' => $admin->id, 'book_id' => $book->id]);

- $this->entities->regenPermissions($chapter);

- $this->actingAs($this->getViewer())->get($chapter->getUrl())

+ $this->permissions->regenerateForEntity($chapter);

+ $this->actingAs($this->users->viewer())->get($chapter->getUrl())

->assertDontSee('Create a new page')

->assertDontSee('Sort the current book');

}

@@ -901,7 +917,7 @@ class RolesTest extends TestCase

->addComment($ownPage)

->assertStatus(403);

- $this->giveUserPermissions($this->user, ['comment-create-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['comment-create-all']);

$this->actingAs($this->user)

->addComment($ownPage)

@@ -911,7 +927,7 @@ class RolesTest extends TestCase

public function test_comment_update_own_permission()

{

$ownPage = $this->entities->createChainBelongingToUser($this->user)['page'];

- $this->giveUserPermissions($this->user, ['comment-create-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['comment-create-all']);

$this->actingAs($this->user)->addComment($ownPage);

/** @var Comment $comment */

$comment = $ownPage->comments()->latest()->first();

@@ -919,7 +935,7 @@ class RolesTest extends TestCase

// no comment-update-own

$this->actingAs($this->user)->updateComment($comment)->assertStatus(403);

- $this->giveUserPermissions($this->user, ['comment-update-own']);

+ $this->permissions->grantUserRolePermissions($this->user, ['comment-update-own']);

// now has comment-update-own

$this->actingAs($this->user)->updateComment($comment)->assertOk();

@@ -936,7 +952,7 @@ class RolesTest extends TestCase

// no comment-update-all

$this->actingAs($this->user)->updateComment($comment)->assertStatus(403);

- $this->giveUserPermissions($this->user, ['comment-update-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['comment-update-all']);

// now has comment-update-all

$this->actingAs($this->user)->updateComment($comment)->assertOk();

@@ -946,7 +962,7 @@ class RolesTest extends TestCase

{

/** @var Page $ownPage */

$ownPage = $this->entities->createChainBelongingToUser($this->user)['page'];

- $this->giveUserPermissions($this->user, ['comment-create-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['comment-create-all']);

$this->actingAs($this->user)->addComment($ownPage);

/** @var Comment $comment */

@@ -955,7 +971,7 @@ class RolesTest extends TestCase

// no comment-delete-own

$this->actingAs($this->user)->deleteComment($comment)->assertStatus(403);

- $this->giveUserPermissions($this->user, ['comment-delete-own']);

+ $this->permissions->grantUserRolePermissions($this->user, ['comment-delete-own']);

// now has comment-update-own

$this->actingAs($this->user)->deleteComment($comment)->assertOk();

@@ -972,7 +988,7 @@ class RolesTest extends TestCase

// no comment-delete-all

$this->actingAs($this->user)->deleteComment($comment)->assertStatus(403);

- $this->giveUserPermissions($this->user, ['comment-delete-all']);

+ $this->permissions->grantUserRolePermissions($this->user, ['comment-delete-all']);

// now has comment-delete-all

$this->actingAs($this->user)->deleteComment($comment)->assertOk();