DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-26 21:21:18 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2024-05-29 00:26:37 +01:00
parent a5d0a21757 29454f7288
commit da1c4c23e6
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/GroupsController.php
View file

@ -68,7 +68,7 @@ class GroupsController extends Controller
$group->name = $request->input('name'); $group->name = $request->input('name');
$group->created_by = Auth::user()->id; $group->created_by = Auth::user()->id;
$group->permissions = $request->input('permissions', $groupPermissions); $group->permissions = json_encode($request->input('permissions', $groupPermissions));
if ($group->save()) { if ($group->save()) {
return response()->json(Helper::formatStandardApiResponse('success', (new GroupsTransformer)->transformGroup($group), trans('admin/groups/message.success.create'))); return response()->json(Helper::formatStandardApiResponse('success', (new GroupsTransformer)->transformGroup($group), trans('admin/groups/message.success.create')));

8
tests/Feature/Api/Groups/GroupStoreTest.php
View file

@ -2,6 +2,7 @@
namespace Tests\Feature\Api\Groups; namespace Tests\Feature\Api\Groups;
use App\Helpers\Helper;
use App\Models\Group; use App\Models\Group;
use App\Models\User; use App\Models\User;
use Tests\TestCase; use Tests\TestCase;
@ -49,10 +50,15 @@ class GroupStoreTest extends TestCase
$this->assertNotNull($group); $this->assertNotNull($group);
$this->assertEquals(
Helper::selectedPermissionsArray(config('permissions'), config('permissions')),
$group->decodePermissions(),
'Default group permissions were not set as expected',
);
$this->actingAsForApi($superuser) $this->actingAsForApi($superuser)
->getJson(route('api.groups.show', ['group' => $group])) ->getJson(route('api.groups.show', ['group' => $group]))
->assertOk(); ->assertOk();
} }
public function testStoringGroupWithInvalidPermissionDropsBadPermission() public function testStoringGroupWithInvalidPermissionDropsBadPermission()