Fix some tests (#1450)

This commit is contained in:
pelican-vehikl 2025-06-19 15:36:50 -04:00 committed by GitHub
parent 6107524522
commit c61b6920b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions

View File

@ -34,13 +34,14 @@ class SettingsController extends ClientApiController
*/ */
public function rename(RenameServerRequest $request, Server $server): JsonResponse public function rename(RenameServerRequest $request, Server $server): JsonResponse
{ {
$originalName = $server->name;
$name = $request->input('name'); $name = $request->input('name');
$server->update(['name' => $name]); $server->update(['name' => $name]);
if ($server->wasChanged('name')) { if ($server->wasChanged('name')) {
Activity::event('server:settings.rename') Activity::event('server:settings.rename')
->property(['old' => $server->getOriginal('name'), 'new' => $name]) ->property(['old' => $originalName, 'new' => $name])
->log(); ->log();
} }
@ -56,12 +57,13 @@ class SettingsController extends ClientApiController
return new JsonResponse([], Response::HTTP_FORBIDDEN); return new JsonResponse([], Response::HTTP_FORBIDDEN);
} }
$originalDescription = $server->description;
$description = $request->input('description'); $description = $request->input('description');
$server->update(['description' => $description ?? '']); $server->update(['description' => $description ?? '']);
if ($server->wasChanged('description')) { if ($server->wasChanged('description')) {
Activity::event('server:settings.description') Activity::event('server:settings.description')
->property(['old' => $server->getOriginal('description'), 'new' => $description]) ->property(['old' => $originalDescription, 'new' => $description])
->log(); ->log();
} }

View File

@ -41,7 +41,7 @@ it('server description can be changed', function () {
expect()->toLogActivities(1) expect()->toLogActivities(1)
->and($logged->properties['old'])->toBe($originalDescription) ->and($logged->properties['old'])->toBe($originalDescription)
->and($logged->properties['new'])->toBe($newDescription) ->and($logged->properties['new'])->toBe($newDescription)
->and($server->description)->not()->toBe($originalDescription); ->and($server->description)->toBe($newDescription);
}); });
it('server description cannot be changed', function () { it('server description cannot be changed', function () {
@ -53,7 +53,7 @@ it('server description cannot be changed', function () {
->post("/api/client/servers/$server->uuid/settings/description", [ ->post("/api/client/servers/$server->uuid/settings/description", [
'description' => 'Test Description', 'description' => 'Test Description',
]) ])
->assertStatus(Response::HTTP_NO_CONTENT); ->assertStatus(Response::HTTP_FORBIDDEN);
$server = $server->refresh(); $server = $server->refresh();
expect()->toLogActivities(0) expect()->toLogActivities(0)