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

index 99080d354c4c239fae8261e8de53d06681b7e7fe..8398d08281a12d4e0239ae1531f4817d86b0c1a5 100644 (file)

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

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

@@ -1,11 +1,14 @@

<?php namespace Tests\Permissions;

-use BookStack\Entities\Bookshelf;

-use BookStack\Entities\Page;

-use BookStack\Auth\Permissions\PermissionsRepo;

+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 Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

use Tests\BrowserKitTest;

class RolesTest extends BrowserKitTest

use Tests\BrowserKitTest;

class RolesTest extends BrowserKitTest

@@ -25,7 +28,7 @@ class RolesTest extends BrowserKitTest

public function test_cannot_delete_admin_role()

{

public function test_cannot_delete_admin_role()

{

- $adminRole = \BookStack\Auth\Role::getRole('admin');

+ $adminRole = Role::getRole('admin');

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

$this->asAdmin()->visit($deletePageUrl)

->press('Confirm')

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

$this->asAdmin()->visit($deletePageUrl)

->press('Confirm')

@@ -59,7 +62,7 @@ class RolesTest extends BrowserKitTest

->type('Test Role', 'display_name')

->type('A little test description', 'description')

->press('Save Role')

->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')

->seePageIs('/settings/roles');

// Updating

$this->asAdmin()->visit('/settings/roles')

@@ -67,7 +70,7 @@ class RolesTest extends BrowserKitTest

->click($testRoleName)

->type($testRoleUpdateName, '#display_name')

->press('Save Role')

->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')

->seePageIs('/settings/roles');

// Deleting

$this->asAdmin()->visit('/settings/roles')

@@ -101,6 +104,25 @@ class RolesTest extends BrowserKitTest

$this->see('This user is the only user assigned to the administrator role');

}

$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')

public function test_manage_user_permission()

{

$this->actingAs($this->user)->visit('/settings/users')

@@ -178,7 +200,7 @@ class RolesTest extends BrowserKitTest

public function test_restrictions_manage_all_permission()

{

public function test_restrictions_manage_all_permission()

{

- $page = \BookStack\Entities\Page::take(1)->get()->first();

+ $page = Page::take(1)->get()->first();

$this->actingAs($this->user)->visit($page->getUrl())

->dontSee('Permissions')

->visit($page->getUrl() . '/permissions')

$this->actingAs($this->user)->visit($page->getUrl())

->dontSee('Permissions')

->visit($page->getUrl() . '/permissions')

@@ -192,17 +214,25 @@ class RolesTest extends BrowserKitTest

public function test_restrictions_manage_own_permission()

{

public function test_restrictions_manage_own_permission()

{

- $otherUsersPage = \BookStack\Entities\Page::first();

+ $otherUsersPage = Page::first();

$content = $this->createEntityChainBelongingToUser($this->user);

+ // Set a different creator on the page we're checking to ensure

+ // that the owner fields are checked

+ $page = $content['page']; /** @var Page $page */

+ $page->created_by = $otherUsersPage->id;

+ $page->owned_by = $this->user->id;

+ $page->save();

// Check can't restrict other's content

$this->actingAs($this->user)->visit($otherUsersPage->getUrl())

->dontSee('Permissions')

->visit($otherUsersPage->getUrl() . '/permissions')

->seePageIs('/');

// Check can't restrict own content

// Check can't restrict other's content

$this->actingAs($this->user)->visit($otherUsersPage->getUrl())

->dontSee('Permissions')

->visit($otherUsersPage->getUrl() . '/permissions')

->seePageIs('/');

// Check can't restrict own content

- $this->actingAs($this->user)->visit($content['page']->getUrl())

+ $this->actingAs($this->user)->visit($page->getUrl())

->dontSee('Permissions')

- ->visit($content['page']->getUrl() . '/permissions')

+ ->visit($page->getUrl() . '/permissions')

->seePageIs('/');

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

->seePageIs('/');

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

@@ -213,10 +243,10 @@ class RolesTest extends BrowserKitTest

->visit($otherUsersPage->getUrl() . '/permissions')

->seePageIs('/');

// Check can restrict own content

->visit($otherUsersPage->getUrl() . '/permissions')

->seePageIs('/');

// Check can restrict own content

- $this->actingAs($this->user)->visit($content['page']->getUrl())

+ $this->actingAs($this->user)->visit($page->getUrl())

->see('Permissions')

->click('Permissions')

->see('Permissions')

->click('Permissions')

- ->seePageIs($content['page']->getUrl() . '/permissions');

+ ->seePageIs($page->getUrl() . '/permissions');

}

/**

}

/**

@@ -267,7 +297,7 @@ class RolesTest extends BrowserKitTest

{

$otherShelf = Bookshelf::first();

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

{

$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();

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

$this->regenEntityPermissions($ownShelf);

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

$this->regenEntityPermissions($ownShelf);

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

@@ -284,7 +314,7 @@ class RolesTest extends BrowserKitTest

public function test_bookshelves_edit_all_permission()

{

public function test_bookshelves_edit_all_permission()

{

- $otherShelf = \BookStack\Entities\Bookshelf::first();

+ $otherShelf = Bookshelf::first();

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

$otherShelf->getUrl('/edit')

], [

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

$otherShelf->getUrl('/edit')

], [

@@ -295,9 +325,9 @@ class RolesTest extends BrowserKitTest

public function test_bookshelves_delete_own_permission()

{

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

public function test_bookshelves_delete_own_permission()

{

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

- $otherShelf = \BookStack\Entities\Bookshelf::first();

+ $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();

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

$this->regenEntityPermissions($ownShelf);

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

$this->regenEntityPermissions($ownShelf);

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

@@ -319,7 +349,7 @@ class RolesTest extends BrowserKitTest

public function test_bookshelves_delete_all_permission()

{

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

public function test_bookshelves_delete_all_permission()

{

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

- $otherShelf = \BookStack\Entities\Bookshelf::first();

+ $otherShelf = Bookshelf::first();

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

$otherShelf->getUrl('/delete')

], [

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

$otherShelf->getUrl('/delete')

], [

@@ -349,7 +379,7 @@ class RolesTest extends BrowserKitTest

public function test_books_edit_own_permission()

{

public function test_books_edit_own_permission()

{

- $otherBook = \BookStack\Entities\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'

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

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

$ownBook->getUrl() . '/edit'

@@ -365,7 +395,7 @@ class RolesTest extends BrowserKitTest

public function test_books_edit_all_permission()

{

public function test_books_edit_all_permission()

{

- $otherBook = \BookStack\Entities\Book::take(1)->get()->first();

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

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

$otherBook->getUrl() . '/edit'

], [

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

$otherBook->getUrl() . '/edit'

], [

@@ -376,7 +406,7 @@ class RolesTest extends BrowserKitTest

public function test_books_delete_own_permission()

{

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

public function test_books_delete_own_permission()

{

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

- $otherBook = \BookStack\Entities\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'

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

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

$ownBook->getUrl() . '/delete'

@@ -397,7 +427,7 @@ class RolesTest extends BrowserKitTest

public function test_books_delete_all_permission()

{

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

public function test_books_delete_all_permission()

{

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

- $otherBook = \BookStack\Entities\Book::take(1)->get()->first();

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

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

$otherBook->getUrl() . '/delete'

], [

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

$otherBook->getUrl() . '/delete'

], [

@@ -412,7 +442,7 @@ class RolesTest extends BrowserKitTest

public function test_chapter_create_own_permissions()

{

public function test_chapter_create_own_permissions()

{

- $book = \BookStack\Entities\Book::take(1)->get()->first();

+ $book = Book::take(1)->get()->first();

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

$this->checkAccessPermission('chapter-create-own', [

$ownBook->getUrl('/create-chapter')

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

$this->checkAccessPermission('chapter-create-own', [

$ownBook->getUrl('/create-chapter')

@@ -434,7 +464,7 @@ class RolesTest extends BrowserKitTest

public function test_chapter_create_all_permissions()

{

public function test_chapter_create_all_permissions()

{

- $book = \BookStack\Entities\Book::take(1)->get()->first();

+ $book = Book::take(1)->get()->first();

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

$book->getUrl('/create-chapter')

], [

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

$book->getUrl('/create-chapter')

], [

@@ -450,7 +480,7 @@ class RolesTest extends BrowserKitTest

public function test_chapter_edit_own_permission()

{

public function test_chapter_edit_own_permission()

{

- $otherChapter = \BookStack\Entities\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'

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

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

$ownChapter->getUrl() . '/edit'

@@ -466,7 +496,7 @@ class RolesTest extends BrowserKitTest

public function test_chapter_edit_all_permission()

{

public function test_chapter_edit_all_permission()

{

- $otherChapter = \BookStack\Entities\Chapter::take(1)->get()->first();

+ $otherChapter = Chapter::take(1)->get()->first();

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

$otherChapter->getUrl() . '/edit'

], [

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

$otherChapter->getUrl() . '/edit'

], [

@@ -477,7 +507,7 @@ class RolesTest extends BrowserKitTest

public function test_chapter_delete_own_permission()

{

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

public function test_chapter_delete_own_permission()

{

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

- $otherChapter = \BookStack\Entities\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'

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

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

$ownChapter->getUrl() . '/delete'

@@ -499,7 +529,7 @@ class RolesTest extends BrowserKitTest

public function test_chapter_delete_all_permission()

{

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

public function test_chapter_delete_all_permission()

{

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

- $otherChapter = \BookStack\Entities\Chapter::take(1)->get()->first();

+ $otherChapter = Chapter::take(1)->get()->first();

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

$otherChapter->getUrl() . '/delete'

], [

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

$otherChapter->getUrl() . '/delete'

], [

@@ -515,8 +545,8 @@ class RolesTest extends BrowserKitTest

public function test_page_create_own_permissions()

{

public function test_page_create_own_permissions()

{

- $book = \BookStack\Entities\Book::first();

- $chapter = \BookStack\Entities\Chapter::first();

+ $book = Book::first();

+ $chapter = Chapter::first();

$entities = $this->createEntityChainBelongingToUser($this->user);

$ownBook = $entities['book'];

$entities = $this->createEntityChainBelongingToUser($this->user);

$ownBook = $entities['book'];

@@ -540,7 +570,7 @@ class RolesTest extends BrowserKitTest

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

$this->actingAs($this->user)->visit($url);

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

$this->actingAs($this->user)->visit($url);

- $expectedUrl = \BookStack\Entities\Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();

+ $expectedUrl = Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();

$this->seePageIs($expectedUrl);

}

$this->seePageIs($expectedUrl);

}

@@ -562,8 +592,8 @@ class RolesTest extends BrowserKitTest

public function test_page_create_all_permissions()

{

public function test_page_create_all_permissions()

{

- $book = \BookStack\Entities\Book::take(1)->get()->first();

- $chapter = \BookStack\Entities\Chapter::take(1)->get()->first();

+ $book = Book::take(1)->get()->first();

+ $chapter = Chapter::take(1)->get()->first();

$baseUrl = $book->getUrl() . '/page';

$createUrl = $book->getUrl('/create-page');

$baseUrl = $book->getUrl() . '/page';

$createUrl = $book->getUrl('/create-page');

@@ -584,7 +614,7 @@ class RolesTest extends BrowserKitTest

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

$this->actingAs($this->user)->visit($url);

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

$this->actingAs($this->user)->visit($url);

- $expectedUrl = \BookStack\Entities\Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();

+ $expectedUrl = Page::where('draft', '=', true)->orderBy('id', 'desc')->first()->getUrl();

$this->seePageIs($expectedUrl);

}

$this->seePageIs($expectedUrl);

}

@@ -603,7 +633,7 @@ class RolesTest extends BrowserKitTest

public function test_page_edit_own_permission()

{

public function test_page_edit_own_permission()

{

- $otherPage = \BookStack\Entities\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'

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

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

$ownPage->getUrl() . '/edit'

@@ -619,7 +649,7 @@ class RolesTest extends BrowserKitTest

public function test_page_edit_all_permission()

{

public function test_page_edit_all_permission()

{

- $otherPage = \BookStack\Entities\Page::take(1)->get()->first();

+ $otherPage = Page::take(1)->get()->first();

$this->checkAccessPermission('page-update-all', [

$otherPage->getUrl() . '/edit'

], [

$this->checkAccessPermission('page-update-all', [

$otherPage->getUrl() . '/edit'

], [

@@ -630,7 +660,7 @@ class RolesTest extends BrowserKitTest

public function test_page_delete_own_permission()

{

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

public function test_page_delete_own_permission()

{

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

- $otherPage = \BookStack\Entities\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 = $this->createEntityChainBelongingToUser($this->user)['page'];

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

$ownPage->getUrl() . '/delete'

@@ -652,7 +682,7 @@ class RolesTest extends BrowserKitTest

public function test_page_delete_all_permission()

{

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

public function test_page_delete_all_permission()

{

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

- $otherPage = \BookStack\Entities\Page::take(1)->get()->first();

+ $otherPage = Page::take(1)->get()->first();

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

$otherPage->getUrl() . '/delete'

], [

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

$otherPage->getUrl() . '/delete'

], [

@@ -668,10 +698,12 @@ class RolesTest extends BrowserKitTest

public function test_public_role_visible_in_user_edit_screen()

{

public function test_public_role_visible_in_user_edit_screen()

{

- $user = \BookStack\Auth\User::first();

+ $user = User::first();

+ $adminRole = Role::getSystemRole('admin');

+ $publicRole = Role::getSystemRole('public');

$this->asAdmin()->visit('/settings/users/' . $user->id)

- ->seeElement('[name="roles[admin]"]')

- ->seeElement('[name="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_role_listing()

@@ -684,9 +716,8 @@ class RolesTest extends BrowserKitTest

public function test_public_role_visible_in_default_role_setting()

{

$this->asAdmin()->visit('/settings')

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()

}

public function test_public_role_not_deleteable()

@@ -703,8 +734,8 @@ class RolesTest extends BrowserKitTest

public function test_image_delete_own_permission()

{

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

public function test_image_delete_own_permission()

{

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

- $page = \BookStack\Entities\Page::first();

- $image = factory(\BookStack\Uploads\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->actingAs($this->user)->json('delete', '/images/' . $image->id)

->seeStatusCode(403);

@@ -720,8 +751,8 @@ class RolesTest extends BrowserKitTest

{

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

$admin = $this->getAdmin();

{

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

$admin = $this->getAdmin();

- $page = \BookStack\Entities\Page::first();

- $image = factory(\BookStack\Uploads\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);

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

->seeStatusCode(403);

@@ -742,7 +773,7 @@ class RolesTest extends BrowserKitTest

{

// To cover issue fixed in f99c8ff99aee9beb8c692f36d4b84dc6e651e50a.

$page = Page::first();

{

// To cover issue fixed in f99c8ff99aee9beb8c692f36d4b84dc6e651e50a.

$page = Page::first();

- $viewerRole = \BookStack\Auth\Role::getRole('viewer');

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

$viewer = $this->getViewer();

$this->actingAs($viewer)->visit($page->getUrl())->assertResponseStatus(200);

$viewer = $this->getViewer();

$this->actingAs($viewer)->visit($page->getUrl())->assertResponseStatus(200);

@@ -760,14 +791,14 @@ class RolesTest extends BrowserKitTest

{

$admin = $this->getAdmin();

// Book links

{

$admin = $this->getAdmin();

// Book links

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

+ $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

$this->updateEntityPermissions($book);

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

->dontSee('Create a new page')

->dontSee('Add a chapter');

// Chapter links

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

+ $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')

$this->updateEntityPermissions($chapter);

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

->dontSee('Create a new page')

@@ -851,8 +882,8 @@ class RolesTest extends BrowserKitTest

}

private function addComment($page) {

}

private function addComment($page) {

- $comment = factory(\BookStack\Actions\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

$request = [

'text' => $comment->text,

'html' => $comment->html

@@ -864,8 +895,8 @@ class RolesTest extends BrowserKitTest

}

private function updateComment($commentId) {

}

private function updateComment($commentId) {

- $comment = factory(\BookStack\Actions\Comment::class)->make();

- $url = "/ajax/comment/$commentId";

+ $comment = factory(Comment::class)->make();

+ $url = "/comment/$commentId";

$request = [

'text' => $comment->text,

'html' => $comment->html

$request = [

'text' => $comment->text,

'html' => $comment->html

@@ -875,7 +906,7 @@ class RolesTest extends BrowserKitTest

}

private function deleteComment($commentId) {

}

private function deleteComment($commentId) {

- $url = '/ajax/comment/' . $commentId;

+ $url = '/comment/' . $commentId;

return $this->json('DELETE', $url);

}

return $this->json('DELETE', $url);

}