Extract session management in tests

Sylius · Oct 5, 2022 · 1b5e74d · 1b5e74d
1 parent 4292d52
commit 1b5e74d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 63 deletions.
diff --git a/symfony.lock b/symfony.lock
@@ -718,18 +718,6 @@
     "symfony/intl": {
         "version": "v4.1.3"
     },
-    "symfony/mailer": {
-        "version": "6.1",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "main",
-            "version": "4.3",
-            "ref": "97a61eabb351d7f6cb7702039bcfe07fe9d7e03c"
-        },
-        "files": [
-            "config/packages/mailer.yaml"
-        ]
-    },
     "symfony/messenger": {
         "version": "4.3",
         "recipe": {

diff --git a/tests/Controller/AdminProductAjaxTest.php b/tests/Controller/AdminProductAjaxTest.php
@@ -21,7 +21,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
-final class AdminProductAjaxTest extends JsonApiTestCase
+final class AdminProductAjaxTest extends SessionAwareAjaxTest
 {
     /**
      * @test
@@ -81,19 +81,4 @@ private function authenticateAdminUser(): void
         $cookie = new Cookie($session->getName(), $session->getId());
         $this->client->getCookieJar()->set($cookie);
     }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $requestStack = self::$kernel->getContainer()->get('request_stack');
-        try {
-            $requestStack->getSession();
-        } catch (SessionNotFoundException) {
-            $session = self::$kernel->getContainer()->get('session_factory.public')->createSession();
-            $request = new Request();
-            $request->setSession($session);
-            $requestStack->push($request);
-        }
-    }
 }
diff --git a/tests/Controller/AdminProductVariantAjaxTest.php b/tests/Controller/AdminProductVariantAjaxTest.php
@@ -20,7 +20,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
-final class AdminProductVariantAjaxTest extends JsonApiTestCase
+final class AdminProductVariantAjaxTest extends SessionAwareAjaxTest
 {
     /** @test */
     public function it_denies_access_to_product_variants_for_not_authenticated_user(): void
@@ -99,19 +99,4 @@ private function authenticateAdminUser(): void
         $cookie = new Cookie($session->getName(), $session->getId());
         $this->client->getCookieJar()->set($cookie);
     }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $requestStack = self::$kernel->getContainer()->get('request_stack');
-        try {
-            $requestStack->getSession();
-        } catch (SessionNotFoundException) {
-            $session = self::$kernel->getContainer()->get('session_factory.public')->createSession();
-            $request = new Request();
-            $request->setSession($session);
-            $requestStack->push($request);
-        }
-    }
 }
diff --git a/tests/Controller/AdminTaxonAjaxTest.php b/tests/Controller/AdminTaxonAjaxTest.php
@@ -13,15 +13,12 @@
 
 namespace Sylius\Tests\Controller;
 
-use ApiTestCase\JsonApiTestCase;
 use PHPUnit\Framework\Assert;
 use Symfony\Component\BrowserKit\Cookie;
-use Symfony\Component\HttpFoundation\Exception\SessionNotFoundException;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
-final class AdminTaxonAjaxTest extends JsonApiTestCase
+final class AdminTaxonAjaxTest extends SessionAwareAjaxTest
 {
     /** @test */
     public function it_denies_access_to_taxons_for_not_authenticated_user(): void
@@ -106,19 +103,4 @@ private function authenticateAdminUser(): void
         $cookie = new Cookie($session->getName(), $session->getId());
         $this->client->getCookieJar()->set($cookie);
     }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $requestStack = self::$kernel->getContainer()->get('request_stack');
-        try {
-            $requestStack->getSession();
-        } catch (SessionNotFoundException) {
-            $session = self::$kernel->getContainer()->get('session_factory.public')->createSession();
-            $request = new Request();
-            $request->setSession($session);
-            $requestStack->push($request);
-        }
-    }
 }
diff --git a/tests/Controller/SessionAwareAjaxTest.php b/tests/Controller/SessionAwareAjaxTest.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Tests\Controller;
+
+use ApiTestCase\JsonApiTestCase;
+use Symfony\Component\HttpFoundation\Exception\SessionNotFoundException;
+use Symfony\Component\HttpFoundation\Request;
+
+abstract class SessionAwareAjaxTest extends JsonApiTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $requestStack = self::$kernel->getContainer()->get('request_stack');
+        try {
+            $requestStack->getSession();
+        } catch (SessionNotFoundException) {
+            $session = self::$kernel->getContainer()->get('session_factory.public')->createSession();
+            $request = new Request();
+            $request->setSession($session);
+            $requestStack->push($request);
+        }
+    }
+}