Fix directory deletion

knuckleswtf · Jun 25, 2021 · 8b93252 · 8b93252
1 parent b114623
commit 8b93252
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/src/Writing/HtmlWriter.php b/src/Writing/HtmlWriter.php
@@ -62,9 +62,12 @@ public function generate(array $groupedEndpoints, string $sourceFolder, string $
 
         // Copy assets
         $assetsFolder = __DIR__ . '/../../resources';
-        if (is_dir($assetsFolder)) {
-            // Prune older versioned assets
-            Utils::deleteDirectoryAndContents($assetsFolder);
+        // Prune older versioned assets
+        if (is_dir($destinationFolder.'/css')) {
+            Utils::deleteDirectoryAndContents($destinationFolder.'/css');
+        }
+        if (is_dir($destinationFolder.'/js')) {
+            Utils::deleteDirectoryAndContents($destinationFolder.'/js');
         }
         Utils::copyDirectory("{$assetsFolder}/images/", "{$destinationFolder}/images");
 

diff --git a/tests/Fixtures/openapi.yaml b/tests/Fixtures/openapi.yaml
@@ -291,8 +291,20 @@ paths:
                             type: array
                             description: Details.
                             example:
-                                - [ ]
-                                - [ ]
+                            - first_name: 'John'
+                              last_name: 'Doe'
+                              contacts:
+                              - first_name: Janelle
+                                last_name: Monáe
+                              - {}
+                              roles: [Admin]
+                            - first_name: 'John'
+                              last_name: 'Doe'
+                              contacts:
+                              - first_name: Janelle
+                                last_name: Monáe
+                              - {}
+                              roles: [Admin]
                             items:
                                 type: object
                                 properties:

diff --git a/tests/GenerateDocumentationTest.php b/tests/GenerateDocumentationTest.php
@@ -260,9 +260,9 @@ public function generated_openapi_spec_file_is_correct()
 
         $this->artisan('scribe:generate');
 
-        $generatedCollection = Yaml::parseFile(__DIR__ . '/../public/docs/openapi.yaml');
-        $fixtureCollection = Yaml::parseFile(__DIR__ . '/Fixtures/openapi.yaml');
-        $this->assertEquals($fixtureCollection, $generatedCollection);
+        $generatedSpec = Yaml::parseFile(__DIR__ . '/../public/docs/openapi.yaml');
+        $fixtureSpec = Yaml::parseFile(__DIR__ . '/Fixtures/openapi.yaml');
+        $this->assertEquals($fixtureSpec, $generatedSpec);
     }
 
     /** @test */