Fix tests (#9)

Fix tests
dereuromark · Nov 14, 2023 · 79938d5 · 79938d5
1 parent aa8a094
commit 79938d5
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 56 deletions.
diff --git a/src/Model/Table/FileStorageTable.php b/src/Model/Table/FileStorageTable.php
@@ -6,6 +6,7 @@
 use Cake\Core\Configure;
 use Cake\Database\Schema\TableSchemaInterface;
 use Cake\ORM\Table;
+use FileStorage\Database\Type\ArrayType;
 
 /**
  * FileStorageTable

diff --git a/tests/TestCase/FileStorageTestCase.php b/tests/TestCase/FileStorageTestCase.php
@@ -8,6 +8,7 @@
 use Cake\ORM\Locator\LocatorAwareTrait;
 use Cake\TestSuite\TestCase;
 use FileStorage\Filesystem\Folder;
+use FileStorage\Model\Table\FileStorageTable;
 use Intervention\Image\ImageManager;
 use PhpCollective\Infrastructure\Storage\Factories\LocalFactory;
 use PhpCollective\Infrastructure\Storage\FileStorage;
@@ -80,7 +81,7 @@ public function setUp(): void
 
         $this->FileStorage = $this
             ->getTableLocator()
-            ->get(FileStorageTestTable::class);
+            ->get(FileStorageTable::class);
     }
 
     /**

diff --git a/tests/TestCase/FileStorageTestTable.php b/tests/TestCase/FileStorageTestTable.php
diff --git a/tests/TestCase/Model/Behavior/FileStorageBehaviorTest.php b/tests/TestCase/Model/Behavior/FileStorageBehaviorTest.php
@@ -6,8 +6,8 @@
 use ArrayObject;
 use Cake\Core\Configure;
 use Cake\Event\Event;
+use FileStorage\Model\Table\FileStorageTable;
 use FileStorage\Test\TestCase\FileStorageTestCase;
-use FileStorage\Test\TestCase\FileStorageTestTable;
 use Laminas\Diactoros\UploadedFile;
 
 /**
@@ -37,7 +37,7 @@ public function setUp(): void
         parent::setUp();
 
         $this->getTableLocator()->clear();
-        $this->FileStorage = $this->getTableLocator()->get(FileStorageTestTable::class);
+        $this->FileStorage = $this->getTableLocator()->get(FileStorageTable::class);
 
         $this->FileStorage->addBehavior(
             'FileStorage.FileStorage',

diff --git a/tests/TestCase/Model/Entity/FileStorageTest.php b/tests/TestCase/Model/Entity/FileStorageTest.php
@@ -8,6 +8,33 @@
 
 class FileStorageTest extends FileStorageTestCase
 {
+    /**
+     * @return void
+     */
+    public function testNew(): void
+    {
+        $image = $this->FileStorage->newEntity([
+            'filename' => 'testimage.jpg',
+            'model' => 'Test',
+            'foreign_key' => 1,
+            'path' => 'test/path/testimage.jpg',
+            'extension' => 'jpg',
+            'adapter' => 'Local',
+            'variants' => [
+                't150' => [
+                    'path' => 'test/path/testimage.c3f33c2a.jpg',
+                    'url' => '',
+                ],
+            ],
+            'metadata' => [
+                'foo' => 'bar',
+            ],
+        ]);
+
+        $this->assertNotEmpty($image->variants);
+        $this->assertNotEmpty($image->metadata);
+    }
+
     /**
      * @return void
      */

diff --git a/tests/TestCase/View/Helper/ImageHelperTest.php b/tests/TestCase/View/Helper/ImageHelperTest.php
@@ -66,16 +66,14 @@ public function tearDown(): void
     }
 
     /**
-     * testImageUrl
-     *
      * @return void
      */
     public function testImageUrl()
     {
         $image = $this->FileStorage->newEntity([
-            'id' => 'e479b480-f60b-11e1-a21f-0800200c9a66',
             'filename' => 'testimage.jpg',
             'model' => 'Test',
+            'foreign_key' => 1,
             'path' => 'test/path/testimage.jpg',
             'extension' => 'jpg',
             'adapter' => 'Local',
@@ -85,7 +83,7 @@ public function testImageUrl()
                     'url' => '',
                 ],
             ],
-        ], ['accessibleFields' => ['*' => true]]);
+        ]);
 
         $result = $this->helper->imageUrl($image, 't150', ['pathPrefix' => '/src/']);
         $this->assertEquals('/src/test/path/testimage.c3f33c2a.jpg', $result);
@@ -95,8 +93,6 @@ public function testImageUrl()
     }
 
     /**
-     * testImage
-     *
      * @return void
      */
     public function testImageUrlInvalidArgumentException()