Merge pull request #339 from armanist/master

Making sure to not load import config if already loaded in AppTrait and in unit tests

Author: armanist

src/App/Traits/AppTrait.php

@@ -145,7 +145,9 @@ protected function loadEnvironment()
      */
     protected function loadAppConfig()
     {
-        Config::getInstance()->import(new Setup('config', 'app'));
+        if (!config()->has('app')) {
+            Config::getInstance()->import(new Setup('config', 'app'));
+        }
     }
 
     /**

tests/Unit/AppTestCase.php

@@ -24,14 +24,10 @@ public function setUp(): void
 
         AppFactory::create(App::WEB, PROJECT_ROOT);
 
-        config()->flush();
-
         Environment::getInstance()
             ->setMutable(true)
             ->load(new Setup('config', 'env'));
 
-        config()->import(new Setup('config', 'app'));
-
         $this->fs = FileSystemFactory::get();
     }
 

tests/Unit/Libraries/Auth/Adapters/SessionAuthAdapterTest.php

@@ -17,6 +17,8 @@ public function setUp(): void
     {
         parent::setUp();
 
+        config()->set('auth.two_fa', false);
+
         $this->sessionAuth = new SessionAuthAdapter($this->authService, $this->mailer, new Hasher);
 
         $admin = $this->sessionAuth->signup($this->adminUser);
@@ -117,7 +119,7 @@ public function testWebSignupAndActivateAccount()
 
     public function testWebForgetReset()
     {
-        $resetToken = $this->sessionAuth->forget('admin@qt.com', 'tpl');
+        $resetToken = $this->sessionAuth->forget('admin@qt.com');
 
         $this->sessionAuth->reset($resetToken, '123456789');
 

tests/Unit/Libraries/Auth/AuthTestCase.php

@@ -76,7 +76,9 @@ public function setUp(): void
         {
             parent::setUp();
 
-            config()->import(new Setup('config', 'database'));
+            if (!config()->has('database')) {
+                config()->import(new Setup('config', 'database'));
+            }
 
             config()->set('database.default', 'sleekdb');
 

tests/Unit/Libraries/Cache/Adapters/DatabaseAdapterTest.php

@@ -16,7 +16,9 @@ public function setUp(): void
     {
         parent::setUp();
 
-        config()->import(new Setup('config', 'database'));
+        if (!config()->has('database')) {
+            config()->import(new Setup('config', 'database'));
+        }
 
         config()->set('database.default', 'sleekdb');
 

tests/Unit/Libraries/Database/Adapters/Sleekdb/SleekDbalTestCase.php

@@ -27,7 +27,9 @@ public function setUp(): void
 
         $this->setPrivateProperty(Database::class, 'instance', null);
 
-        config()->import(new Setup('config', 'database'));
+        if (!config()->has('database')) {
+            config()->import(new Setup('config', 'database'));
+        }
 
         config()->set('database.default', 'sleekdb');
 

tests/Unit/Libraries/Database/DatabaseTest.php

@@ -14,7 +14,9 @@ public function setUp(): void
     {
         parent::setUp();
 
-        config()->import(new Setup('config', 'database', true));
+        if (!config()->has('database')) {
+            config()->import(new Setup('config', 'database', true));
+        }
 
         config()->set('database.default', 'sqlite');
 

tests/Unit/Libraries/Session/Helpers/SessionHelperFunctionsTest.php

@@ -11,6 +11,8 @@ class SessionHelperFunctionsTest extends AppTestCase
 {
     public function testSessionHelperGetDefaultSessionAdapter()
     {
+        config()->delete('session');
+
         $session = session();
 
         $this->assertInstanceOf(Session::class, $session);

tests/Unit/Libraries/Validation/Traits/GeneralRuleTest.php

@@ -19,7 +19,9 @@ public function setUp(): void
 
         $this->validator = new Validator();
 
-        config()->import(new Setup('config', 'database', true));
+        if (!config()->has('database')) {
+            config()->import(new Setup('config', 'database', true));
+        }
 
         config()->set('database.default', 'sqlite');