use BookStack\Entities\Models\Entity;
use BookStack\Entities\Models\Page;
use BookStack\Uploads\Image;
+use Illuminate\Testing\TestResponse;
use Tests\TestCase;
-use Tests\TestResponse;
class RolesTest extends TestCase
{
- protected $user;
+ protected User $user;
protected function setUp(): void
{
parent::setUp();
- $this->user = $this->getViewer();
+ $this->user = $this->users->viewer();
}
public function test_admin_can_see_settings()
{
- $this->asAdmin()->get('/settings')->assertSee('Settings');
+ $this->asAdmin()->get('/settings/features')->assertSee('Settings');
}
public function test_cannot_delete_admin_role()
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;
$testRoleUpdateName = 'An Super Updated role';
// Creation
- $resp = $this->asAdmin()->get('/settings');
- $resp->assertElementContains('a[href="' . url('/settings/roles') . '"]', 'Roles');
+ $resp = $this->asAdmin()->get('/settings/features');
+ $this->withHtml($resp)->assertElementContains('a[href="' . url('/settings/roles') . '"]', 'Roles');
$resp = $this->get('/settings/roles');
- $resp->assertElementContains('a[href="' . url('/settings/roles/new') . '"]', 'Create New Role');
+ $this->withHtml($resp)->assertElementContains('a[href="' . url('/settings/roles/new') . '"]', 'Create New Role');
$resp = $this->get('/settings/roles/new');
- $resp->assertElementContains('form[action="' . url('/settings/roles/new') . '"]', 'Save Role');
+ $this->withHtml($resp)->assertElementContains('form[action="' . url('/settings/roles/new') . '"]', 'Save Role');
$resp = $this->post('/settings/roles/new', [
'display_name' => $testRoleName,
$resp = $this->get('/settings/roles/' . $role->id);
$resp->assertSee($testRoleName);
$resp->assertSee($testRoleDesc);
- $resp->assertElementContains('form[action="' . url('/settings/roles/' . $role->id) . '"]', 'Save Role');
+ $this->withHtml($resp)->assertElementContains('form[action="' . url('/settings/roles/' . $role->id) . '"]', 'Save Role');
$resp = $this->put('/settings/roles/' . $role->id, [
'display_name' => $testRoleUpdateName,
// Deleting
$resp = $this->get('/settings/roles/' . $role->id);
- $resp->assertElementContains('a[href="' . url("/settings/roles/delete/$role->id") . '"]', 'Delete Role');
+ $this->withHtml($resp)->assertElementContains('a[href="' . url("/settings/roles/delete/$role->id") . '"]', 'Delete Role');
$resp = $this->get("/settings/roles/delete/$role->id");
$resp->assertSee($testRoleUpdateName);
- $resp->assertElementContains('form[action="' . url("/settings/roles/delete/$role->id") . '"]', 'Confirm');
+ $this->withHtml($resp)->assertElementContains('form[action="' . url("/settings/roles/delete/$role->id") . '"]', 'Confirm');
$resp = $this->delete("/settings/roles/delete/$role->id");
$resp->assertRedirect('/settings/roles');
{
/** @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, [
$this->assertCount(1, $roleB->users()->get());
$deletePage = $this->asAdmin()->get("/settings/roles/delete/$roleB->id");
- $deletePage->assertElementExists('select[name=migrate_role_id]');
+ $this->withHtml($deletePage)->assertElementExists('select[name=migrate_role_id]');
$this->asAdmin()->delete("/settings/roles/delete/$roleB->id", [
'migrate_role_id' => $roleA->id,
]);
$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->permissions->setEntityPermissions($page, ['view'], [$roleA]);
+
+ $this->assertDatabaseHas('entity_permissions', [
+ 'role_id' => $roleA->id,
+ 'entity_id' => $page->id,
+ 'entity_type' => $page->getMorphClass(),
+ ]);
+
+ $this->asAdmin()->delete("/settings/roles/delete/$roleA->id");
+
+ $this->assertDatabaseMissing('entity_permissions', [
+ 'role_id' => $roleA->id,
+ 'entity_id' => $page->id,
+ 'entity_type' => $page->getMorphClass(),
+ ]);
+ }
+
+ public function test_image_view_notice_shown_on_role_form()
+ {
+ /** @var Role $role */
+ $role = Role::query()->first();
+ $this->asAdmin()->get("/settings/roles/{$role->id}")
+ ->assertSee('Actual access of uploaded image files will be dependant upon system image storage option');
+ }
+
public function test_copy_role_button_shown()
{
/** @var Role $role */
$role = Role::query()->first();
$resp = $this->asAdmin()->get("/settings/roles/{$role->id}");
- $resp->assertElementContains('a[href$="/roles/new?copy_from=' . $role->id . '"]', 'Copy');
+ $this->withHtml($resp)->assertElementContains('a[href$="/roles/new?copy_from=' . $role->id . '"]', 'Copy');
}
public function test_copy_from_param_on_create_prefills_with_other_role_data()
$role = Role::query()->first();
$resp = $this->asAdmin()->get("/settings/roles/new?copy_from={$role->id}");
$resp->assertOk();
- $resp->assertElementExists('input[name="display_name"][value="' . ($role->display_name . ' (Copy)') . '"]');
+ $this->withHtml($resp)->assertElementExists('input[name="display_name"][value="' . ($role->display_name . ' (Copy)') . '"]');
}
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();
}
{
$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);
}
$originalEmail = $this->user->email;
$this->actingAs($this->user);
- $this->get($userProfileUrl)
- ->assertOk()
- ->assertElementExists('input[name=email][disabled]');
+ $resp = $this->get($userProfileUrl)
+ ->assertOk();
+ $this->withHtml($resp)->assertElementExists('input[name=email][disabled]');
$this->put($userProfileUrl, [
'name' => 'my_new_name',
'name' => 'my_new_name',
]);
- $this->giveUserPermissions($this->user, ['users-manage']);
+ $this->permissions->grantUserRolePermissions($this->user, ['users-manage']);
- $this->get($userProfileUrl)
- ->assertOk()
- ->assertElementNotExists('input[name=email][disabled]')
+ $resp = $this->get($userProfileUrl)
+ ->assertOk();
+ $this->withHtml($resp)->assertElementNotExists('input[name=email][disabled]')
->assertElementExists('input[name=email]');
$this->put($userProfileUrl, [
'name' => 'my_new_name_2',
{
$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()
public function test_settings_manage_permission()
{
- $this->actingAs($this->user)->get('/settings')->assertRedirect('/');
- $this->giveUserPermissions($this->user, ['settings-manage']);
- $this->get('/settings')->assertOk();
+ $this->actingAs($this->user)->get('/settings/features')->assertRedirect('/');
+ $this->permissions->grantUserRolePermissions($this->user, ['settings-manage']);
+ $this->get('/settings/features')->assertOk();
- $resp = $this->post('/settings', []);
- $resp->assertRedirect('/settings');
- $resp = $this->get('/settings');
+ $resp = $this->post('/settings/features', []);
+ $resp->assertRedirect('/settings/features');
+ $resp = $this->get('/settings/features');
$resp->assertSee('Settings saved');
}
$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');
{
/** @var Page $otherUsersPage */
$otherUsersPage = Page::query()->first();
- $content = $this->createEntityChainBelongingToUser($this->user);
+ $content = $this->entities->createChainBelongingToUser($this->user);
// Set a different creator on the page we're checking to ensure
// that the owner fields are checked
$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');
}
foreach ($visibles as $url => $text) {
- $this->actingAs($this->user)->get($url)
- ->assertElementNotContains('.action-buttons', $text);
+ $resp = $this->actingAs($this->user)->get($url);
+ $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();
{
/** @var Bookshelf $otherShelf */
$otherShelf = Bookshelf::query()->first();
- $ownShelf = $this->newShelf(['name' => 'test-shelf', 'slug' => 'test-shelf']);
+ $ownShelf = $this->entities->newShelf(['name' => 'test-shelf', 'slug' => 'test-shelf']);
$ownShelf->forceFill(['owned_by' => $this->user->id, 'updated_by' => $this->user->id])->save();
- $this->regenEntityPermissions($ownShelf);
+ $this->permissions->regenerateForEntity($ownShelf);
$this->checkAccessPermission('bookshelf-update-own', [
$ownShelf->getUrl('/edit'),
$ownShelf->getUrl() => 'Edit',
]);
- $this->get($otherShelf->getUrl())->assertElementNotContains('.action-buttons', 'Edit');
+ $resp = $this->get($otherShelf->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Edit');
$this->get($otherShelf->getUrl('/edit'))->assertRedirect('/');
}
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->newShelf(['name' => 'test-shelf', 'slug' => 'test-shelf']);
+ $ownShelf = $this->entities->newShelf(['name' => 'test-shelf', 'slug' => 'test-shelf']);
$ownShelf->forceFill(['owned_by' => $this->user->id, 'updated_by' => $this->user->id])->save();
- $this->regenEntityPermissions($ownShelf);
+ $this->permissions->regenerateForEntity($ownShelf);
$this->checkAccessPermission('bookshelf-delete-own', [
$ownShelf->getUrl('/delete'),
$ownShelf->getUrl() => 'Delete',
]);
- $this->get($otherShelf->getUrl())->assertElementNotContains('.action-buttons', 'Delete');
+ $resp = $this->get($otherShelf->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Delete');
$this->get($otherShelf->getUrl('/delete'))->assertRedirect('/');
$this->get($ownShelf->getUrl());
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', [
{
/** @var Book $otherBook */
$otherBook = Book::query()->take(1)->get()->first();
- $ownBook = $this->createEntityChainBelongingToUser($this->user)['book'];
+ $ownBook = $this->entities->createChainBelongingToUser($this->user)['book'];
$this->checkAccessPermission('book-update-own', [
$ownBook->getUrl() . '/edit',
], [
$ownBook->getUrl() => 'Edit',
]);
- $this->get($otherBook->getUrl())->assertElementNotContains('.action-buttons', 'Edit');
+ $resp = $this->get($otherBook->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Edit');
$this->get($otherBook->getUrl('/edit'))->assertRedirect('/');
}
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->createEntityChainBelongingToUser($this->user)['book'];
+ $ownBook = $this->entities->createChainBelongingToUser($this->user)['book'];
$this->checkAccessPermission('book-delete-own', [
$ownBook->getUrl() . '/delete',
], [
$ownBook->getUrl() => 'Delete',
]);
- $this->get($otherBook->getUrl())->assertElementNotContains('.action-buttons', 'Delete');
+ $resp = $this->get($otherBook->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Delete');
$this->get($otherBook->getUrl('/delete'))->assertRedirect('/');
$this->get($ownBook->getUrl());
$this->delete($ownBook->getUrl())->assertRedirect('/books');
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', [
{
/** @var Book $book */
$book = Book::query()->take(1)->get()->first();
- $ownBook = $this->createEntityChainBelongingToUser($this->user)['book'];
+ $ownBook = $this->entities->createChainBelongingToUser($this->user)['book'];
$this->checkAccessPermission('chapter-create-own', [
$ownBook->getUrl('/create-chapter'),
], [
'description' => 'chapter desc',
])->assertRedirect($ownBook->getUrl('/chapter/test-chapter'));
- $this->get($book->getUrl())->assertElementNotContains('.action-buttons', 'New Chapter');
+ $resp = $this->get($book->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'New Chapter');
$this->get($book->getUrl('/create-chapter'))->assertRedirect('/');
}
public function test_chapter_create_all_permissions()
{
- /** @var Book $book */
- $book = Book::query()->first();
+ $book = $this->entities->book();
$this->checkAccessPermission('chapter-create-all', [
$book->getUrl('/create-chapter'),
], [
{
/** @var Chapter $otherChapter */
$otherChapter = Chapter::query()->first();
- $ownChapter = $this->createEntityChainBelongingToUser($this->user)['chapter'];
+ $ownChapter = $this->entities->createChainBelongingToUser($this->user)['chapter'];
$this->checkAccessPermission('chapter-update-own', [
$ownChapter->getUrl() . '/edit',
], [
$ownChapter->getUrl() => 'Edit',
]);
- $this->get($otherChapter->getUrl())->assertElementNotContains('.action-buttons', 'Edit');
+ $resp = $this->get($otherChapter->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Edit');
$this->get($otherChapter->getUrl('/edit'))->assertRedirect('/');
}
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->createEntityChainBelongingToUser($this->user)['chapter'];
+ $ownChapter = $this->entities->createChainBelongingToUser($this->user)['chapter'];
$this->checkAccessPermission('chapter-delete-own', [
$ownChapter->getUrl() . '/delete',
], [
]);
$bookUrl = $ownChapter->book->getUrl();
- $this->get($otherChapter->getUrl())->assertElementNotContains('.action-buttons', 'Delete');
+ $resp = $this->get($otherChapter->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Delete');
$this->get($otherChapter->getUrl('/delete'))->assertRedirect('/');
$this->get($ownChapter->getUrl());
$this->delete($ownChapter->getUrl())->assertRedirect($bookUrl);
- $this->get($bookUrl)->assertElementNotContains('.book-content', $ownChapter->name);
+ $resp = $this->get($bookUrl);
+ $this->withHtml($resp)->assertElementNotContains('.book-content', $ownChapter->name);
}
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', [
$bookUrl = $otherChapter->book->getUrl();
$this->get($otherChapter->getUrl());
$this->delete($otherChapter->getUrl())->assertRedirect($bookUrl);
- $this->get($bookUrl)->assertElementNotContains('.book-content', $otherChapter->name);
+ $resp = $this->get($bookUrl);
+ $this->withHtml($resp)->assertElementNotContains('.book-content', $otherChapter->name);
}
public function test_page_create_own_permissions()
{
- /** @var Book $book */
- $book = Book::query()->first();
- /** @var Chapter $chapter */
- $chapter = Chapter::query()->first();
+ $book = $this->entities->book();
+ $chapter = $this->entities->chapter();
- $entities = $this->createEntityChainBelongingToUser($this->user);
+ $entities = $this->entities->createChainBelongingToUser($this->user);
$ownBook = $entities['book'];
$ownChapter = $entities['chapter'];
$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);
'html' => 'page desc',
])->assertRedirect($ownBook->getUrl('/page/test-page'));
- $this->get($book->getUrl())->assertElementNotContains('.action-buttons', 'New Page');
+ $resp = $this->get($book->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'New Page');
$this->get($book->getUrl('/create-page'))->assertRedirect('/');
- $this->get($chapter->getUrl())->assertElementNotContains('.action-buttons', 'New Page');
+ $resp = $this->get($chapter->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'New Page');
$this->get($chapter->getUrl('/create-page'))->assertRedirect('/');
}
public function test_page_create_all_permissions()
{
- /** @var Book $book */
- $book = Book::query()->first();
- /** @var Chapter $chapter */
- $chapter = Chapter::query()->first();
+ $book = $this->entities->book();
+ $chapter = $this->entities->chapter();
$createUrl = $book->getUrl('/create-page');
$createUrlChapter = $chapter->getUrl('/create-page');
$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);
{
/** @var Page $otherPage */
$otherPage = Page::query()->first();
- $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
+ $ownPage = $this->entities->createChainBelongingToUser($this->user)['page'];
$this->checkAccessPermission('page-update-own', [
$ownPage->getUrl() . '/edit',
], [
$ownPage->getUrl() => 'Edit',
]);
- $this->get($otherPage->getUrl())->assertElementNotContains('.action-buttons', 'Edit');
+ $resp = $this->get($otherPage->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Edit');
$this->get($otherPage->getUrl() . '/edit')->assertRedirect('/');
}
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->createEntityChainBelongingToUser($this->user)['page'];
+ $ownPage = $this->entities->createChainBelongingToUser($this->user)['page'];
$this->checkAccessPermission('page-delete-own', [
$ownPage->getUrl() . '/delete',
], [
]);
$parent = $ownPage->chapter ?? $ownPage->book;
- $this->get($otherPage->getUrl())->assertElementNotContains('.action-buttons', 'Delete');
+ $resp = $this->get($otherPage->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.action-buttons', 'Delete');
$this->get($otherPage->getUrl('/delete'))->assertRedirect('/');
$this->get($ownPage->getUrl());
$this->delete($ownPage->getUrl())->assertRedirect($parent->getUrl());
- $this->get($parent->getUrl())->assertElementNotContains('.book-content', $ownPage->name);
+ $resp = $this->get($parent->getUrl());
+ $this->withHtml($resp)->assertElementNotContains('.book-content', $ownPage->name);
}
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();
$user = User::query()->first();
$adminRole = Role::getSystemRole('admin');
$publicRole = Role::getSystemRole('public');
- $this->asAdmin()->get('/settings/users/' . $user->id)
- ->assertElementExists('[name="roles[' . $adminRole->id . ']"]')
+ $resp = $this->asAdmin()->get('/settings/users/' . $user->id);
+ $this->withHtml($resp)->assertElementExists('[name="roles[' . $adminRole->id . ']"]')
->assertElementExists('[name="roles[' . $publicRole->id . ']"]');
}
public function test_public_role_visible_in_default_role_setting()
{
- $this->asAdmin()->get('/settings')
- ->assertElementExists('[data-system-role-name="admin"]')
+ $resp = $this->asAdmin()->get('/settings/registration');
+ $this->withHtml($resp)->assertElementExists('[data-system-role-name="admin"]')
->assertElementExists('[data-system-role-name="public"]');
}
public function test_image_delete_own_permission()
{
- $this->giveUserPermissions($this->user, ['image-update-all']);
- /** @var Page $page */
- $page = Page::query()->first();
+ $this->permissions->grantUserRolePermissions($this->user, ['image-update-all']);
+ $page = $this->entities->page();
$image = Image::factory()->create([
'uploaded_to' => $page->id,
'created_by' => $this->user->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)->assertOk();
$this->assertDatabaseMissing('images', ['id' => $image->id]);
public function test_image_delete_all_permission()
{
- $this->giveUserPermissions($this->user, ['image-update-all']);
- $admin = $this->getAdmin();
- /** @var Page $page */
- $page = Page::query()->first();
+ $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]);
public function test_role_permission_removal()
{
// To cover issue fixed in f99c8ff99aee9beb8c692f36d4b84dc6e651e50a.
- /** @var Page $page */
- $page = Page::query()->first();
+ $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);
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->regenEntityPermissions($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->regenEntityPermissions($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');
}
public function test_comment_create_permission()
{
- $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
+ $ownPage = $this->entities->createChainBelongingToUser($this->user)['page'];
$this->actingAs($this->user)
->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)
public function test_comment_update_own_permission()
{
- $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
- $this->giveUserPermissions($this->user, ['comment-create-all']);
+ $ownPage = $this->entities->createChainBelongingToUser($this->user)['page'];
+ $this->permissions->grantUserRolePermissions($this->user, ['comment-create-all']);
$this->actingAs($this->user)->addComment($ownPage);
/** @var Comment $comment */
$comment = $ownPage->comments()->latest()->first();
// 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();
public function test_comment_update_all_permission()
{
/** @var Page $ownPage */
- $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
+ $ownPage = $this->entities->createChainBelongingToUser($this->user)['page'];
$this->asAdmin()->addComment($ownPage);
/** @var Comment $comment */
$comment = $ownPage->comments()->latest()->first();
// 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();
public function test_comment_delete_own_permission()
{
/** @var Page $ownPage */
- $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
- $this->giveUserPermissions($this->user, ['comment-create-all']);
+ $ownPage = $this->entities->createChainBelongingToUser($this->user)['page'];
+ $this->permissions->grantUserRolePermissions($this->user, ['comment-create-all']);
$this->actingAs($this->user)->addComment($ownPage);
/** @var Comment $comment */
// 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();
public function test_comment_delete_all_permission()
{
/** @var Page $ownPage */
- $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
+ $ownPage = $this->entities->createChainBelongingToUser($this->user)['page'];
$this->asAdmin()->addComment($ownPage);
/** @var Comment $comment */
$comment = $ownPage->comments()->latest()->first();
// 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();
projects / bookstack / blobdiff