From 71bab2c315703833d29853a23bee90e3fe7151b7 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 28 May 2024 13:02:44 -0700 Subject: [PATCH 1/2] Improve test case --- tests/Feature/Api/Groups/GroupStoreTest.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/Feature/Api/Groups/GroupStoreTest.php b/tests/Feature/Api/Groups/GroupStoreTest.php index 65d673e7b..afa7a747d 100644 --- a/tests/Feature/Api/Groups/GroupStoreTest.php +++ b/tests/Feature/Api/Groups/GroupStoreTest.php @@ -2,6 +2,7 @@ namespace Tests\Feature\Api\Groups; +use App\Helpers\Helper; use App\Models\Group; use App\Models\User; use Tests\TestCase; @@ -49,10 +50,15 @@ class GroupStoreTest extends TestCase $this->assertNotNull($group); + $this->assertEquals( + Helper::selectedPermissionsArray(config('permissions'), config('permissions')), + $group->decodePermissions(), + 'Default group permissions were not set as expected', + ); + $this->actingAsForApi($superuser) ->getJson(route('api.groups.show', ['group' => $group])) ->assertOk(); - } public function testStoringGroupWithInvalidPermissionDropsBadPermission() From 4c78da3bbfdfa4fc6769635789e7ced037b04e5a Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 28 May 2024 13:03:09 -0700 Subject: [PATCH 2/2] Re-add json encoding of permissions --- app/Http/Controllers/Api/GroupsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php index f76d23b3a..3fa7ca48f 100644 --- a/app/Http/Controllers/Api/GroupsController.php +++ b/app/Http/Controllers/Api/GroupsController.php @@ -68,7 +68,7 @@ class GroupsController extends Controller $group->name = $request->input('name'); $group->created_by = Auth::user()->id; - $group->permissions = $request->input('permissions', $groupPermissions); + $group->permissions = json_encode($request->input('permissions', $groupPermissions)); if ($group->save()) { return response()->json(Helper::formatStandardApiResponse('success', (new GroupsTransformer)->transformGroup($group), trans('admin/groups/message.success.create')));