Merge pull request #415 from slywalker/fix-error-when-class-name

Fixed error when class name was specified
FriendsOfCake · Nov 21, 2016 · f0982d7 · f0982d7
2 parents 90f3f8a + 73d9cc9
commit f0982d7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/Model/Behavior/UploadBehavior.php b/src/Model/Behavior/UploadBehavior.php
@@ -35,6 +35,7 @@ public function initialize(array $config)
         }
 
         $this->config($configs);
+        $this->config('className', null);
 
         Type::map('upload.file', 'Josegonzalez\Upload\Database\Type\FileType');
         $schema = $this->_table->schema();

diff --git a/tests/TestCase/Model/Behavior/UploadBehaviorTest.php b/tests/TestCase/Model/Behavior/UploadBehaviorTest.php
@@ -70,7 +70,7 @@ public function testInitialize()
         $property->setAccessible(true);
         $property->setValue($behavior, $table);
 
-        $behavior->expects($this->exactly(2))
+        $behavior->expects($this->exactly(3))
                  ->method('config')
                  ->will($this->returnValue($this->settings));
 
@@ -113,6 +113,35 @@ public function testInitializeIndexedConfig()
         $this->assertEquals(['field' => []], $behavior->config());
     }
 
+    public function testInitializeAddBehaviorOptionsInterfaceConfig()
+    {
+        $settings = [
+            'className' => 'Josegonzalez\Upload\Model\Behavior\UploadBehavior',
+            'field' => []
+        ];
+        $table = $this->getMock('Cake\ORM\Table');
+        $schema = $this->getMock('Cake\Database\Schema\Table', [], [$table, []]);
+        $schema->expects($this->once())
+            ->method('columnType')
+            ->with('field', 'upload.file');
+        $table->expects($this->at(0))
+            ->method('schema')
+            ->will($this->returnValue($schema));
+        $table->expects($this->at(1))
+            ->method('schema')
+            ->will($this->returnValue($schema));
+
+        $methods = array_diff($this->behaviorMethods, ['initialize', 'config']);
+        $behavior = $this->getMock('Josegonzalez\Upload\Model\Behavior\UploadBehavior', $methods, [$table, $settings], '', false);
+        $reflection = new ReflectionClass($behavior);
+        $property = $reflection->getProperty('_table');
+        $property->setAccessible(true);
+        $property->setValue($behavior, $table);
+        $behavior->initialize($settings);
+
+        $this->assertEquals(['field' => []], $behavior->config());
+    }
+
     public function testBeforeMarshalOk()
     {
         $validator = $this->getMock('Cake\Validation\Validator');