Reset the application only once

hydephp · Apr 28, 2022 · 8d2dec7 · 8d2dec7
1 parent 7e291ce
commit 8d2dec7
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 27 deletions.
diff --git a/tests/ResetsApplication.php b/tests/ResetsApplication.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests;
+
+use Hyde\Framework\Actions\CreatesDefaultDirectories;
+use Hyde\Framework\Hyde;
+use Hyde\Framework\Services\StarterFileService;
+use Illuminate\Support\Facades\File;
+
+trait ResetsApplication
+{
+    public function resetApplication()
+    {
+        File::deleteDirectory(Hyde::path('_pages'));
+        File::deleteDirectory(Hyde::path('_posts'));
+        File::deleteDirectory(Hyde::path('_media'));
+        File::deleteDirectory(Hyde::path('_docs'));
+        File::deleteDirectory(Hyde::path('_site'));
+
+        (new CreatesDefaultDirectories)->__invoke();
+        StarterFileService::publish();
+    }
+}
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,18 +2,14 @@
 
 namespace Tests;
 
-use Hyde\Framework\Actions\CreatesDefaultDirectories;
-use Hyde\Framework\Hyde;
-use Hyde\Framework\Services\StarterFileService;
-use Illuminate\Support\Facades\File;
 use LaravelZero\Framework\Testing\TestCase as BaseTestCase;
 
-/**
- * @todo make the directory resets more granular to speed up testing.
- */
 abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
+    use ResetsApplication;
+
+	protected static bool $booted = false;
 
     /**
      * Setup the test environment.
@@ -24,16 +20,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        File::deleteDirectories([
-            Hyde::path('_pages'),
-            Hyde::path('_posts'),
-            Hyde::path('_media'),
-            Hyde::path('_docs'),
-            Hyde::path('_site'),
-        ]);
+        if (!self::$booted) {
+            $this->resetApplication();
 
-        (new CreatesDefaultDirectories)->__invoke();
-        StarterFileService::publish();
+            self::$booted = true;
+        }
     }
 
     /**
@@ -43,17 +34,6 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
-        File::deleteDirectories([
-            Hyde::path('_pages'),
-            Hyde::path('_posts'),
-            Hyde::path('_media'),
-            Hyde::path('_docs'),
-            Hyde::path('_site'),
-        ]);
-
-        (new CreatesDefaultDirectories)->__invoke();
-        StarterFileService::publish();
-
         parent::tearDown();
     }
 }