test: update failed tests

Author: kenjis

tests/system/Session/Handlers/Database/MySQLiHandlerTest.php

@@ -11,9 +11,11 @@
 
 namespace CodeIgniter\Session\Handlers\Database;
 
+use CodeIgniter\Config\Factories;
 use CodeIgniter\Session\Handlers\DatabaseHandler;
 use Config\App as AppConfig;
 use Config\Database as DatabaseConfig;
+use Config\Session as SessionConfig;
 
 /**
  * @group DatabaseLive
@@ -34,26 +36,34 @@ protected function setUp(): void
     protected function getInstance($options = [])
     {
         $defaults = [
-            'sessionDriver'            => DatabaseHandler::class,
-            'sessionCookieName'        => 'ci_session',
-            'sessionExpiration'        => 7200,
-            'sessionSavePath'          => 'ci_sessions',
-            'sessionMatchIP'           => false,
-            'sessionTimeToUpdate'      => 300,
-            'sessionRegenerateDestroy' => false,
-            'cookieDomain'             => '',
-            'cookiePrefix'             => '',
-            'cookiePath'               => '/',
-            'cookieSecure'             => false,
-            'cookieSameSite'           => 'Lax',
+            'cookieDomain'   => '',
+            'cookiePrefix'   => '',
+            'cookiePath'     => '/',
+            'cookieSecure'   => false,
+            'cookieSameSite' => 'Lax',
         ];
-
-        $config    = array_merge($defaults, $options);
         $appConfig = new AppConfig();
 
-        foreach ($config as $key => $c) {
-            $appConfig->{$key} = $c;
+        foreach ($defaults as $key => $value) {
+            $appConfig->{$key} = $value;
+        }
+
+        $defaults = [
+            'driver'            => DatabaseHandler::class,
+            'cookieName'        => 'ci_session',
+            'expiration'        => 7200,
+            'savePath'          => 'ci_sessions',
+            'matchIP'           => false,
+            'timeToUpdate'      => 300,
+            'regenerateDestroy' => false,
+        ];
+        $sessionConfig = new SessionConfig();
+        $config        = array_merge($defaults, $options);
+
+        foreach ($config as $key => $value) {
+            $sessionConfig->{$key} = $value;
         }
+        Factories::injectMock('config', 'Session', $sessionConfig);
 
         return new MySQLiHandler($appConfig, '127.0.0.1');
     }

tests/system/Session/SessionTest.php

@@ -20,6 +20,7 @@
 use Config\App as AppConfig;
 use Config\Cookie as CookieConfig;
 use Config\Logger as LoggerConfig;
+use Config\Session as SessionConfig;
 
 /**
  * @runTestsInSeparateProcesses
@@ -43,26 +44,34 @@ protected function setUp(): void
     protected function getInstance($options = [])
     {
         $defaults = [
-            'sessionDriver'            => FileHandler::class,
-            'sessionCookieName'        => 'ci_session',
-            'sessionExpiration'        => 7200,
-            'sessionSavePath'          => '',
-            'sessionMatchIP'           => false,
-            'sessionTimeToUpdate'      => 300,
-            'sessionRegenerateDestroy' => false,
-            'cookieDomain'             => '',
-            'cookiePrefix'             => '',
-            'cookiePath'               => '/',
-            'cookieSecure'             => false,
-            'cookieSameSite'           => 'Lax',
+            'cookieDomain'   => '',
+            'cookiePrefix'   => '',
+            'cookiePath'     => '/',
+            'cookieSecure'   => false,
+            'cookieSameSite' => 'Lax',
         ];
-
-        $config    = array_merge($defaults, $options);
         $appConfig = new AppConfig();
 
-        foreach ($config as $key => $c) {
-            $appConfig->{$key} = $c;
+        foreach ($defaults as $key => $value) {
+            $appConfig->{$key} = $value;
+        }
+
+        $defaults = [
+            'driver'            => FileHandler::class,
+            'cookieName'        => 'ci_session',
+            'expiration'        => 7200,
+            'savePath'          => '',
+            'matchIP'           => false,
+            'timeToUpdate'      => 300,
+            'regenerateDestroy' => false,
+        ];
+        $sessionConfig = new SessionConfig();
+        $config        = array_merge($defaults, $options);
+
+        foreach ($config as $key => $value) {
+            $sessionConfig->{$key} = $value;
         }
+        Factories::injectMock('config', 'Session', $sessionConfig);
 
         $session = new MockSession(new FileHandler($appConfig, '127.0.0.1'), $appConfig);
         $session->setLogger(new TestLogger(new LoggerConfig()));
@@ -626,7 +635,7 @@ public function testInvalidSameSite()
 
     public function testExpires()
     {
-        $session = $this->getInstance(['sessionExpiration' => 8000]);
+        $session = $this->getInstance(['expiration' => 8000]);
         $session->start();
 
         $cookies = $session->cookies;
@@ -636,7 +645,7 @@ public function testExpires()
 
     public function testExpiresOnClose()
     {
-        $session = $this->getInstance(['sessionExpiration' => 0]);
+        $session = $this->getInstance(['expiration' => 0]);
         $session->start();
 
         $cookies = $session->cookies;