Fix tests

pimcore · Apr 22, 2024 · c1a2a7a · c1a2a7a
1 parent c5e1f86
commit c1a2a7a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/EventSubscriber/ApiExceptionSubscriber.php b/src/EventSubscriber/ApiExceptionSubscriber.php
@@ -21,6 +21,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
+use Throwable;
 
 /**
  * @internal
@@ -42,7 +43,7 @@ public function onKernelException(ExceptionEvent $event): void
         if(!$exception instanceof ApiExceptionInterface && !$this->isStudioApiCall($request->getPathInfo())) {
             return;
         }
-
+        /** @var ApiExceptionInterface $exception */
         $response = new JsonResponse(
             [
                 'message' => $exception->getMessage(),

diff --git a/tests/Unit/Service/Security/SecurityServiceTest.php b/tests/Unit/Service/Security/SecurityServiceTest.php
@@ -19,6 +19,7 @@
 use Codeception\Test\Unit;
 use Exception;
 use Pimcore\Bundle\StaticResolverBundle\Models\Tool\TmpStoreResolverInterface;
+use Pimcore\Bundle\StudioApiBundle\Exception\AccessDeniedException;
 use Pimcore\Bundle\StudioApiBundle\Request\Credentials;
 use Pimcore\Bundle\StudioApiBundle\Service\SecurityService;
 use Pimcore\Bundle\StudioApiBundle\Service\SecurityServiceInterface;
@@ -49,7 +50,8 @@ public function testInvalidPassword(): void
     {
         $securityService = $this->mockSecurityService(false);
 
-        $this->expectExceptionMessage('Invalid credentials');
+        $this->expectException(AccessDeniedException::class);
+        $this->expectExceptionMessage('Bad credentials');
         $securityService->authenticateUser(new Credentials('test', 'test'));
     }
 
@@ -60,7 +62,8 @@ public function testUserNotFound(): void
     {
         $securityService = $this->mockSecurityService(false, false);
 
-        $this->expectExceptionMessage('Invalid credentials');
+        $this->expectException(AccessDeniedException::class);
+        $this->expectExceptionMessage('Bad credentials');
         $securityService->authenticateUser(new Credentials('test', 'test'));
     }