OXDEV-8214: Adjustments of tests and removal of Integrationtest for t…

…heme switch
OXID-eSales · Aug 9, 2024 · b0b6bf1 · b0b6bf1
1 parent 2573276
commit b0b6bf1
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 56 deletions.
diff --git a/tests/Codeception/Acceptance/NotAuthorizedAccessCest.php b/tests/Codeception/Acceptance/NotAuthorizedAccessCest.php
@@ -264,12 +264,12 @@ private function runSimplifiedAccessCheckMutation(
         return $I->grabJsonResponseAsArray();
     }
 
-    private function getLocationParameterString(string $location): ?string
+    private function getLocationParameterString(string $location): string
     {
         return match ($location) {
             'module' => 'moduleId: "testModule"',
             'theme' => 'themeId: "testTheme"',
-            default => null
+            default => ''
         };
     }
 

diff --git a/tests/Codeception/Acceptance/Theme/ThemeSwitchCest.php b/tests/Codeception/Acceptance/Theme/ThemeSwitchCest.php
@@ -31,7 +31,7 @@ public function testThemeSwitchAuthorized(AcceptanceTester $I): void
 
     public function runThemeSwitchMutation(AcceptanceTester $I): array
     {
-        $themeId = $this->getThemeId();
+        $themeId = $this->getCurrentThemeId();
 
         $I->sendGQLQuery(
             'mutation switchThemeCest{
@@ -43,7 +43,7 @@ public function runThemeSwitchMutation(AcceptanceTester $I): array
         return $I->grabJsonResponseAsArray();
     }
 
-    private function getThemeId(): string
+    private function getCurrentThemeId(): string
     {
         $shopAdapter = $this->get(ShopAdapterInterface::class);
         return $shopAdapter->getActiveThemeId();

diff --git a/tests/Integration/Infrastructure/ThemeSwitchInfrastructureTest.php b/tests/Integration/Infrastructure/ThemeSwitchInfrastructureTest.php
diff --git a/tests/Unit/Theme/Exception/ThemeActivationExceptionTest.php b/tests/Unit/Theme/Exception/ThemeActivationExceptionTest.php
@@ -18,18 +18,19 @@
 */
 class ThemeActivationExceptionTest extends TestCase
 {
-    private const THEME_NOT_ACTIVATED = "An error occurred while activating the theme.";
+    private const THEME_NOT_ACTIVATED_MESSAGE = "An error occurred while activating the theme.";
+
     public function testThemeActivationExceptionDefaultMessage()
     {
         $exception = new ThemeActivationException();
 
         $this->assertInstanceOf(ThemeActivationException::class, $exception);
-        $this->assertSame(self::THEME_NOT_ACTIVATED, $exception->getMessage());
+        $this->assertSame(self::THEME_NOT_ACTIVATED_MESSAGE, $exception->getMessage());
     }
 
     public function testThemeActivationExceptionWithMessage()
     {
-        $message = 'This is just a message';
+        $message = uniqid();
         $exception = new ThemeActivationException($message);
 
         $this->assertInstanceOf(ThemeActivationException::class, $exception);

diff --git a/tests/Unit/Theme/Infrastructure/ThemeSwitchInfrastructureTest.php b/tests/Unit/Theme/Infrastructure/ThemeSwitchInfrastructureTest.php
@@ -61,22 +61,22 @@ public function testThemeNotFoundException(): void
         $coreThemeMock->method('load')->willReturn(false);
 
         $coreThemeFactoryMock = $this->getCoreThemeFactoryMock(coreThemeMock: $coreThemeMock);
-        $sut = $this->getSut($coreThemeFactoryMock);
+        $sut = $this->getSut(coreThemeFactory: $coreThemeFactoryMock);
 
         $this->expectException(ThemeActivationException::class);
         $this->expectExceptionMessage(self::THEME_NOT_EXIST);
         $sut->switchTheme('invalidThemeId');
     }
 
     private function getSut(
-        CoreThemeFactoryInterface $coreThemeFactory = null,
+        CoreThemeFactoryInterface $coreThemeFactory,
     ): ThemeSwitchInfrastructure {
         return new ThemeSwitchInfrastructure(
-            coreThemeFactory: $coreThemeFactory ?? $this->createStub(ThemeSwitchInfrastructure::class),
+            coreThemeFactory: $coreThemeFactory,
         );
     }
 
-    private function getCoreThemeFactoryMock($coreThemeMock): CoreThemeFactoryInterface
+    private function getCoreThemeFactoryMock(Theme $coreThemeMock): CoreThemeFactoryInterface
     {
         $coreThemeFactoryMock = $this->createMock(CoreThemeFactoryInterface::class);
         $coreThemeFactoryMock->expects($this->once())