test: update tests

codeigniter4 · Feb 5, 2023 · dc138c2 · dc138c2
1 parent dc47df7
commit dc138c2
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 25 deletions.
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
@@ -542,17 +542,25 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
             'negotiateLocale'  => false,
             'supportedLocales' => ['en'],
             'CSPEnabled'       => false,
-            'cookiePrefix'     => '',
-            'cookieDomain'     => '',
-            'cookiePath'       => '/',
-            'cookieSecure'     => false,
-            'cookieHTTPOnly'   => false,
             'proxyIPs'         => [],
-            'cookieSameSite'   => 'Lax',
         ] as $key => $value) {
             $config->{$key} = $value;
         }
 
+        $cookie = new Cookie();
+
+        foreach ([
+            'prefix'   => '',
+            'domain'   => '',
+            'path'     => '/',
+            'secure'   => false,
+            'httponly' => false,
+            'samesite' => 'Lax',
+        ] as $key => $value) {
+            $cookie->{$key} = $value;
+        }
+        Factories::injectMock('config', 'Cookie', $cookie);
+
         $request  = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
         $response = new MockResponse($config);
 

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter;
 
 use CodeIgniter\Config\BaseService;
+use CodeIgniter\Config\Factories;
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
@@ -28,6 +29,7 @@
 use CodeIgniter\Test\Mock\MockSession;
 use CodeIgniter\Test\TestLogger;
 use Config\App;
+use Config\Cookie;
 use Config\Logger;
 use Config\Modules;
 use Config\Services;
@@ -511,6 +513,8 @@ public function testSlashItemThrowsErrorOnNonStringableItem()
 
     protected function injectSessionMock()
     {
+        $appConfig = new App();
+
         $defaults = [
             'sessionDriver'            => FileHandler::class,
             'sessionCookieName'        => 'ci_session',
@@ -519,19 +523,25 @@ protected function injectSessionMock()
             'sessionMatchIP'           => false,
             'sessionTimeToUpdate'      => 300,
             'sessionRegenerateDestroy' => false,
-            'cookieDomain'             => '',
-            'cookiePrefix'             => '',
-            'cookiePath'               => '/',
-            'cookieSecure'             => false,
-            'cookieSameSite'           => 'Lax',
         ];
 
-        $appConfig = new App();
-
         foreach ($defaults as $key => $config) {
             $appConfig->{$key} = $config;
         }
 
+        $cookie = new Cookie();
+
+        foreach ([
+            'prefix'   => '',
+            'domain'   => '',
+            'path'     => '/',
+            'secure'   => false,
+            'samesite' => 'Lax',
+        ] as $key => $value) {
+            $cookie->{$key} = $value;
+        }
+        Factories::injectMock('config', 'Cookie', $cookie);
+
         $session = new MockSession(new FileHandler($appConfig, '127.0.0.1'), $appConfig);
         $session->setLogger(new TestLogger(new Logger()));
         BaseService::injectMock('session', $session);

diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
@@ -26,6 +26,7 @@
 use CodeIgniter\Test\Mock\MockSession;
 use CodeIgniter\Test\TestLogger;
 use Config\App as AppConfig;
+use Config\Cookie;
 use Config\Logger as LoggerConfig;
 use Config\Security as SecurityConfig;
 
@@ -75,20 +76,28 @@ private function createSession($options = []): Session
             'sessionMatchIP'           => false,
             'sessionTimeToUpdate'      => 300,
             'sessionRegenerateDestroy' => false,
-            'cookieDomain'             => '',
-            'cookiePrefix'             => '',
-            'cookiePath'               => '/',
-            'cookieSecure'             => false,
-            'cookieSameSite'           => 'Lax',
         ];
+        $config = array_merge($defaults, $options);
 
-        $config    = array_merge($defaults, $options);
         $appConfig = new AppConfig();
 
         foreach ($config as $key => $c) {
             $appConfig->{$key} = $c;
         }
 
+        $cookie = new Cookie();
+
+        foreach ([
+            'prefix'   => '',
+            'domain'   => '',
+            'path'     => '/',
+            'secure'   => false,
+            'samesite' => 'Lax',
+        ] as $key => $value) {
+            $cookie->{$key} = $value;
+        }
+        Factories::injectMock('config', 'Cookie', $cookie);
+
         $session = new MockSession(new ArrayHandler($appConfig, '127.0.0.1'), $appConfig);
         $session->setLogger(new TestLogger(new LoggerConfig()));
 

diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
@@ -25,6 +25,7 @@
 use CodeIgniter\Test\Mock\MockSession;
 use CodeIgniter\Test\TestLogger;
 use Config\App as AppConfig;
+use Config\Cookie;
 use Config\Logger as LoggerConfig;
 use Config\Security as SecurityConfig;
 
@@ -68,20 +69,28 @@ private function createSession($options = []): Session
             'sessionMatchIP'           => false,
             'sessionTimeToUpdate'      => 300,
             'sessionRegenerateDestroy' => false,
-            'cookieDomain'             => '',
-            'cookiePrefix'             => '',
-            'cookiePath'               => '/',
-            'cookieSecure'             => false,
-            'cookieSameSite'           => 'Lax',
         ];
+        $config = array_merge($defaults, $options);
 
-        $config    = array_merge($defaults, $options);
         $appConfig = new AppConfig();
 
         foreach ($config as $key => $c) {
             $appConfig->{$key} = $c;
         }
 
+        $cookie = new Cookie();
+
+        foreach ([
+            'prefix'   => '',
+            'domain'   => '',
+            'path'     => '/',
+            'secure'   => false,
+            'samesite' => 'Lax',
+        ] as $key => $value) {
+            $cookie->{$key} = $value;
+        }
+        Factories::injectMock('config', 'Cookie', $cookie);
+
         $session = new MockSession(new ArrayHandler($appConfig, '127.0.0.1'), $appConfig);
         $session->setLogger(new TestLogger(new LoggerConfig()));