Merge pull request #384 from cakephp/fix-fixture-issue

Correctly set the connection when using fixtures.

Author: lorenzo

src/Model/Table/LazyTableTrait.php

@@ -45,7 +45,7 @@ public function ensureTables(array $fixtures)
             if ($class === false) {
                 throw new \RuntimeException("Unknown fixture '$name'.");
             }
-            $fixture = new $class();
+            $fixture = new $class($this->connection()->configName());
             $table = $fixture->table;
             if (in_array($table, $existing)) {
                 continue;

tests/Fixture/PanelsFixture.php

@@ -21,7 +21,6 @@
  */
 class PanelsFixture extends TestFixture
 {
-
     /**
      * fields property
      *
@@ -61,4 +60,17 @@ class PanelsFixture extends TestFixture
             'content' => 'a:5:{s:6:"params";a:5:{s:6:"plugin";N;s:10:"controller";s:5:"Tasks";s:6:"action";s:3:"add";s:4:"_ext";N;s:4:"pass";a:0:{}}s:5:"query";a:0:{}s:4:"data";a:0:{}s:6:"cookie";a:2:{s:14:"toolbarDisplay";s:4:"show";s:7:"CAKEPHP";s:26:"9pk8sa2ot6pclki9f4iakio560";}s:3:"get";a:0:{}}'
         ]
     ];
+
+    /**
+     * Constructor
+     *
+     * @param string $connection The connection name to use.
+     */
+    public function __construct($connection = null)
+    {
+        if ($connection) {
+            $this->connection = $connection;
+        }
+        $this->init();
+    }
 }

tests/Fixture/RequestsFixture.php

@@ -21,7 +21,6 @@
  */
 class RequestsFixture extends TestFixture
 {
-
     /**
      * fields property
      *
@@ -53,4 +52,17 @@ class RequestsFixture extends TestFixture
             'requested_at' => '2014-08-21 7:41:12'
         ]
     ];
+
+    /**
+     * Constructor
+     *
+     * @param string $connection The connection name to use.
+     */
+    public function __construct($connection = null)
+    {
+        if ($connection) {
+            $this->connection = $connection;
+        }
+        $this->init();
+    }
 }

tests/TestCase/Model/Table/RequestTableTest.php

@@ -33,9 +33,8 @@ public function testInitializeCreatesSchema()
     {
         $connection = ConnectionManager::get('test');
         $this->skipIf($connection->driver() instanceof Sqlite, 'Schema insertion/removal breaks SQLite');
-
         TableRegistry::clear();
-        
+
         $stmt = $connection->execute('DROP TABLE IF EXISTS panels');
         $stmt->closeCursor();