-<?php namespace Tests;
-
-use BookStack\Repos\PermissionsRepo;
-use BookStack\Role;
+<?php namespace Tests\Permissions;
+
+use BookStack\Actions\Comment;
+use BookStack\Auth\User;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;
+use BookStack\Auth\Role;
+use BookStack\Uploads\Image;
+use Laravel\BrowserKitTesting\HttpException;
+use Tests\BrowserKitTest;
class RolesTest extends BrowserKitTest
{
protected $user;
- public function setUp()
+ public function setUp(): void
{
parent::setUp();
$this->user = $this->getViewer();
}
- protected function getViewer()
- {
- $role = \BookStack\Role::getRole('viewer');
- $viewer = $this->getNewBlankUser();
- $viewer->attachRole($role);;
- return $viewer;
- }
-
- /**
- * Give the given user some permissions.
- * @param \BookStack\User $user
- * @param array $permissions
- */
- protected function giveUserPermissions(\BookStack\User $user, $permissions = [])
- {
- $newRole = $this->createNewRole($permissions);
- $user->attachRole($newRole);
- $user->load('roles');
- $user->permissions(false);
- }
-
- /**
- * Create a new basic role for testing purposes.
- * @param array $permissions
- * @return Role
- */
- protected function createNewRole($permissions = [])
- {
- $permissionRepo = app(PermissionsRepo::class);
- $roleData = factory(\BookStack\Role::class)->make()->toArray();
- $roleData['permissions'] = array_flip($permissions);
- return $permissionRepo->saveNewRole($roleData);
- }
-
public function test_admin_can_see_settings()
{
$this->asAdmin()->visit('/settings')->see('Settings');
public function test_cannot_delete_admin_role()
{
- $adminRole = \BookStack\Role::getRole('admin');
+ $adminRole = Role::getRole('admin');
$deletePageUrl = '/settings/roles/delete/' . $adminRole->id;
$this->asAdmin()->visit($deletePageUrl)
->press('Confirm')
->type('Test Role', 'display_name')
->type('A little test description', 'description')
->press('Save Role')
- ->seeInDatabase('roles', ['display_name' => $testRoleName, 'name' => 'test-role', 'description' => $testRoleDesc])
+ ->seeInDatabase('roles', ['display_name' => $testRoleName, 'description' => $testRoleDesc])
->seePageIs('/settings/roles');
// Updating
$this->asAdmin()->visit('/settings/roles')
->click($testRoleName)
->type($testRoleUpdateName, '#display_name')
->press('Save Role')
- ->seeInDatabase('roles', ['display_name' => $testRoleUpdateName, 'name' => 'test-role', 'description' => $testRoleDesc])
+ ->seeInDatabase('roles', ['display_name' => $testRoleUpdateName, 'description' => $testRoleDesc])
->seePageIs('/settings/roles');
// Deleting
$this->asAdmin()->visit('/settings/roles')
->dontSee($testRoleUpdateName);
}
+ public function test_admin_role_cannot_be_removed_if_last_admin()
+ {
+ $adminRole = Role::where('system_name', '=', 'admin')->first();
+ $adminUser = $this->getAdmin();
+ $adminRole->users()->where('id', '!=', $adminUser->id)->delete();
+ $this->assertEquals($adminRole->users()->count(), 1);
+
+ $viewerRole = $this->getViewer()->roles()->first();
+
+ $editUrl = '/settings/users/' . $adminUser->id;
+ $this->actingAs($adminUser)->put($editUrl, [
+ 'name' => $adminUser->name,
+ 'email' => $adminUser->email,
+ 'roles' => [
+ 'viewer' => strval($viewerRole->id),
+ ]
+ ])->followRedirects();
+
+ $this->seePageIs($editUrl);
+ $this->see('This user is the only user assigned to the administrator role');
+ }
+
+ public function test_migrate_users_on_delete_works()
+ {
+ $roleA = Role::query()->create(['display_name' => 'Delete Test A']);
+ $roleB = Role::query()->create(['display_name' => 'Delete Test B']);
+ $this->user->attachRole($roleB);
+
+ $this->assertCount(0, $roleA->users()->get());
+ $this->assertCount(1, $roleB->users()->get());
+
+ $deletePage = $this->asAdmin()->get("/settings/roles/delete/{$roleB->id}");
+ $deletePage->seeElement('select[name=migrate_role_id]');
+ $this->asAdmin()->delete("/settings/roles/delete/{$roleB->id}", [
+ 'migrate_role_id' => $roleA->id,
+ ]);
+
+ $this->assertCount(1, $roleA->users()->get());
+ $this->assertEquals($this->user->id, $roleA->users()->first()->id);
+ }
+
public function test_manage_user_permission()
{
$this->actingAs($this->user)->visit('/settings/users')
->seePageIs('/settings/users');
}
+ public function test_manage_users_permission_shows_link_in_header_if_does_not_have_settings_manage_permision()
+ {
+ $usersLink = 'href="'.url('/settings/users') . '"';
+ $this->actingAs($this->user)->visit('/')->dontSee($usersLink);
+ $this->giveUserPermissions($this->user, ['users-manage']);
+ $this->actingAs($this->user)->visit('/')->see($usersLink);
+ $this->giveUserPermissions($this->user, ['settings-manage', 'users-manage']);
+ $this->actingAs($this->user)->visit('/')->dontSee($usersLink);
+ }
+
+ public function test_user_cannot_change_email_unless_they_have_manage_users_permission()
+ {
+ $userProfileUrl = '/settings/users/' . $this->user->id;
+ $originalEmail = $this->user->email;
+ $this->actingAs($this->user);
+
+ $this->visit($userProfileUrl)
+ ->assertResponseOk()
+ ->seeElement('input[name=email][disabled]');
+ $this->put($userProfileUrl, [
+ 'name' => 'my_new_name',
+ ]);
+ $this->seeInDatabase('users', [
+ 'id' => $this->user->id,
+ 'email' => $originalEmail,
+ 'name' => 'my_new_name',
+ ]);
+
+ $this->giveUserPermissions($this->user, ['users-manage']);
+
+ $this->visit($userProfileUrl)
+ ->assertResponseOk()
+ ->dontSeeElement('input[name=email][disabled]')
+ ->seeElement('input[name=email]');
+ $this->put($userProfileUrl, [
+ 'name' => 'my_new_name_2',
+ ]);
+
+ $this->seeInDatabase('users', [
+ 'id' => $this->user->id,
+ 'name' => 'my_new_name_2',
+ ]);
+ }
+
public function test_user_roles_manage_permission()
{
$this->actingAs($this->user)->visit('/settings/roles')
public function test_restrictions_manage_all_permission()
{
- $page = \BookStack\Page::take(1)->get()->first();
+ $page = Page::take(1)->get()->first();
$this->actingAs($this->user)->visit($page->getUrl())
->dontSee('Permissions')
->visit($page->getUrl() . '/permissions')
public function test_restrictions_manage_own_permission()
{
- $otherUsersPage = \BookStack\Page::first();
+ $otherUsersPage = Page::first();
$content = $this->createEntityChainBelongingToUser($this->user);
// Check can't restrict other's content
$this->actingAs($this->user)->visit($otherUsersPage->getUrl())
}
}
+ public function test_bookshelves_create_all_permissions()
+ {
+ $this->checkAccessPermission('bookshelf-create-all', [
+ '/create-shelf'
+ ], [
+ '/shelves' => 'New Shelf'
+ ]);
+
+ $this->visit('/create-shelf')
+ ->type('test shelf', 'name')
+ ->type('shelf desc', 'description')
+ ->press('Save Shelf')
+ ->seePageIs('/shelves/test-shelf');
+ }
+
+ public function test_bookshelves_edit_own_permission()
+ {
+ $otherShelf = Bookshelf::first();
+ $ownShelf = $this->newShelf(['name' => 'test-shelf', 'slug' => 'test-shelf']);
+ $ownShelf->forceFill(['created_by' => $this->user->id, 'updated_by' => $this->user->id])->save();
+ $this->regenEntityPermissions($ownShelf);
+
+ $this->checkAccessPermission('bookshelf-update-own', [
+ $ownShelf->getUrl('/edit')
+ ], [
+ $ownShelf->getUrl() => 'Edit'
+ ]);
+
+ $this->visit($otherShelf->getUrl())
+ ->dontSeeInElement('.action-buttons', 'Edit')
+ ->visit($otherShelf->getUrl('/edit'))
+ ->seePageIs('/');
+ }
+
+ public function test_bookshelves_edit_all_permission()
+ {
+ $otherShelf = Bookshelf::first();
+ $this->checkAccessPermission('bookshelf-update-all', [
+ $otherShelf->getUrl('/edit')
+ ], [
+ $otherShelf->getUrl() => 'Edit'
+ ]);
+ }
+
+ public function test_bookshelves_delete_own_permission()
+ {
+ $this->giveUserPermissions($this->user, ['bookshelf-update-all']);
+ $otherShelf = Bookshelf::first();
+ $ownShelf = $this->newShelf(['name' => 'test-shelf', 'slug' => 'test-shelf']);
+ $ownShelf->forceFill(['created_by' => $this->user->id, 'updated_by' => $this->user->id])->save();
+ $this->regenEntityPermissions($ownShelf);
+
+ $this->checkAccessPermission('bookshelf-delete-own', [
+ $ownShelf->getUrl('/delete')
+ ], [
+ $ownShelf->getUrl() => 'Delete'
+ ]);
+
+ $this->visit($otherShelf->getUrl())
+ ->dontSeeInElement('.action-buttons', 'Delete')
+ ->visit($otherShelf->getUrl('/delete'))
+ ->seePageIs('/');
+ $this->visit($ownShelf->getUrl())->visit($ownShelf->getUrl('/delete'))
+ ->press('Confirm')
+ ->seePageIs('/shelves')
+ ->dontSee($ownShelf->name);
+ }
+
+ public function test_bookshelves_delete_all_permission()
+ {
+ $this->giveUserPermissions($this->user, ['bookshelf-update-all']);
+ $otherShelf = Bookshelf::first();
+ $this->checkAccessPermission('bookshelf-delete-all', [
+ $otherShelf->getUrl('/delete')
+ ], [
+ $otherShelf->getUrl() => 'Delete'
+ ]);
+
+ $this->visit($otherShelf->getUrl())->visit($otherShelf->getUrl('/delete'))
+ ->press('Confirm')
+ ->seePageIs('/shelves')
+ ->dontSee($otherShelf->name);
+ }
+
public function test_books_create_all_permissions()
{
$this->checkAccessPermission('book-create-all', [
- '/books/create'
+ '/create-book'
], [
'/books' => 'Create New Book'
]);
- $this->visit('/books/create')
+ $this->visit('/create-book')
->type('test book', 'name')
->type('book desc', 'description')
->press('Save Book')
public function test_books_edit_own_permission()
{
- $otherBook = \BookStack\Book::take(1)->get()->first();
+ $otherBook = Book::take(1)->get()->first();
$ownBook = $this->createEntityChainBelongingToUser($this->user)['book'];
$this->checkAccessPermission('book-update-own', [
$ownBook->getUrl() . '/edit'
public function test_books_edit_all_permission()
{
- $otherBook = \BookStack\Book::take(1)->get()->first();
+ $otherBook = Book::take(1)->get()->first();
$this->checkAccessPermission('book-update-all', [
$otherBook->getUrl() . '/edit'
], [
public function test_books_delete_own_permission()
{
$this->giveUserPermissions($this->user, ['book-update-all']);
- $otherBook = \BookStack\Book::take(1)->get()->first();
+ $otherBook = Book::take(1)->get()->first();
$ownBook = $this->createEntityChainBelongingToUser($this->user)['book'];
$this->checkAccessPermission('book-delete-own', [
$ownBook->getUrl() . '/delete'
public function test_books_delete_all_permission()
{
$this->giveUserPermissions($this->user, ['book-update-all']);
- $otherBook = \BookStack\Book::take(1)->get()->first();
+ $otherBook = Book::take(1)->get()->first();
$this->checkAccessPermission('book-delete-all', [
$otherBook->getUrl() . '/delete'
], [
public function test_chapter_create_own_permissions()
{
- $book = \BookStack\Book::take(1)->get()->first();
+ $book = Book::take(1)->get()->first();
$ownBook = $this->createEntityChainBelongingToUser($this->user)['book'];
- $baseUrl = $ownBook->getUrl() . '/chapter';
$this->checkAccessPermission('chapter-create-own', [
- $baseUrl . '/create'
+ $ownBook->getUrl('/create-chapter')
], [
$ownBook->getUrl() => 'New Chapter'
]);
- $this->visit($baseUrl . '/create')
+ $this->visit($ownBook->getUrl('/create-chapter'))
->type('test chapter', 'name')
->type('chapter desc', 'description')
->press('Save Chapter')
- ->seePageIs($baseUrl . '/test-chapter');
+ ->seePageIs($ownBook->getUrl('/chapter/test-chapter'));
$this->visit($book->getUrl())
->dontSeeInElement('.action-buttons', 'New Chapter')
- ->visit($book->getUrl() . '/chapter/create')
+ ->visit($book->getUrl('/create-chapter'))
->seePageIs('/');
}
public function test_chapter_create_all_permissions()
{
- $book = \BookStack\Book::take(1)->get()->first();
- $baseUrl = $book->getUrl() . '/chapter';
+ $book = Book::take(1)->get()->first();
$this->checkAccessPermission('chapter-create-all', [
- $baseUrl . '/create'
+ $book->getUrl('/create-chapter')
], [
$book->getUrl() => 'New Chapter'
]);
- $this->visit($baseUrl . '/create')
+ $this->visit($book->getUrl('/create-chapter'))
->type('test chapter', 'name')
->type('chapter desc', 'description')
->press('Save Chapter')
- ->seePageIs($baseUrl . '/test-chapter');
+ ->seePageIs($book->getUrl('/chapter/test-chapter'));
}
public function test_chapter_edit_own_permission()
{
- $otherChapter = \BookStack\Chapter::take(1)->get()->first();
+ $otherChapter = Chapter::take(1)->get()->first();
$ownChapter = $this->createEntityChainBelongingToUser($this->user)['chapter'];
$this->checkAccessPermission('chapter-update-own', [
$ownChapter->getUrl() . '/edit'
public function test_chapter_edit_all_permission()
{
- $otherChapter = \BookStack\Chapter::take(1)->get()->first();
+ $otherChapter = Chapter::take(1)->get()->first();
$this->checkAccessPermission('chapter-update-all', [
$otherChapter->getUrl() . '/edit'
], [
public function test_chapter_delete_own_permission()
{
$this->giveUserPermissions($this->user, ['chapter-update-all']);
- $otherChapter = \BookStack\Chapter::take(1)->get()->first();
+ $otherChapter = Chapter::take(1)->get()->first();
$ownChapter = $this->createEntityChainBelongingToUser($this->user)['chapter'];
$this->checkAccessPermission('chapter-delete-own', [
$ownChapter->getUrl() . '/delete'
public function test_chapter_delete_all_permission()
{
$this->giveUserPermissions($this->user, ['chapter-update-all']);
- $otherChapter = \BookStack\Chapter::take(1)->get()->first();
+ $otherChapter = Chapter::take(1)->get()->first();
$this->checkAccessPermission('chapter-delete-all', [
$otherChapter->getUrl() . '/delete'
], [
public function test_page_create_own_permissions()
{
- $book = \BookStack\Book::first();
- $chapter = \BookStack\Chapter::first();
+ $book = Book::first();
+ $chapter = Chapter::first();
$entities = $this->createEntityChainBelongingToUser($this->user);
$ownBook = $entities['book'];
$ownChapter = $entities['chapter'];
- $baseUrl = $ownBook->getUrl() . '/page';
-
- $createUrl = $baseUrl . '/create';
- $createUrlChapter = $ownChapter->getUrl() . '/create-page';
+ $createUrl = $ownBook->getUrl('/create-page');
+ $createUrlChapter = $ownChapter->getUrl('/create-page');
$accessUrls = [$createUrl, $createUrlChapter];
foreach ($accessUrls as $url) {
foreach ($accessUrls as $index => $url) {
$this->actingAs($this->user)->visit($url);
- $expectedUrl = \BookStack\Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();
+ $expectedUrl = Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();
$this->seePageIs($expectedUrl);
}
- $this->visit($baseUrl . '/create')
+ $this->visit($createUrl)
->type('test page', 'name')
->type('page desc', 'html')
->press('Save Page')
- ->seePageIs($baseUrl . '/test-page');
+ ->seePageIs($ownBook->getUrl('/page/test-page'));
$this->visit($book->getUrl())
->dontSeeInElement('.action-buttons', 'New Page')
- ->visit($book->getUrl() . '/page/create')
+ ->visit($book->getUrl() . '/create-page')
->seePageIs('/');
$this->visit($chapter->getUrl())
->dontSeeInElement('.action-buttons', 'New Page')
public function test_page_create_all_permissions()
{
- $book = \BookStack\Book::take(1)->get()->first();
- $chapter = \BookStack\Chapter::take(1)->get()->first();
+ $book = Book::take(1)->get()->first();
+ $chapter = Chapter::take(1)->get()->first();
$baseUrl = $book->getUrl() . '/page';
- $createUrl = $baseUrl . '/create';
+ $createUrl = $book->getUrl('/create-page');
- $createUrlChapter = $chapter->getUrl() . '/create-page';
+ $createUrlChapter = $chapter->getUrl('/create-page');
$accessUrls = [$createUrl, $createUrlChapter];
foreach ($accessUrls as $url) {
foreach ($accessUrls as $index => $url) {
$this->actingAs($this->user)->visit($url);
- $expectedUrl = \BookStack\Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();
+ $expectedUrl = Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();
$this->seePageIs($expectedUrl);
}
- $this->visit($baseUrl . '/create')
+ $this->visit($createUrl)
->type('test page', 'name')
->type('page desc', 'html')
->press('Save Page')
- ->seePageIs($baseUrl . '/test-page');
+ ->seePageIs($book->getUrl('/page/test-page'));
- $this->visit($chapter->getUrl() . '/create-page')
+ $this->visit($chapter->getUrl('/create-page'))
->type('new test page', 'name')
->type('page desc', 'html')
->press('Save Page')
- ->seePageIs($baseUrl . '/new-test-page');
+ ->seePageIs($book->getUrl('/page/new-test-page'));
}
public function test_page_edit_own_permission()
{
- $otherPage = \BookStack\Page::take(1)->get()->first();
+ $otherPage = Page::take(1)->get()->first();
$ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
$this->checkAccessPermission('page-update-own', [
$ownPage->getUrl() . '/edit'
public function test_page_edit_all_permission()
{
- $otherPage = \BookStack\Page::take(1)->get()->first();
+ $otherPage = Page::take(1)->get()->first();
$this->checkAccessPermission('page-update-all', [
$otherPage->getUrl() . '/edit'
], [
public function test_page_delete_own_permission()
{
$this->giveUserPermissions($this->user, ['page-update-all']);
- $otherPage = \BookStack\Page::take(1)->get()->first();
+ $otherPage = Page::take(1)->get()->first();
$ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
$this->checkAccessPermission('page-delete-own', [
$ownPage->getUrl() . '/delete'
$ownPage->getUrl() => 'Delete'
]);
- $bookUrl = $ownPage->book->getUrl();
+ $parent = $ownPage->chapter ?? $ownPage->book;
$this->visit($otherPage->getUrl())
->dontSeeInElement('.action-buttons', 'Delete')
->visit($otherPage->getUrl() . '/delete')
->seePageIs('/');
$this->visit($ownPage->getUrl())->visit($ownPage->getUrl() . '/delete')
->press('Confirm')
- ->seePageIs($bookUrl)
+ ->seePageIs($parent->getUrl())
->dontSeeInElement('.book-content', $ownPage->name);
}
public function test_page_delete_all_permission()
{
$this->giveUserPermissions($this->user, ['page-update-all']);
- $otherPage = \BookStack\Page::take(1)->get()->first();
+ $otherPage = Page::take(1)->get()->first();
$this->checkAccessPermission('page-delete-all', [
$otherPage->getUrl() . '/delete'
], [
$otherPage->getUrl() => 'Delete'
]);
- $bookUrl = $otherPage->book->getUrl();
+ $parent = $otherPage->chapter ?? $otherPage->book;
$this->visit($otherPage->getUrl())->visit($otherPage->getUrl() . '/delete')
->press('Confirm')
- ->seePageIs($bookUrl)
+ ->seePageIs($parent->getUrl())
->dontSeeInElement('.book-content', $otherPage->name);
}
public function test_public_role_visible_in_user_edit_screen()
{
- $user = \BookStack\User::first();
+ $user = User::first();
+ $adminRole = Role::getSystemRole('admin');
+ $publicRole = Role::getSystemRole('public');
$this->asAdmin()->visit('/settings/users/' . $user->id)
- ->seeElement('#roles-admin')
- ->seeElement('#roles-public');
+ ->seeElement('[name="roles['.$adminRole->id.']"]')
+ ->seeElement('[name="roles['.$publicRole->id.']"]');
}
public function test_public_role_visible_in_role_listing()
public function test_public_role_visible_in_default_role_setting()
{
$this->asAdmin()->visit('/settings')
- ->seeElement('[data-role-name="admin"]')
- ->seeElement('[data-role-name="public"]');
-
+ ->seeElement('[data-system-role-name="admin"]')
+ ->seeElement('[data-system-role-name="public"]');
}
public function test_public_role_not_deleteable()
->see('Cannot be deleted');
}
-
-
public function test_image_delete_own_permission()
{
$this->giveUserPermissions($this->user, ['image-update-all']);
- $page = \BookStack\Page::first();
- $image = factory(\BookStack\Image::class)->create(['uploaded_to' => $page->id, 'created_by' => $this->user->id, 'updated_by' => $this->user->id]);
+ $page = Page::first();
+ $image = factory(Image::class)->create(['uploaded_to' => $page->id, 'created_by' => $this->user->id, 'updated_by' => $this->user->id]);
$this->actingAs($this->user)->json('delete', '/images/' . $image->id)
->seeStatusCode(403);
{
$this->giveUserPermissions($this->user, ['image-update-all']);
$admin = $this->getAdmin();
- $page = \BookStack\Page::first();
- $image = factory(\BookStack\Image::class)->create(['uploaded_to' => $page->id, 'created_by' => $admin->id, 'updated_by' => $admin->id]);
+ $page = Page::first();
+ $image = factory(Image::class)->create(['uploaded_to' => $page->id, 'created_by' => $admin->id, 'updated_by' => $admin->id]);
$this->actingAs($this->user)->json('delete', '/images/' . $image->id)
->seeStatusCode(403);
->dontSeeInDatabase('images', ['id' => $image->id]);
}
+ public function test_role_permission_removal()
+ {
+ // To cover issue fixed in f99c8ff99aee9beb8c692f36d4b84dc6e651e50a.
+ $page = Page::first();
+ $viewerRole = Role::getRole('viewer');
+ $viewer = $this->getViewer();
+ $this->actingAs($viewer)->visit($page->getUrl())->assertResponseStatus(200);
+
+ $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(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(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');
+ }
+
public function test_comment_create_permission () {
$ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
$this->giveUserPermissions($this->user, ['comment-create-all']);
$this->actingAs($this->user)->addComment($ownPage);
- $this->assertResponseOk(200)->seeJsonContains(['status' => 'success']);
+ $this->assertResponseStatus(200);
}
public function test_comment_update_own_permission () {
$ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
$this->giveUserPermissions($this->user, ['comment-create-all']);
- $comment = $this->actingAs($this->user)->addComment($ownPage);
+ $commentId = $this->actingAs($this->user)->addComment($ownPage);
// no comment-update-own
- $this->actingAs($this->user)->updateComment($ownPage, $comment['id']);
+ $this->actingAs($this->user)->updateComment($commentId);
$this->assertResponseStatus(403);
$this->giveUserPermissions($this->user, ['comment-update-own']);
// now has comment-update-own
- $this->actingAs($this->user)->updateComment($ownPage, $comment['id']);
- $this->assertResponseOk()->seeJsonContains(['status' => 'success']);
+ $this->actingAs($this->user)->updateComment($commentId);
+ $this->assertResponseStatus(200);
}
public function test_comment_update_all_permission () {
$ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
- $comment = $this->asAdmin()->addComment($ownPage);
+ $commentId = $this->asAdmin()->addComment($ownPage);
// no comment-update-all
- $this->actingAs($this->user)->updateComment($ownPage, $comment['id']);
+ $this->actingAs($this->user)->updateComment($commentId);
$this->assertResponseStatus(403);
$this->giveUserPermissions($this->user, ['comment-update-all']);
// now has comment-update-all
- $this->actingAs($this->user)->updateComment($ownPage, $comment['id']);
- $this->assertResponseOk()->seeJsonContains(['status' => 'success']);
+ $this->actingAs($this->user)->updateComment($commentId);
+ $this->assertResponseStatus(200);
}
public function test_comment_delete_own_permission () {
$ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
$this->giveUserPermissions($this->user, ['comment-create-all']);
- $comment = $this->actingAs($this->user)->addComment($ownPage);
+ $commentId = $this->actingAs($this->user)->addComment($ownPage);
// no comment-delete-own
- $this->actingAs($this->user)->deleteComment($comment['id']);
+ $this->actingAs($this->user)->deleteComment($commentId);
$this->assertResponseStatus(403);
$this->giveUserPermissions($this->user, ['comment-delete-own']);
// now has comment-update-own
- $this->actingAs($this->user)->deleteComment($comment['id']);
- $this->assertResponseOk()->seeJsonContains(['status' => 'success']);
+ $this->actingAs($this->user)->deleteComment($commentId);
+ $this->assertResponseStatus(200);
}
public function test_comment_delete_all_permission () {
$ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
- $comment = $this->asAdmin()->addComment($ownPage);
+ $commentId = $this->asAdmin()->addComment($ownPage);
// no comment-delete-all
- $this->actingAs($this->user)->deleteComment($comment['id']);
+ $this->actingAs($this->user)->deleteComment($commentId);
$this->assertResponseStatus(403);
$this->giveUserPermissions($this->user, ['comment-delete-all']);
// now has comment-delete-all
- $this->actingAs($this->user)->deleteComment($comment['id']);
- $this->assertResponseOk()->seeJsonContains(['status' => 'success']);
+ $this->actingAs($this->user)->deleteComment($commentId);
+ $this->assertResponseStatus(200);
}
private function addComment($page) {
- $comment = factory(\BookStack\Comment::class)->make();
- $url = "/ajax/page/$page->id/comment/";
+ $comment = factory(Comment::class)->make();
+ $url = "/comment/$page->id";
$request = [
'text' => $comment->text,
'html' => $comment->html
];
- $this->json('POST', $url, $request);
- $resp = $this->decodeResponseJson();
- return $resp['comment'];
-
+ $this->postJson($url, $request);
+ $comment = $page->comments()->first();
+ return $comment === null ? null : $comment->id;
}
- private function updateComment($page, $commentId) {
- $comment = factory(\BookStack\Comment::class)->make();
- $url = "/ajax/page/$page->id/comment/$commentId";
+ private function updateComment($commentId) {
+ $comment = factory(Comment::class)->make();
+ $url = "/comment/$commentId";
$request = [
'text' => $comment->text,
'html' => $comment->html
];
- return $this->json('PUT', $url, $request);
+ return $this->putJson($url, $request);
}
private function deleteComment($commentId) {
- $url = '/ajax/comment/' . $commentId;
+ $url = '/comment/' . $commentId;
return $this->json('DELETE', $url);
}
projects / bookstack / blobdiff