test: refactor tests

kenjis · kenjis · commit 310697094d6b · 2022-06-30T17:34:55.000+09:00
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
@@ -50,7 +50,7 @@ final class CommonFunctionsTest extends CIUnitTestCase
     protected function setUp(): void
     {
         unset($_ENV['foo'], $_SERVER['foo']);
-        Services::reset();
+        $this->resetServices();
 
         parent::setUp();
     }
@@ -593,8 +593,6 @@ public function testTraceWithCSP()
 
     public function testCspStyleNonce()
     {
-        $this->resetServices();
-
         $config             = config('App');
         $config->CSPEnabled = true;
 
@@ -603,8 +601,6 @@ public function testCspStyleNonce()
 
     public function testCspScriptNonce()
     {
-        $this->resetServices();
-
         $config             = config('App');
         $config->CSPEnabled = true;
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ final class CommonFunctionsTest extends CIUnitTestCase`
`50`	`50`	`protected function setUp(): void`
`51`	`51`	`{`
`52`	`52`	`unset($_ENV['foo'], $_SERVER['foo']);`
`53`		`- Services::reset();`
	`53`	`+ $this->resetServices();`
`54`	`54`
`55`	`55`	`parent::setUp();`
`56`	`56`	`}`
`@@ -593,8 +593,6 @@ public function testTraceWithCSP()`
`593`	`593`
`594`	`594`	`public function testCspStyleNonce()`
`595`	`595`	`{`
`596`		`- $this->resetServices();`
`597`		`-`
`598`	`596`	`$config = config('App');`
`599`	`597`	`$config->CSPEnabled = true;`
`600`	`598`
`@@ -603,8 +601,6 @@ public function testCspStyleNonce()`
`603`	`601`
`604`	`602`	`public function testCspScriptNonce()`
`605`	`603`	`{`
`606`		`- $this->resetServices();`
`607`		`-`
`608`	`604`	`$config = config('App');`
`609`	`605`	`$config->CSPEnabled = true;`
`610`	`606`