Attempt fix without skipping test.

lunarstorm · Sep 2, 2024 · 1573859 · 1573859
1 parent ddc860f
commit 1573859
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/tests/Command/InstallTest.php b/tests/Command/InstallTest.php
@@ -51,8 +51,11 @@
     expect($after)->toEqual(config('ddd.domain_path'));
 
     unlink(config_path('ddd.php'));
+
+    // Reset composer back to the factory state
+    $this->setDomainPathInComposer('Domain', 'src/Domain', reload: true);
 })->with([
     ['src/Domain', 'Domain'],
     ['src/Domains', 'Domains'],
     ['src/CustomDomainRoot', 'CustomDomainRoot'],
-])->skip('Causes issues with autoload tests executed after this test');
+]);
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -167,14 +167,18 @@ protected function setupTestApplication()
         $this->setDomainPathInComposer('Domain', 'src/Domain');
     }
 
-    protected function setDomainPathInComposer($domainNamespace, $domainPath)
+    protected function setDomainPathInComposer($domainNamespace, $domainPath, bool $reload = true)
     {
         $this->updateComposer(
             set: [
                 [['autoload', 'psr-4', $domainNamespace.'\\'], $domainPath],
             ],
         );
 
+        if ($reload) {
+            $this->composerReload();
+        }
+
         return $this;
     }
 }