Update tests

Author: karlomikus

CHANGELOG.md

@@ -1,3 +1,8 @@
+# v5.5.1
+## Fixes
+- Fixed missing cocktail recipes with duplicated names in datapack export
+- Fixed total missing ingredients counting when filtering by ingredient
+
 # v5.5.0
 ## New
 - Added images upload support to glass types

app/Http/Controllers/ExportController.php

@@ -48,7 +48,7 @@ public function index(Request $request): JsonResource
     #[BAO\RateLimitResponse]
     public function store(Request $request): ExportResource
     {
-        $bar = Bar::findOrFail($request->post('bar_id'));
+        $bar = Bar::findOrFail((int) $request->post('bar_id'));
 
         if ($request->user()->cannot('createExport', $bar)) {
             abort(403);

composer.lock

@@ -79,18 +79,18 @@ public function test_export_contains_files(): void
             $this->assertFileExists($unzippedFilesDisk->path($file));
         }
 
-        $this->assertFileExists($unzippedFilesDisk->path('cocktails/gin-and-tonic/data.json'));
-        $this->assertFileExists($unzippedFilesDisk->path('cocktails/gin-and-tonic/c-1-img.jpg'));
-        $this->assertFileExists($unzippedFilesDisk->path('ingredients/jack-daniels/data.json'));
-        $this->assertFileExists($unzippedFilesDisk->path('ingredients/jack-daniels/i-1-img.png'));
+        $this->assertFileExists($unzippedFilesDisk->path('cocktails/gin-and-tonic_1/data.json'));
+        $this->assertFileExists($unzippedFilesDisk->path('cocktails/gin-and-tonic_1/c-1-img.jpg'));
+        $this->assertFileExists($unzippedFilesDisk->path('ingredients/jack-daniels_1/data.json'));
+        $this->assertFileExists($unzippedFilesDisk->path('ingredients/jack-daniels_1/i-1-img.png'));
 
         $cocktailExport = [];
-        if ($cocktailFixture = file_get_contents($unzippedFilesDisk->path('cocktails/gin-and-tonic/data.json'))) {
+        if ($cocktailFixture = file_get_contents($unzippedFilesDisk->path('cocktails/gin-and-tonic_1/data.json'))) {
             $cocktailExport = json_decode($cocktailFixture, true);
         }
 
         $ingredientExport = [];
-        if ($ingredientFixture = file_get_contents($unzippedFilesDisk->path('ingredients/jack-daniels/data.json'))) {
+        if ($ingredientFixture = file_get_contents($unzippedFilesDisk->path('ingredients/jack-daniels_1/data.json'))) {
             $ingredientExport = json_decode($ingredientFixture, true);
         }
 

tests/Feature/External/ToDataPackTest.php

@@ -68,8 +68,8 @@ public function test_default_export_contains_schema_files(): void
         $zip->close();
 
         $this->assertFileExists($unzippedFilesDisk->path('_meta.json'));
-        $this->assertFileExists($unzippedFilesDisk->path('cocktails/gin-and-tonic/recipe.json'));
-        $this->assertFileExists($unzippedFilesDisk->path('cocktails/gin-and-tonic/c-1-img.jpg'));
+        $this->assertFileExists($unzippedFilesDisk->path('cocktails/gin-and-tonic_1/recipe.json'));
+        $this->assertFileExists($unzippedFilesDisk->path('cocktails/gin-and-tonic_1/c-1-img.jpg'));
     }
 
     /**

tests/Feature/External/ToRecipeTypeTest.php

@@ -6,10 +6,10 @@
 
 use Tests\TestCase;
 use Kami\Cocktail\Models\Ingredient;
+use Kami\Cocktail\Models\UserIngredient;
 use Kami\Cocktail\Models\ComplexIngredient;
 use Kami\Cocktail\Services\IngredientService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Kami\Cocktail\Models\UserIngredient;
 
 class IngredientServiceTest extends TestCase
 {

tests/Feature/Services/IngredientServiceTest.php

@@ -1,6 +1,6 @@
 {
     "recipe": {
-        "_id": "gin-and-tonic",
+        "_id": "gin-and-tonic_1",
         "name": "Gin and Tonic",
         "instructions": "Cocktail instructions go here",
         "created_at": "2020-01-01T12:00:00+00:00",
@@ -23,7 +23,7 @@
         ],
         "ingredients": [
             {
-                "_id": "gin",
+                "_id": "gin_1",
                 "amount": 45,
                 "units": "ml",
                 "optional": false,
@@ -37,7 +37,7 @@
     },
     "ingredients": [
         {
-            "_id": "gin",
+            "_id": "gin_1",
             "name": "Gin",
             "strength": 40,
             "description": "Test description",

tests/fixtures/external/recipe.json

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <draft2>
   <recipe>
-    <_id>gin-and-tonic</_id>
+    <_id>gin-and-tonic_1</_id>
     <name>Gin and Tonic</name>
     <instructions>Cocktail instructions go here</instructions>
     <created_at>2020-01-01T12:00:00+00:00</created_at>
@@ -21,7 +21,7 @@
       <copyright>Exported copyright</copyright>
     </images>
     <ingredients>
-      <_id>gin</_id>
+      <_id>gin_1</_id>
       <amount>45</amount>
       <units>ml</units>
       <optional></optional>
@@ -33,7 +33,7 @@
     </ingredients>
   </recipe>
   <ingredients>
-    <_id>gin</_id>
+    <_id>gin_1</_id>
     <name>Gin</name>
     <strength>40</strength>
     <description>Test description</description>

tests/fixtures/external/recipe.xml

@@ -1,5 +1,5 @@
 recipe:
-  _id: gin-and-tonic
+  _id: gin-and-tonic_1
   name: 'Gin and Tonic'
   instructions: 'Cocktail instructions go here'
   created_at: '2020-01-01T12:00:00+00:00'
@@ -20,7 +20,7 @@ recipe:
       copyright: 'Exported copyright'
   ingredients:
     -
-      _id: gin
+      _id: gin_1
       amount: 45.0
       units: ml
       optional: false
@@ -31,7 +31,7 @@ recipe:
       sort: 1
 ingredients:
   -
-    _id: gin
+    _id: gin_1
     name: Gin
     strength: 40.0
     description: 'Test description'