Updated code view block line highlighting to only show on focus

[bookstack] / tests / User / UserSearchTest.php

diff --git a/tests/User/UserSearchTest.php b/tests/User/UserSearchTest.php
index 243af1186a2be9e2f5b1e7aceffbc66a475c918a..1b3ca8a35148e8bd22e3631857663fa4fc5298e6 100644 (file)
--- a/tests/User/UserSearchTest.php
+++ b/tests/User/UserSearchTest.php
@@ -9,8 +9,8 @@ class UserSearchTest extends TestCase
 {
     public function test_select_search_matches_by_name()
     {
 {
     public function test_select_search_matches_by_name()
     {

-        $viewer = $this->getViewer();
-        $admin = $this->getAdmin();
+        $viewer = $this->users->viewer();
+        $admin = $this->users->admin();

         $resp = $this->actingAs($admin)->get('/search/users/select?search=' . urlencode($viewer->name));
 
         $resp->assertOk();
         $resp = $this->actingAs($admin)->get('/search/users/select?search=' . urlencode($viewer->name));
 
         $resp->assertOk();


@@ -30,8 +30,8 @@ class UserSearchTest extends TestCase
 
     public function test_select_search_does_not_match_by_email()
     {
 
     public function test_select_search_does_not_match_by_email()
     {

-        $viewer = $this->getViewer();
-        $editor = $this->getEditor();
+        $viewer = $this->users->viewer();
+        $editor = $this->users->editor();

         $resp = $this->actingAs($editor)->get('/search/users/select?search=' . urlencode($viewer->email));
 
         $resp->assertDontSee($viewer->name);
         $resp = $this->actingAs($editor)->get('/search/users/select?search=' . urlencode($viewer->email));
 
         $resp->assertDontSee($viewer->name);


@@ -40,13 +40,13 @@ class UserSearchTest extends TestCase
     public function test_select_requires_right_permission()
     {
         $permissions = ['users-manage', 'restrictions-manage-own', 'restrictions-manage-all'];
     public function test_select_requires_right_permission()
     {
         $permissions = ['users-manage', 'restrictions-manage-own', 'restrictions-manage-all'];

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

 
         foreach ($permissions as $permission) {
             $resp = $this->actingAs($user)->get('/search/users/select?search=a');
             $this->assertPermissionError($resp);
 
 
         foreach ($permissions as $permission) {
             $resp = $this->actingAs($user)->get('/search/users/select?search=a');
             $this->assertPermissionError($resp);
 

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

             $resp = $this->actingAs($user)->get('/search/users/select?search=a');
             $resp->assertOk();
             $user->roles()->delete();
             $resp = $this->actingAs($user)->get('/search/users/select?search=a');
             $resp->assertOk();
             $user->roles()->delete();


@@ -58,7 +58,7 @@ class UserSearchTest extends TestCase
     {
         $this->setSettings(['app-public' => true]);
         $defaultUser = User::getDefault();
     {
         $this->setSettings(['app-public' => true]);
         $defaultUser = User::getDefault();

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

 
         $resp = $this->get('/search/users/select?search=a');
         $this->assertPermissionError($resp);
 
         $resp = $this->get('/search/users/select?search=a');
         $this->assertPermissionError($resp);