fix: tests on exception

ForestAdmin · Nov 5, 2024 · c2d972e · c2d972e
1 parent 8d14ba9
commit c2d972e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/packages/Agent/src/Http/Traits/ErrorHandling.php b/packages/Agent/src/Http/Traits/ErrorHandling.php
@@ -22,19 +22,19 @@ public function getErrorStatus(Throwable $error): int
 
     public function getErrorMessage(Throwable $error): string
     {
-        if ($error instanceof HttpException ||
-            is_subclass_of($error, HttpException::class) ||
-            $error instanceof ForestException) {
-            return $error->getMessage();
-        }
-
         if ($customizer = AgentFactory::get('customizeErrorMessage')) {
             $message = $customizer($error);
             if ($message) {
                 return $message;
             }
         }
 
+        if ($error instanceof HttpException ||
+            is_subclass_of($error, HttpException::class) ||
+            $error instanceof ForestException) {
+            return $error->getMessage();
+        }
+
         return 'Unexpected error';
     }
 

diff --git a/tests/Agent/Http/ForestControllerTest.php b/tests/Agent/Http/ForestControllerTest.php
@@ -6,7 +6,6 @@
 use ForestAdmin\AgentPHP\Agent\Http\ForestController;
 use ForestAdmin\AgentPHP\Agent\Http\Request;
 use ForestAdmin\AgentPHP\DatasourceToolkit\Datasource;
-use ForestAdmin\AgentPHP\DatasourceToolkit\Exceptions\ForestException;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -59,7 +58,7 @@
             ->getMock();
         $forestControllerMock->expects($this->once())
             ->method('getClosure')
-            ->willReturn(fn () => throw new ForestException());
+            ->willReturn(fn () => throw new \Exception());
 
         $result = $forestControllerMock->__invoke($request);
 
@@ -72,7 +71,7 @@
                 [
                     'errors' => [
                         [
-                            'name'   => 'ForestException',
+                            'name'   => 'Exception',
                             'detail' => 'Unexpected error',
                             'status' => 500,
                         ],

diff --git a/tests/Agent/Http/Traits/ErrorHandlingTest.php b/tests/Agent/Http/Traits/ErrorHandlingTest.php
@@ -67,5 +67,5 @@
     $this->buildAgent(new Datasource());
     $trait = $this->getObjectForTrait(ErrorHandling::class);
 
-    expect($trait->getErrorMessage(new ForestException('test')))->toEqual('Unexpected error');
+    expect($trait->getErrorMessage(new \Exception('test')))->toEqual('Unexpected error');
 });