X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a5e49f642b18de09cac0f2fdceacf07b0bafafe7..refs/pull/966/head:/tests/BrowserKitTest.php diff --git a/tests/BrowserKitTest.php b/tests/BrowserKitTest.php index 1eabc7417..86f61a764 100644 --- a/tests/BrowserKitTest.php +++ b/tests/BrowserKitTest.php @@ -3,7 +3,6 @@ use BookStack\Entity; use BookStack\Role; use BookStack\Services\PermissionService; -use BookStack\User; use Illuminate\Contracts\Console\Kernel; use Illuminate\Foundation\Testing\DatabaseTransactions; use Laravel\BrowserKitTesting\TestCase; @@ -13,18 +12,14 @@ abstract class BrowserKitTest extends TestCase { use DatabaseTransactions; + use SharedTestHelpers; /** * The base URL to use while testing the application. - * * @var string */ protected $baseUrl = 'http://localhost'; - // Local user instances - private $admin; - private $editor; - public function tearDown() { \DB::disconnect(); @@ -45,38 +40,6 @@ abstract class BrowserKitTest extends TestCase return $app; } - /** - * Set the current user context to be an admin. - * @return $this - */ - public function asAdmin() - { - return $this->actingAs($this->getAdmin()); - } - - /** - * Get the current admin user. - * @return mixed - */ - public function getAdmin() { - if($this->admin === null) { - $adminRole = Role::getSystemRole('admin'); - $this->admin = $adminRole->users->first(); - } - return $this->admin; - } - - /** - * Set the current editor context to be an editor. - * @return $this - */ - public function asEditor() - { - if ($this->editor === null) { - $this->editor = $this->getEditor(); - } - return $this->actingAs($this->editor); - } /** * Get a user that's not a system user such as the guest user. @@ -129,28 +92,6 @@ abstract class BrowserKitTest extends TestCase $restrictionService->buildJointPermissionsForEntity($entity); } - /** - * Get an instance of a user with 'editor' permissions - * @param array $attributes - * @return mixed - */ - protected function getEditor($attributes = []) - { - $user = \BookStack\Role::getRole('editor')->users()->first(); - if (!empty($attributes)) $user->forceFill($attributes)->save(); - return $user; - } - - /** - * Get an instance of a user with 'viewer' permissions - * @return mixed - */ - protected function getViewer() - { - $user = \BookStack\Role::getRole('viewer')->users()->first(); - if (!empty($attributes)) $user->forceFill($attributes)->save(); - return $user; - } /** * Quick way to create a new user without any permissions