update tests

Author: imahmood

tests/FileStorageTest.php

@@ -3,62 +3,26 @@
 
 namespace Imahmood\FileStorage\Tests;
 
-use Illuminate\Http\Testing\File;
-use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Queue;
-use Illuminate\Support\Facades\Storage;
-use Imahmood\FileStorage\Config\ConfigurationFactory;
 use Imahmood\FileStorage\FileStorage;
-use Imahmood\FileStorage\Jobs\GeneratePreview;
-use Imahmood\FileStorage\Jobs\OptimizeImage;
 use Imahmood\FileStorage\Models\Media;
 use Imahmood\FileStorage\Tests\TestSupport\Enums\TestDocumentType;
 use Imahmood\FileStorage\Tests\TestSupport\Models\TestUserModel;
+use Imahmood\FileStorage\Tests\TestSupport\UploadedFile;
 
 class FileStorageTest extends TestCase
 {
-    private FileStorage $fileStorage;
-
-    private File $testFile;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $config = ConfigurationFactory::create([
-            'disk' => 'media',
-            'queue' => 'media',
-            'max_dimension' => 2000,
-            'preview_dimension' => 300,
-            'generate_preview' => true,
-        ]);
-
-        $this->fileStorage = new FileStorage($config);
-
-        $path = __DIR__.'/TestSupport/assets/avatar.JPG';
-        $this->testFile = UploadedFile::fake()->create($path, file_get_contents($path));
-
-        Queue::fake();
-        Storage::fake('media');
-        Auth::partialMock()->shouldReceive('id')->zeroOrMoreTimes()->andReturn(1);
-    }
-
     public function testCreateMedia(): void
     {
-        $media = $this->fileStorage->create(
+        $fileStorage = app(FileStorage::class);
+        $media = $fileStorage->create(
             type: TestDocumentType::AVATAR,
             relatedTo: new TestUserModel(),
-            uploadedFile: $this->testFile,
+            uploadedFile: UploadedFile::fake('jpg'),
         );
 
         $this->assertNull($media->preview);
         $this->assertSame($media->type, TestDocumentType::AVATAR->value);
-        $this->assertSame('jpg', pathinfo($media->file_name, PATHINFO_EXTENSION));
-
-        Queue::assertPushedWithChain(OptimizeImage::class, [
-            GeneratePreview::class,
-        ]);
+        $this->assertStringEndsWith('.jpg', $media->file_name);
     }
 
     public function testUpdateMedia(): void
@@ -71,30 +35,28 @@ public function testUpdateMedia(): void
             'type' => TestDocumentType::AVATAR,
         ]);
 
-        $relatedModel = new TestUserModel();
-
-        $updatedMedia = $this->fileStorage->update(
+        $fileStorage = app(FileStorage::class);
+        $updatedMedia = $fileStorage->update(
             type: TestDocumentType::OTHER,
-            relatedTo: $relatedModel,
+            relatedTo: new TestUserModel(),
             media: clone $originalMedia,
-            uploadedFile: $this->testFile,
+            uploadedFile: UploadedFile::fake('jpg'),
         );
 
         $this->assertNotSame($updatedMedia->file_name, $originalMedia->file_name);
         $this->assertNull($updatedMedia->preview);
         $this->assertSame($updatedMedia->type, TestDocumentType::OTHER->value);
-
-        Queue::assertPushedWithChain(OptimizeImage::class, [
-            GeneratePreview::class,
-        ]);
+        $this->assertStringEndsWith('.jpg', $updatedMedia->file_name);
     }
 
     public function testDeleteMedia(): void
     {
         /** @var \Imahmood\FileStorage\Models\Media $media */
         $media = Media::factory()->create();
 
-        $result = $this->fileStorage->delete($media);
+        $fileStorage = app(FileStorage::class);
+        $result = $fileStorage->delete($media);
+
         $this->assertTrue($result);
     }
 }

tests/ManipulatorTest.php

@@ -0,0 +1,60 @@
+<?php
+declare(strict_types=1);
+
+namespace Imahmood\FileStorage\Tests;
+
+use Illuminate\Support\Facades\Queue;
+use Imahmood\FileStorage\FileStorage;
+use Imahmood\FileStorage\Jobs\RunModifiersJob;
+use Imahmood\FileStorage\Tests\TestSupport\Enums\TestDocumentType;
+use Imahmood\FileStorage\Tests\TestSupport\Models\TestUserModel;
+use Imahmood\FileStorage\Tests\TestSupport\UploadedFile;
+
+class ManipulatorTest extends TestCase
+{
+    public function testModifiersJobPushedAfterMediaCreated(): void
+    {
+        Queue::fake();
+        config()->set('file-storage.queue_modifiers', true);
+
+        $fileStorage = app(FileStorage::class);
+        $fileStorage->create(
+            type: TestDocumentType::AVATAR,
+            relatedTo: new TestUserModel(),
+            uploadedFile: UploadedFile::fake('jpg'),
+        );
+
+        Queue::assertPushed(RunModifiersJob::class);
+    }
+
+    public function testModifiersJobNotPushedAfterMediaCreated(): void
+    {
+        Queue::fake();
+        config()->set('file-storage.queue_modifiers', false);
+
+        $fileStorage = app(FileStorage::class);
+        $fileStorage->create(
+            type: TestDocumentType::AVATAR,
+            relatedTo: new TestUserModel(),
+            uploadedFile: UploadedFile::fake('jpg'),
+        );
+
+        Queue::assertNotPushed(RunModifiersJob::class);
+    }
+
+    public function testModifiersRunAfterMediaCreated(): void
+    {
+        config()->set('file-storage.queue_modifiers', false);
+
+        $fileStorage = app(FileStorage::class);
+        $media = $fileStorage->create(
+            type: TestDocumentType::AVATAR,
+            relatedTo: new TestUserModel(),
+            uploadedFile: UploadedFile::fake('heic'),
+        );
+
+        $this->assertSame($media->type, TestDocumentType::AVATAR->value);
+        $this->assertNotNull($media->preview);
+        $this->assertStringEndsWith('.jpg', $media->file_name);
+    }
+}

tests/TestCase.php

@@ -3,6 +3,7 @@
 
 namespace Imahmood\FileStorage\Tests;
 
+use Illuminate\Support\Facades\Storage;
 use Imahmood\FileStorage\FileStorageServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 
@@ -12,6 +13,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        Storage::fake('local');
+
         $this->loadMigrationsFrom(__DIR__.'/database/migrations');
         $this->artisan('migrate', ['--database' => 'testbench'])->run();
     }

tests/TestSupport/Enums/TestDocumentType.php

@@ -14,9 +14,4 @@ public function identifier(): int
     {
         return $this->value;
     }
-
-    public function isPublic(): bool
-    {
-        return true;
-    }
 }

tests/TestSupport/UploadedFile.php

@@ -0,0 +1,20 @@
+<?php
+declare(strict_types=1);
+
+namespace Imahmood\FileStorage\Tests\TestSupport;
+
+use Illuminate\Http\Testing\File;
+use Illuminate\Http\UploadedFile as HttpUploadedFile;
+
+class UploadedFile
+{
+    public static function fake(string $ext): File
+    {
+        $paths = [
+            'jpg' => __DIR__.'/assets/avatar.JPG',
+            'heic' => __DIR__.'/assets/sample-heic-image.heic',
+        ];
+
+        return HttpUploadedFile::fake()->create($paths[$ext], file_get_contents($paths[$ext]));
+    }
+}