Merge pull request #15021 from snipe/fixes/removed_non_counts

Removed non-counts from allowed array
snipe · Jul 3, 2024 · f22c3cd · f22c3cd
2 parents ca57f6d + 5e15cc3
commit f22c3cd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
@@ -247,10 +247,6 @@ public function index(Request $request)
                         'jobtitle',
                         'username',
                         'employee_num',
-                        'assets',
-                        'accessories',
-                        'consumables',
-                        'licenses',
                         'groups',
                         'activated',
                         'created_at',

diff --git a/tests/Feature/Users/Api/UserSearchTest.php b/tests/Feature/Users/Api/UserSearchTest.php
@@ -144,4 +144,17 @@ public function testUsersScopedToCompanyDuringSearchWhenMultipleFullCompanySuppo
             'User index contains unexpected user from another company'
         );
     }
+
+    public function testUsersIndexWhenInvalidSortFieldIsPassed()
+    {
+        $this->markIncompleteIfSqlite('This test is not compatible with SQLite');
+
+        $this->actingAsForApi(User::factory()->viewUsers()->create())
+            ->getJson(route('api.users.index', [
+                'sort' => 'assets',
+            ]))
+            ->assertOk()
+            ->assertStatus(200)
+            ->json();
+    }
 }
diff --git a/tests/Support/CanSkipTests.php b/tests/Support/CanSkipTests.php
@@ -10,4 +10,11 @@ public function markIncompleteIfMySQL($message = 'Test skipped due to database d
             $this->markTestIncomplete($message);
         }
     }
+
+    public function markIncompleteIfSqlite($message = 'Test skipped due to database driver being sqlite.')
+    {
+        if (config('database.default') === 'sqlite') {
+            $this->markTestIncomplete($message);
+        }
+    }
 }