Merge

hydephp · Dec 21, 2024 · 67f4adb · 67f4adb
1 parent fc9b9cc
commit 67f4adb
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/tests/Unit/AssetServiceUnitTest.php b/tests/Unit/AssetServiceUnitTest.php
@@ -17,7 +17,7 @@ class AssetServiceUnitTest extends UnitTestCase
 {
     protected function setUp(): void
     {
-        self::setupKernel();
+        self::resetKernel();
         self::mockConfig();
     }
 

diff --git a/tests/Unit/BaseFoundationCollectionTest.php b/tests/Unit/BaseFoundationCollectionTest.php
@@ -17,7 +17,7 @@ class BaseFoundationCollectionTest extends UnitTestCase
 {
     public function testBaseFoundationCollectionInitialization()
     {
-        $this->setupKernel();
+        self::resetKernel();
 
         $booted = BaseFoundationCollectionTestClass::init(HydeKernel::getInstance())->boot();
 

diff --git a/tests/Unit/BreadcrumbsComponentTest.php b/tests/Unit/BreadcrumbsComponentTest.php
@@ -23,7 +23,7 @@ class BreadcrumbsComponentTest extends UnitTestCase
 {
     protected function setUp(): void
     {
-        self::setupKernel();
+        self::resetKernel();
         self::mockConfig();
     }
 

diff --git a/tests/Unit/BuildTaskUnitTest.php b/tests/Unit/BuildTaskUnitTest.php
@@ -153,7 +153,7 @@ public function testCanWriteToOutput()
 
     public function testCreatedSiteFile()
     {
-        self::setupKernel();
+        self::resetKernel();
 
         $task = new BufferedTestBuildTask();
 
@@ -164,7 +164,7 @@ public function testCreatedSiteFile()
 
     public function testCreatedSiteFileWithAbsolutePath()
     {
-        self::setupKernel();
+        self::resetKernel();
 
         $task = new BufferedTestBuildTask();
 

diff --git a/tests/Unit/HtmlTestingSupportMetaTest.php b/tests/Unit/HtmlTestingSupportMetaTest.php
@@ -31,9 +31,7 @@ class HtmlTestingSupportMetaTest extends UnitTestCase
 
     protected function setUp(): void
     {
-        parent::setUp();
-
-        self::setupKernel();
+        self::resetKernel();
 
         $this->html ??= file_get_contents(Hyde::vendorPath('resources/views/homepages/welcome.blade.php'));
     }

diff --git a/tests/Unit/NavItemTest.php b/tests/Unit/NavItemTest.php
@@ -25,8 +25,11 @@
  */
 class NavItemTest extends UnitTestCase
 {
-    protected static bool $needsKernel = true;
-    protected static bool $needsConfig = true;
+    public static function setUpBeforeClass(): void
+    {
+        self::resetKernel();
+        self::mockConfig();
+    }
 
     protected function setUp(): void
     {

diff --git a/tests/Unit/NavigationDataFactoryUnitTest.php b/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -19,7 +19,7 @@ class NavigationDataFactoryUnitTest extends UnitTestCase
 {
     protected function setUp(): void
     {
-        self::setupKernel();
+        self::resetKernel();
         self::mockConfig();
     }
 

diff --git a/tests/Unit/UnixsumTest.php b/tests/Unit/UnixsumTest.php
@@ -63,7 +63,7 @@ public function testMethodReturnsSameValueForStringWithMixedEndOfLineSequences()
 
     public function testMethodReturnsSameValueWhenLoadedFromFileUsingShorthand()
     {
-        self::setupKernel();
+        self::resetKernel();
 
         $string = "foo\nbar\r\nbaz\r\n";