TypeScript: Updated compile target, addressed issues

[bookstack] / tests / Exports / ZipTestHelper.php

diff --git a/tests/Exports/ZipTestHelper.php b/tests/Exports/ZipTestHelper.php
index 3a9b34354542957c0d66525c979df9235ad53b41..50517a87d02906babd2c4b0bc9c483b8d222d045 100644 (file)
--- a/tests/Exports/ZipTestHelper.php
+++ b/tests/Exports/ZipTestHelper.php
@@ -4,11 +4,12 @@ namespace Tests\Exports;
 
 use BookStack\Exports\Import;
 use Illuminate\Http\UploadedFile;
 
 use BookStack\Exports\Import;
 use Illuminate\Http\UploadedFile;

+use Illuminate\Testing\TestResponse;

 use ZipArchive;
 
 class ZipTestHelper
 {
 use ZipArchive;
 
 class ZipTestHelper
 {

-    public static function importFromData(array $importData, array $zipData): Import
+    public static function importFromData(array $importData, array $zipData, array $files = []): Import

     {
         if (isset($zipData['book'])) {
             $importData['type'] = 'book';
     {
         if (isset($zipData['book'])) {
             $importData['type'] = 'book';


@@ -19,8 +20,15 @@ class ZipTestHelper
         }
 
         $import = Import::factory()->create($importData);
         }
 
         $import = Import::factory()->create($importData);

-        $zip = static::zipUploadFromData($zipData);
-        rename($zip->getRealPath(), storage_path($import->path));
+        $zip = static::zipUploadFromData($zipData, $files);
+        $targetPath = storage_path($import->path);
+        $targetDir = dirname($targetPath);
+
+        if (!file_exists($targetDir)) {
+            mkdir($targetDir);
+        }
+
+        rename($zip->getRealPath(), $targetPath);

 
         return $import;
     }
 
         return $import;
     }


@@ -33,15 +41,46 @@ class ZipTestHelper
         }
     }
 
         }
     }
 

-    public static function zipUploadFromData(array $data): UploadedFile
+    public static function zipUploadFromData(array $data, array $files = []): UploadedFile

     {
         $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
 
         $zip = new ZipArchive();
         $zip->open($zipFile, ZipArchive::CREATE);
         $zip->addFromString('data.json', json_encode($data));
     {
         $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
 
         $zip = new ZipArchive();
         $zip->open($zipFile, ZipArchive::CREATE);
         $zip->addFromString('data.json', json_encode($data));

+
+        foreach ($files as $name => $file) {
+            $zip->addFile($file, "files/$name");
+        }
+

         $zip->close();
 
         return new UploadedFile($zipFile, 'upload.zip', 'application/zip', null, true);
     }
         $zip->close();
 
         return new UploadedFile($zipFile, 'upload.zip', 'application/zip', null, true);
     }

+
+    public static function extractFromZipResponse(TestResponse $response): ZipResultData
+    {
+        $zipData = $response->streamedContent();
+        $zipFile = tempnam(sys_get_temp_dir(), 'bstest-');
+
+        file_put_contents($zipFile, $zipData);
+        $extractDir = tempnam(sys_get_temp_dir(), 'bstestextracted-');
+        if (file_exists($extractDir)) {
+            unlink($extractDir);
+        }
+        mkdir($extractDir);
+
+        $zip = new ZipArchive();
+        $zip->open($zipFile, ZipArchive::RDONLY);
+        $zip->extractTo($extractDir);
+
+        $dataJson = file_get_contents($extractDir . DIRECTORY_SEPARATOR . "data.json");
+        $data = json_decode($dataJson, true);
+
+        return new ZipResultData(
+            $zipFile,
+            $extractDir,
+            $data,
+        );
+    }

 }
 }