Update tests

Author: karlomikus

tests/Feature/External/ToDataPackTest.php

@@ -29,11 +29,12 @@ public function test_export_creates_zip_file(): void
         $exporter = new ToDataPack($this->getFileMock());
         $filename = $exporter->process($membership->bar->id, 'datapack-test.zip');
 
-        $this->assertTrue(str_ends_with($filename, 'exports/1/datapack-test.zip'));
+        $this->assertSame($filename, '1/datapack-test.zip');
     }
 
     public function test_export_contains_files(): void
     {
+        $exportMock = $this->getFileMock();
         Storage::fake('uploads');
 
         $membership = $this->setupBarMembership();
@@ -55,8 +56,9 @@ public function test_export_contains_files(): void
             'file_extension' => $ingredientCocktailFile->extension(),
         ]);
 
-        $exporter = new ToDataPack($this->getFileMock());
+        $exporter = new ToDataPack($exportMock);
         $filename = $exporter->process($membership->bar->id, 'datapack-test.zip');
+        $filename = $exportMock->disk()->path($filename);
 
         $unzippedFilesDisk = Storage::fake('temp-datapack-unzip');
 

tests/Feature/External/ToRecipeTypeTest.php

@@ -29,11 +29,12 @@ public function test_export_creates_zip_file(): void
         $exporter = new ToRecipeType($this->getFileMock());
         $filename = $exporter->process($membership->bar->id, 'recipes.zip');
 
-        $this->assertTrue(str_ends_with($filename, 'exports/1/recipes.zip'));
+        $this->assertSame($filename, '1/recipes.zip');
     }
 
     public function test_default_export_contains_schema_files(): void
     {
+        $exportMock = $this->getFileMock();
         Storage::fake('uploads');
 
         $membership = $this->setupBarMembership();
@@ -55,8 +56,9 @@ public function test_default_export_contains_schema_files(): void
             'file_extension' => $ingredientCocktailFile->extension(),
         ]);
 
-        $exporter = new ToRecipeType($this->getFileMock());
+        $exporter = new ToRecipeType($exportMock);
         $filename = $exporter->process($membership->bar->id, 'recipes.zip');
+        $filename = $exportMock->disk()->path($filename);
 
         $unzippedFilesDisk = Storage::fake('temp-recipes-unzip');
 

tests/Feature/Http/ImportControllerTest.php

@@ -65,7 +65,7 @@ public function test_import_csv_ingredients_from_file(): void
             'strength' => 40,
             'description' => 'Bitter liquer',
             'origin' => 'Italy',
-            'color' => '#008800',
+            'color' => null,
             'bar_id' => $membership->bar_id,
             'created_user_id' => $membership->user_id,
         ]);

tests/Feature/Http/ShoppingListControllerTest.php

@@ -7,9 +7,9 @@
 use Tests\TestCase;
 use Kami\Cocktail\Models\Ingredient;
 use Kami\Cocktail\Models\UserShoppingList;
+use Kami\Cocktail\Models\Enums\UserRoleEnum;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Kami\Cocktail\Models\Enums\UserRoleEnum;
 
 class ShoppingListControllerTest extends TestCase
 {