Skip to content

A free open source IT asset/license management system

Implement test and remove trailing comma in group column

Marcus Moore3e002cb9402c
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 254b3da4bb..ef6340c77f 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -576,12 +576,6 @@ class UsersController extends Controller
$formatter = new EscapeFormula('`');
foreach ($users as $user) {
- $user_groups = '';
-
- foreach ($user->groups as $user_group) {
- $user_groups .= $user_group->name.', ';
- }
-
$permissionstring = '';
if ($user->isSuperUser()) {
@@ -610,7 +604,7 @@ class UsersController extends Controller
$user->licenses->count(),
$user->accessories->count(),
$user->consumables->count(),
- $user_groups,
+ $user->groups->pluck('name')->implode(', '),
$permissionstring,
$user->notes,
($user->activated == '1') ? trans('general.yes') : trans('general.no'),
diff --git a/tests/Feature/Users/Ui/ExportUsersTest.php b/tests/Feature/Users/Ui/ExportUsersTest.php
index bdf951f1e5..4050c784e3 100644
--- a/tests/Feature/Users/Ui/ExportUsersTest.php
+++ b/tests/Feature/Users/Ui/ExportUsersTest.php
@@ -21,8 +21,6 @@ class ExportUsersTest extends TestCase
public function test_can_export_users_to_csv()
{
- $this->markTestIncomplete();
-
$luke = User::factory()
->forCompany(['name' => 'Test Company'])
->forManager(['first_name' => 'Ben', 'last_name' => 'Kenobi'])