added shareEditor test

app/Http/Controllers/FileFunctions/EditItemsController.php

@@ -388,7 +388,6 @@ class EditItemsController extends Controller
         $folder = Folder::whereUserId($shared->user_id)
             ->where('id', $id);
             
-
         if (! $folder->exists()) {
             abort(404, 'Requested folder doesn\'t exists.');
         }
@@ -402,7 +401,7 @@ class EditItemsController extends Controller
                 'token' => $shared->token,
             ]),
             'name' => $zip->basename,
-        ], 200);
+        ], 201);
     }
 
     /**

routes/api.php

@@ -13,7 +13,7 @@ use App\Http\Controllers\Sharing\FileSharingController;
 
 // Edit Functions
 Route::patch('/rename-item/{unique_id}/public/{token}', [EditItemsController::class, 'guest_rename_item']);
-Route::get('/zip-folder/{unique_id}/public/{token}', [EditItemsController::class, 'guest_zip_folder']);
+Route::get('/zip-folder/{id}/public/{token}', [EditItemsController::class, 'guest_zip_folder']);
 Route::post('/create-folder/public/{token}', [EditItemsController::class, 'guest_create_folder']);
 Route::post('/remove-item/public/{token}', [EditItemsController::class, 'guest_delete_item']);
 Route::post('/zip/public/{token}', [EditItemsController::class, 'guest_zip_multiple_files']);

tests/Feature/Share/ShareContentAccessTest.php

@@ -3,17 +3,13 @@
 namespace Tests\Feature;
 
 use App\Models\File;
-use App\Models\Folder;
 use App\Models\Share;
-use App\Models\Traffic;
 use App\Models\User;
 use App\Models\Zip;
 use App\Services\SetupService;
-use Carbon\Carbon;
 use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Str;
-use Laravel\Sanctum\Sanctum;
 use Storage;
 use Tests\TestCase;
 
@@ -30,7 +26,7 @@ class ShareContentAccessTest extends TestCase
     /**
      * @test
      */
-    public function it_get_public_file_record_and_download_them()
+    public function it_get_public_file_record_and_download_file_within()
     {
         Storage::fake('local');
 
@@ -80,7 +76,23 @@ class ShareContentAccessTest extends TestCase
     /**
      * @test
      */
-    public function it_get_public_thumbnail()
+    public function it_try_to_get_protected_file_record()
+    {
+        $share = Share::factory(Share::class)
+            ->create([
+                'type'         => 'file',
+                'is_protected' => true,
+            ]);
+
+        // Get share record
+        $this->get("/api/files/$share->token/public")
+            ->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function it_download_public_thumbnail()
     {
         Storage::fake('local');
 
@@ -109,7 +121,7 @@ class ShareContentAccessTest extends TestCase
                 'is_protected' => false,
             ]);
 
-        // Get shared file
+        // Get thumbnail file
         $this->get("/thumbnail/$thumbnail->name/public/$share->token")
             ->assertStatus(200);
 
@@ -122,23 +134,7 @@ class ShareContentAccessTest extends TestCase
     /**
      * @test
      */
-    public function it_try_to_get_protected_file_record()
+    public function it_download_publicly_zipped_files()
-    {
-        $share = Share::factory(Share::class)
-            ->create([
-                'type'         => 'file',
-                'is_protected' => true,
-            ]);
-
-        // Get share record
-        $this->get("/api/files/$share->token/public")
-            ->assertStatus(403);
-    }
-
-    /**
-     * @test
-     */
-    public function it_zip_shared_multiple_files_and_download_it()
     {
         Storage::fake('local');
 
@@ -147,49 +143,23 @@ class ShareContentAccessTest extends TestCase
         $user = User::factory(User::class)
             ->create();
 
-        $folder = Folder::factory(Folder::class)
-            ->create([
-                'user_id' => $user->id
-            ]);
-
-        collect([0, 1])
-            ->each(function ($index) use ($folder, $user) {
-
-                $file = UploadedFile::fake()
-                    ->create(Str::random() . "-fake-file-$index.pdf", 1000, 'application/pdf');
-
-                Storage::putFileAs("files/$user->id", $file, $file->name);
-
-                File::factory(File::class)
-                    ->create([
-                        'filesize'  => $file->getSize(),
-                        'folder_id' => $folder->id,
-                        'user_id'   => $user->id,
-                        'basename'  => $file->name,
-                        'name'      => "fake-file-$index.pdf",
-                    ]);
-            });
-
         $share = Share::factory(Share::class)
             ->create([
-                'item_id'      => $folder->id,
                 'user_id'      => $user->id,
                 'type'         => 'folder',
                 'is_protected' => false,
             ]);
 
-        $this->postJson("/api/zip/public/$share->token", [
+        $zip = Zip::factory(Zip::class)->create([
-            'items' => File::all()->pluck('id')
+            'basename'     => 'EHWKcuvKzA4Gv29v-archive.zip',
-        ])->assertStatus(201);
-
-        $this->assertDatabaseHas('zips', [
             'user_id'      => $user->id,
             'shared_token' => $share->token,
         ]);
 
-        $zip = Zip::first();
+        $file = UploadedFile::fake()
+            ->create($zip->basename, 1000, 'application/zip');
 
-        Storage::assertExists("zip/$zip->basename");
+        Storage::putFileAs("zip", $file, $file->name);
 
         $this->get("/zip/$zip->id/public/$share->token")
             ->assertStatus(200);
@@ -199,41 +169,4 @@ class ShareContentAccessTest extends TestCase
             'download' => null,
         ]);
     }
-
-    /**
-     * @test
-     */
-    public function it_try_zip_non_shared_file_with_shared_multiple_files_and_download_it()
-    {
-        $user = User::factory(User::class)
-            ->create();
-
-        $folder = Folder::factory(Folder::class)
-            ->create([
-                'user_id' => $user->id
-            ]);
-
-        File::factory(File::class)
-            ->create([
-                'folder_id' => $folder->id,
-                'user_id'   => $user->id,
-            ]);
-
-        File::factory(File::class)
-            ->create([
-                'user_id'   => $user->id,
-            ]);
-
-        $share = Share::factory(Share::class)
-            ->create([
-                'item_id'      => $folder->id,
-                'user_id'      => $user->id,
-                'type'         => 'folder',
-                'is_protected' => false,
-            ]);
-
-        $this->postJson("/api/zip/public/$share->token", [
-            'items' => File::all()->pluck('id')
-        ])->assertStatus(403);
-    }
 }

tests/Feature/Share/ShareEditorTest.php

@@ -0,0 +1,206 @@
+<?php
+
+namespace Tests\Feature\Share;
+
+use App\Models\File;
+use App\Models\Folder;
+use App\Models\Share;
+use App\Models\User;
+use App\Models\Zip;
+use Illuminate\Foundation\Testing\DatabaseMigrations;
+use App\Services\SetupService;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Str;
+use Storage;
+use Tests\TestCase;
+
+class ShareEditorTest extends TestCase
+{
+    use DatabaseMigrations;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setup = app()->make(SetupService::class);
+    }
+
+    /**
+     * @test
+     */
+    public function it_zip_shared_multiple_files()
+    {
+        Storage::fake('local');
+
+        $this->setup->create_directories();
+
+        $user = User::factory(User::class)
+            ->create();
+
+        $folder = Folder::factory(Folder::class)
+            ->create([
+                'user_id' => $user->id
+            ]);
+
+        collect([0, 1])
+            ->each(function ($index) use ($folder, $user) {
+
+                $file = UploadedFile::fake()
+                    ->create(Str::random() . "-fake-file-$index.pdf", 1000, 'application/pdf');
+
+                Storage::putFileAs("files/$user->id", $file, $file->name);
+
+                File::factory(File::class)
+                    ->create([
+                        'filesize'  => $file->getSize(),
+                        'folder_id' => $folder->id,
+                        'user_id'   => $user->id,
+                        'basename'  => $file->name,
+                        'name'      => "fake-file-$index.pdf",
+                    ]);
+            });
+
+        $share = Share::factory(Share::class)
+            ->create([
+                'item_id'      => $folder->id,
+                'user_id'      => $user->id,
+                'type'         => 'folder',
+                'is_protected' => false,
+            ]);
+
+        $this->postJson("/api/zip/public/$share->token", [
+            'items' => File::all()->pluck('id')
+        ])->assertStatus(201);
+
+        $this->assertDatabaseHas('zips', [
+            'user_id'      => $user->id,
+            'shared_token' => $share->token,
+        ]);
+
+        Storage::assertExists("zip/" . Zip::first()->basename);
+    }
+
+    /**
+     * @test
+     */
+    public function it_try_zip_non_shared_file_with_already_shared_multiple_files()
+    {
+        $user = User::factory(User::class)
+            ->create();
+
+        $folder = Folder::factory(Folder::class)
+            ->create([
+                'user_id' => $user->id
+            ]);
+
+        File::factory(File::class)
+            ->create([
+                'folder_id' => $folder->id,
+                'user_id'   => $user->id,
+            ]);
+
+        File::factory(File::class)
+            ->create([
+                'user_id' => $user->id,
+            ]);
+
+        $share = Share::factory(Share::class)
+            ->create([
+                'item_id'      => $folder->id,
+                'user_id'      => $user->id,
+                'type'         => 'folder',
+                'is_protected' => false,
+            ]);
+
+        $this->postJson("/api/zip/public/$share->token", [
+            'items' => File::all()->pluck('id')
+        ])->assertStatus(403);
+    }
+
+    /**
+     * @test
+     */
+    public function it_zip_shared_folder()
+    {
+        Storage::fake('local');
+
+        $this->setup->create_directories();
+
+        $user = User::factory(User::class)
+            ->create();
+
+        $root = Folder::factory(Folder::class)
+            ->create([
+                'user_id' => $user->id
+            ]);
+
+        $children = Folder::factory(Folder::class)
+            ->create([
+                'user_id'   => $user->id,
+                'parent_id' => $root->id
+            ]);
+
+        collect([0, 1])
+            ->each(function ($index) use ($children, $user) {
+
+                $file = UploadedFile::fake()
+                    ->create(Str::random() . "-fake-file-$index.pdf", 1000, 'application/pdf');
+
+                Storage::putFileAs("files/$user->id", $file, $file->name);
+
+                File::factory(File::class)
+                    ->create([
+                        'filesize'  => $file->getSize(),
+                        'folder_id' => $children->id,
+                        'user_id'   => $user->id,
+                        'basename'  => $file->name,
+                        'name'      => "fake-file-$index.pdf",
+                    ]);
+            });
+
+        $share = Share::factory(Share::class)
+            ->create([
+                'item_id'      => $children->id,
+                'user_id'      => $user->id,
+                'type'         => 'folder',
+                'is_protected' => false,
+            ]);
+
+        $this->getJson("/api/zip-folder/$children->id/public/$share->token")
+            ->assertStatus(201);
+
+        $this->assertDatabaseHas('zips', [
+            'user_id'      => $user->id,
+            'shared_token' => $share->token,
+        ]);
+
+        Storage::assertExists("zip/" . Zip::first()->basename);
+    }
+
+    /**
+     * @test
+     */
+    public function it_try_zip_non_shared_folder()
+    {
+        Storage::fake('local');
+
+        $this->setup->create_directories();
+
+        $user = User::factory(User::class)
+            ->create();
+
+        $folder = Folder::factory(Folder::class)
+            ->create([
+                'user_id' => $user->id
+            ]);
+
+        $share = Share::factory(Share::class)
+            ->create([
+                'user_id'      => $user->id,
+                'type'         => 'folder',
+                'is_protected' => false,
+            ]);
+
+        $this->getJson("/api/zip-folder/$folder->id/public/$share->token")
+            ->assertStatus(403);
+    }
+}