Merge pull request #389 from Phillaf/master

Prevent erasing _config that's been set in the constructor

phpunit.xml.dist

@@ -21,6 +21,7 @@
         <blacklist>
             <directory suffix=".php">./docs</directory>
             <directory suffix=".php">./vendor</directory>
+            <directory suffix=".php">./tests</directory>
             <file>./tests/bootstrap.php</file>
         </blacklist>
     </filter>

src/Model/Behavior/UploadBehavior.php

@@ -34,7 +34,6 @@ public function initialize(array $config)
             }
         }
 
-        $this->_config = [];
         $this->config($configs);
 
         Type::map('upload.file', 'Josegonzalez\Upload\Database\Type\FileType');

tests/Fixture/FilesFixture.php

@@ -0,0 +1,41 @@
+<?php
+namespace Josegonzalez\Upload\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class FilesFixture extends TestFixture
+{
+    public $table = 'files';
+
+    /**
+     * fields property
+     *
+     * @var array
+     */
+    public $fields = [
+        'id' => ['type' => 'integer'],
+        'filename' => ['type' => 'integer'],
+        'created' => ['type' => 'datetime', 'null' => true],
+        '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]]
+    ];
+
+    /**
+     * records property
+     *
+     * @var array
+     */
+    public $records = [
+        ['filename' => 'FileOne'],
+        ['filename' => 'FileTwo'],
+        ['filename' => 'FileThree'],
+    ];
+
+    public function init()
+    {
+        $created = $modified = date('Y-m-d H:i:s');
+        array_walk($this->records, function (&$record) use ($created, $modified) {
+            $record += compact('created');
+        });
+        parent::init();
+    }
+}

tests/Stub/ChildBehavior.php

@@ -0,0 +1,9 @@
+<?php
+namespace Josegonzalez\Upload\Test\Stub;
+
+use Josegonzalez\Upload\Model\Behavior\UploadBehavior;
+
+class ChildBehavior extends UploadBehavior
+{
+    protected $_defaultConfig = ['key' => 'value'];
+}

tests/TestCase/Model/Behavior/UploadBehaviorTest.php

@@ -5,12 +5,18 @@
 use Cake\Event\Event;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;
+use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use Josegonzalez\Upload\Model\Behavior\UploadBehavior;
+use Josegonzalez\Upload\Test\Stub\ChildBehavior;
 use ReflectionClass;
 
 class UploadBehaviorTest extends TestCase
 {
+    public $fixtures = [
+        'plugin.Josegonzalez/Upload.Files',
+    ];
+
     public function setup()
     {
         $this->entity = $this->getMock('Cake\ORM\Entity');
@@ -71,6 +77,16 @@ public function testInitialize()
         $behavior->initialize($this->settings);
     }
 
+    public function testInheritedConfig()
+    {
+        $table = TableRegistry::get('Josegonzales/Upload.Files');
+        $behavior = new ChildBehavior($table, []);
+
+        $result = $behavior->config();
+        $expected = ['key' => 'value'];
+        $this->assertEquals($expected, $result);
+    }
+
     public function testInitializeIndexedConfig()
     {
         $settings = ['field'];