From c61b6920b9c378f0b1a4b91bab64fe266840ba4f Mon Sep 17 00:00:00 2001
From: pelican-vehikl <pelican.vehikl@gmail.com>
Date: Thu, 19 Jun 2025 15:36:50 -0400
Subject: [PATCH] Fix some tests (#1450)

---
 .../Controllers/Api/Client/Servers/SettingsController.php   | 6 ++++--
 tests/Feature/SettingsControllerTest.php                    | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/Client/Servers/SettingsController.php b/app/Http/Controllers/Api/Client/Servers/SettingsController.php
index 6bc765a08..2a2577c80 100644
--- a/app/Http/Controllers/Api/Client/Servers/SettingsController.php
+++ b/app/Http/Controllers/Api/Client/Servers/SettingsController.php
@@ -34,13 +34,14 @@ class SettingsController extends ClientApiController
      */
     public function rename(RenameServerRequest $request, Server $server): JsonResponse
     {
+        $originalName = $server->name;
         $name = $request->input('name');
 
         $server->update(['name' => $name]);
 
         if ($server->wasChanged('name')) {
             Activity::event('server:settings.rename')
-                ->property(['old' => $server->getOriginal('name'), 'new' => $name])
+                ->property(['old' => $originalName, 'new' => $name])
                 ->log();
         }
 
@@ -56,12 +57,13 @@ class SettingsController extends ClientApiController
             return new JsonResponse([], Response::HTTP_FORBIDDEN);
         }
 
+        $originalDescription = $server->description;
         $description = $request->input('description');
         $server->update(['description' => $description ?? '']);
 
         if ($server->wasChanged('description')) {
             Activity::event('server:settings.description')
-                ->property(['old' => $server->getOriginal('description'), 'new' => $description])
+                ->property(['old' => $originalDescription, 'new' => $description])
                 ->log();
         }
 
diff --git a/tests/Feature/SettingsControllerTest.php b/tests/Feature/SettingsControllerTest.php
index c1850489e..769ffa18f 100644
--- a/tests/Feature/SettingsControllerTest.php
+++ b/tests/Feature/SettingsControllerTest.php
@@ -41,7 +41,7 @@ it('server description can be changed', function () {
     expect()->toLogActivities(1)
         ->and($logged->properties['old'])->toBe($originalDescription)
         ->and($logged->properties['new'])->toBe($newDescription)
-        ->and($server->description)->not()->toBe($originalDescription);
+        ->and($server->description)->toBe($newDescription);
 });
 
 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", [
             'description' => 'Test Description',
         ])
-        ->assertStatus(Response::HTTP_NO_CONTENT);
+        ->assertStatus(Response::HTTP_FORBIDDEN);
 
     $server = $server->refresh();
     expect()->toLogActivities(0)