Fixed incorrect testing vars and reset env vars in config test

ssddanbrown · ssddanbrown · commit 5c70413784aa · 2019-06-25T22:52:07.000+01:00
diff --git a/phpunit.xml b/phpunit.xml
@@ -34,8 +34,8 @@
         <env name="AVATAR_URL" value=""/>
         <env name="LDAP_VERSION" value="3"/>
         <env name="STORAGE_TYPE" value="local"/>
-        <env name="ATTACHMENT_STORAGE_TYPE" value="local"/>
-        <env name="IMAGE_STORAGE_TYPE" value="local"/>
+        <env name="STORAGE_ATTACHMENT_TYPE" value="local"/>
+        <env name="STORAGE_IMAGE_TYPE" value="local"/>
         <env name="GITHUB_APP_ID" value="aaaaaaaaaaaaaa"/>
         <env name="GITHUB_APP_SECRET" value="aaaaaaaaaaaaaa"/>
         <env name="GITHUB_AUTO_REGISTER" value=""/>
diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php
@@ -16,6 +16,8 @@ public function test_filesystem_images_falls_back_to_storage_type_var()
 
         $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', 's3', 'filesystems.images', 's3');
         $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', null, 'filesystems.images', 'local_secure');
+
+        putenv('STORAGE_TYPE=local');
     }
 
     public function test_filesystem_attachments_falls_back_to_storage_type_var()
@@ -24,6 +26,8 @@ public function test_filesystem_attachments_falls_back_to_storage_type_var()
 
         $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', 's3', 'filesystems.attachments', 's3');
         $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', null, 'filesystems.attachments', 'local_secure');
+
+        putenv('STORAGE_TYPE=local');
     }
 
     public function test_app_url_blank_if_old_default_value()
@@ -45,10 +49,12 @@ public function test_app_url_blank_if_old_default_value()
      */
     protected function checkEnvConfigResult(string $envName, $envVal, string $configKey, string $expectedResult)
     {
+        $originalVal = getenv($envName);
         $envString = $envName . (is_null($envVal) ? '' : '=') . ($envVal ?? '');
         putenv($envString);
         $this->refreshApplication();
         $this->assertEquals($expectedResult, config($configKey));
+        putenv($envString = $envName . (empty($originalVal) ? '' : '=') . ($originalVal ?? ''));
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ public function test_filesystem_images_falls_back_to_storage_type_var()`
`16`	`16`
`17`	`17`	`$this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', 's3', 'filesystems.images', 's3');`
`18`	`18`	`$this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', null, 'filesystems.images', 'local_secure');`
	`19`	`+`
	`20`	`+ putenv('STORAGE_TYPE=local');`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`public function test_filesystem_attachments_falls_back_to_storage_type_var()`
`@@ -24,6 +26,8 @@ public function test_filesystem_attachments_falls_back_to_storage_type_var()`
`24`	`26`
`25`	`27`	`$this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', 's3', 'filesystems.attachments', 's3');`
`26`	`28`	`$this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', null, 'filesystems.attachments', 'local_secure');`
	`29`	`+`
	`30`	`+ putenv('STORAGE_TYPE=local');`
`27`	`31`	`}`
`28`	`32`
`29`	`33`	`public function test_app_url_blank_if_old_default_value()`
`@@ -45,10 +49,12 @@ public function test_app_url_blank_if_old_default_value()`
`45`	`49`	`*/`
`46`	`50`	`protected function checkEnvConfigResult(string $envName, $envVal, string $configKey, string $expectedResult)`
`47`	`51`	`{`
	`52`	`+ $originalVal = getenv($envName);`
`48`	`53`	`$envString = $envName . (is_null($envVal) ? '' : '=') . ($envVal ?? '');`
`49`	`54`	`putenv($envString);`
`50`	`55`	`$this->refreshApplication();`
`51`	`56`	`$this->assertEquals($expectedResult, config($configKey));`
	`57`	`+ putenv($envString = $envName . (empty($originalVal) ? '' : '=') . ($originalVal ?? ''));`
`52`	`58`	`}`
`53`	`59`
`54`	`60`	`}`