Update the tests so they pass again following the release of phinx 0.4.6

This phinx release introduced changes in the naming scheme the migration files / the migration classes should follow, breaking the tests. This commit also removes the ``update()`` call after the ``dropForeignKey()`` calls : it was not necessary.
cakephp · Sep 12, 2015 · 19f31d1 · 19f31d1
1 parent 325c93c
commit 19f31d1
Show file tree

Hide file tree

Showing 12 changed files with 93 additions and 74 deletions.
diff --git a/src/Template/Bake/config/snapshot.ctp b/src/Template/Bake/config/snapshot.ctp
@@ -151,14 +151,15 @@ class <%= $name %> extends AbstractMigration
 
     public function down()
     {
-        <%- foreach ($dropForeignKeys as $table => $columnsList): %>
+        <%- foreach ($dropForeignKeys as $table => $columnsList):
+                $maxKey = count($columnsList) - 1;
+        %>
         $this->table('<%= $table %>')
-            <%- foreach ($columnsList as $columns): %>
+            <%- foreach ($columnsList as $key => $columns): %>
             ->dropForeignKey(
                 <%= $columns %>
-            )
+            )<%= ($key === $maxKey) ? ';' : '' %>
             <%- endforeach; %>
-            ->update();
 
         <%- endforeach; %>
         <%- foreach ($tables as $table): %>

diff --git a/tests/TestCase/MigrationsTest.php b/tests/TestCase/MigrationsTest.php
@@ -39,6 +39,20 @@ class MigrationsTest extends TestCase
      */
     protected $Connection;
 
+    protected $timestamps = [
+        'test_composite_constraints_snapshot_pgsql' => 20150912015600,
+        'test_not_empty_snapshot_pgsql' => 20150912015601,
+        'test_auto_id_disabled_snapshot_pgsql' => 20150912015602,
+        'test_composite_constraints_snapshot_sqlite' => 20150912015603,
+        'test_not_empty_snapshot_sqlite' => 20150912015604,
+        'test_auto_id_disabled_snapshot_sqlite' => 20150912015605,
+        'test_composite_constraints_snapshot' => 20150912015606,
+        'test_not_empty_snapshot' => 20150912015607,
+        'test_auto_id_disabled_snapshot' => 20150912015608,
+        'testCreatePrimaryKey' => 20150912015609,
+        'testCreatePrimaryKeyUuid' => 20150912015610
+    ];
+
     /**
      * Setup method
      *
@@ -430,13 +444,13 @@ public function testMigrateDateOption()
     public function testMigrateSnapshots($basePath, $files)
     {
         $destination = ROOT . 'config' . DS . 'SnapshotTests' . DS;
-        $timestamp = Util::getCurrentTimestamp();
 
         if (!file_exists($destination)) {
             mkdir($destination);
         }
 
         foreach ($files as $file) {
+            $timestamp = $this->timestamps[$file];
             $copiedFileName = $timestamp . '_' . $file . '.php';
             copy(
                 $basePath . $file . '.php',
@@ -462,21 +476,30 @@ public function migrationsProvider()
             [
                 Plugin::path('Migrations') . 'tests' . DS . 'comparisons' . DS . 'Migration' . DS,
                 [
-                    'testCompositeConstraintsSnapshot',
-                    'testNotEmptySnapshot',
-                    'testAutoIdDisabledSnapshot',
+                    'test_composite_constraints_snapshot',
+                    'test_not_empty_snapshot',
+                    'test_auto_id_disabled_snapshot',
                     'testCreatePrimaryKey',
                     'testCreatePrimaryKeyUuid'
                 ]
             ],
-            [
-                Plugin::path('Migrations') . 'tests' . DS . 'comparisons' . DS . 'Migration' . DS . 'sqlite' . DS,
-                ['testCompositeConstraintsSnapshot', 'testNotEmptySnapshot', 'testAutoIdDisabledSnapshot']
-            ],
             [
                 Plugin::path('Migrations') . 'tests' . DS . 'comparisons' . DS . 'Migration' . DS . 'pgsql' . DS,
-                ['testCompositeConstraintsSnapshot', 'testNotEmptySnapshot', 'testAutoIdDisabledSnapshot']
+                [
+                    'test_composite_constraints_snapshot_pgsql',
+                    'test_not_empty_snapshot_pgsql',
+                    'test_auto_id_disabled_snapshot_pgsql'
+                ]
             ]
+            ,
+            [
+                Plugin::path('Migrations') . 'tests' . DS . 'comparisons' . DS . 'Migration' . DS . 'sqlite' . DS,
+                [
+                    'test_composite_constraints_snapshot_sqlite',
+                    'test_not_empty_snapshot_sqlite',
+                    'test_auto_id_disabled_snapshot_sqlite'
+                ]
+            ],
         ];
     }
 }
diff --git a/tests/TestCase/Shell/Task/MigrationSnapshotTaskTest.php b/tests/TestCase/Shell/Task/MigrationSnapshotTaskTest.php
@@ -16,6 +16,7 @@
 use Cake\Core\Plugin;
 use Cake\TestSuite\StringCompareTrait;
 use Cake\TestSuite\TestCase;
+use Cake\Utility\Inflector;
 
 /**
  * MigrationSnapshotTaskTest class
@@ -85,9 +86,10 @@ public function testNotEmptySnapshot()
                 )
             );
 
-        $result = $this->Task->bake('NotEmptySnapshot');
+        $bakeName = $this->getBakeName('TestNotEmptySnapshot');
+        $result = $this->Task->bake($bakeName);
 
-        $this->assertCorrectSnapshot(__FUNCTION__, $result);
+        $this->assertCorrectSnapshot($bakeName, $result);
     }
 
     public function testAutoIdDisabledSnapshot()
@@ -97,9 +99,10 @@ public function testAutoIdDisabledSnapshot()
         $this->Task->params['connection'] = 'test';
         $this->Task->params['plugin'] = 'BogusPlugin';
 
-        $result = $this->Task->bake('AutoIdDisabledSnapshot');
+        $bakeName = $this->getBakeName('TestAutoIdDisabledSnapshot');
+        $result = $this->Task->bake($bakeName);
 
-        $this->assertCorrectSnapshot(__FUNCTION__, $result);
+        $this->assertCorrectSnapshot($bakeName, $result);
     }
 
     public function testCompositeConstraintsSnapshot()
@@ -116,18 +119,31 @@ public function testCompositeConstraintsSnapshot()
 
         $this->Task->params['require-table'] = false;
         $this->Task->params['connection'] = 'test';
-        $result = $this->Task->bake('CompositeConstraintsSnapshot');
 
-        $this->assertCorrectSnapshot(__FUNCTION__, $result);
+        $bakeName = $this->getBakeName('TestCompositeConstraintsSnapshot');
+        $result = $this->Task->bake($bakeName);
+
+        $this->assertCorrectSnapshot($bakeName, $result);
+    }
+
+    public function getBakeName($name)
+    {
+        $dbenv = getenv("DB");
+        if ($dbenv !== 'mysql') {
+            $name .= ucfirst($dbenv);
+        }
+
+        return $name;
     }
 
-    public function assertCorrectSnapshot($function, $result)
+    public function assertCorrectSnapshot($bakeName, $result)
     {
         $dbenv = getenv("DB");
-        if (file_exists($this->_compareBasePath . $dbenv . DS . $function . '.php')) {
-            $this->assertSameAsFile($dbenv . DS . $function . '.php', $result);
+        $bakeName = Inflector::underscore($bakeName);
+        if (file_exists($this->_compareBasePath . $dbenv . DS . $bakeName . '.php')) {
+            $this->assertSameAsFile($dbenv . DS . $bakeName . '.php', $result);
         } else {
-            $this->assertSameAsFile($function . '.php', $result);
+            $this->assertSameAsFile($bakeName . '.php', $result);
         }
     }
 }
diff --git a/...tion/pgsql/testAutoIdDisabledSnapshot.php → .../test_auto_id_disabled_snapshot_pgsql.php b/...tion/pgsql/testAutoIdDisabledSnapshot.php → .../test_auto_id_disabled_snapshot_pgsql.php
@@ -1,7 +1,7 @@
 <?php
 use Migrations\AbstractMigration;
 
-class AutoIdDisabledSnapshot extends AbstractMigration
+class TestAutoIdDisabledSnapshotPgsql extends AbstractMigration
 {
 
     public $autoId = false;
@@ -297,14 +297,12 @@ public function down()
             )
             ->dropForeignKey(
                 'product_id'
-            )
-            ->update();
+            );
 
         $this->table('products')
             ->dropForeignKey(
                 'category_id'
-            )
-            ->update();
+            );
 
         $this->dropTable('articles');
         $this->dropTable('categories');

diff --git a/...gsql/testCompositeConstraintsSnapshot.php → ..._composite_constraints_snapshot_pgsql.php b/...gsql/testCompositeConstraintsSnapshot.php → ..._composite_constraints_snapshot_pgsql.php
@@ -1,7 +1,7 @@
 <?php
 use Migrations\AbstractMigration;
 
-class CompositeConstraintsSnapshot extends AbstractMigration
+class TestCompositeConstraintsSnapshotPgsql extends AbstractMigration
 {
     public function up()
     {
@@ -295,23 +295,20 @@ public function down()
             )
             ->dropForeignKey(
                 'product_id'
-            )
-            ->update();
+            );
 
         $this->table('orders')
             ->dropForeignKey(
                 [
                     'product_category',
                     'product_id',
                 ]
-            )
-            ->update();
+            );
 
         $this->table('products')
             ->dropForeignKey(
                 'category_id'
-            )
-            ->update();
+            );
 
         $this->dropTable('articles');
         $this->dropTable('categories');

diff --git a/.../Migration/pgsql/testNotEmptySnapshot.php → ...n/pgsql/test_not_empty_snapshot_pgsql.php b/.../Migration/pgsql/testNotEmptySnapshot.php → ...n/pgsql/test_not_empty_snapshot_pgsql.php
@@ -1,7 +1,7 @@
 <?php
 use Migrations\AbstractMigration;
 
-class NotEmptySnapshot extends AbstractMigration
+class TestNotEmptySnapshotPgsql extends AbstractMigration
 {
     public function up()
     {
@@ -257,14 +257,12 @@ public function down()
             )
             ->dropForeignKey(
                 'product_id'
-            )
-            ->update();
+            );
 
         $this->table('products')
             ->dropForeignKey(
                 'category_id'
-            )
-            ->update();
+            );
 
         $this->dropTable('articles');
         $this->dropTable('categories');

diff --git a/...ion/sqlite/testAutoIdDisabledSnapshot.php → ...test_auto_id_disabled_snapshot_sqlite.php b/...ion/sqlite/testAutoIdDisabledSnapshot.php → ...test_auto_id_disabled_snapshot_sqlite.php
@@ -1,7 +1,7 @@
 <?php
 use Migrations\AbstractMigration;
 
-class AutoIdDisabledSnapshot extends AbstractMigration
+class TestAutoIdDisabledSnapshotSqlite extends AbstractMigration
 {
 
     public $autoId = false;
@@ -296,14 +296,12 @@ public function down()
             )
             ->dropForeignKey(
                 'product_id'
-            )
-            ->update();
+            );
 
         $this->table('products')
             ->dropForeignKey(
                 'category_id'
-            )
-            ->update();
+            );
 
         $this->dropTable('articles');
         $this->dropTable('categories');

diff --git a/...lite/testCompositeConstraintsSnapshot.php → ...composite_constraints_snapshot_sqlite.php b/...lite/testCompositeConstraintsSnapshot.php → ...composite_constraints_snapshot_sqlite.php
@@ -1,7 +1,7 @@
 <?php
 use Migrations\AbstractMigration;
 
-class CompositeConstraintsSnapshot extends AbstractMigration
+class TestCompositeConstraintsSnapshotSqlite extends AbstractMigration
 {
     public function up()
     {
@@ -294,23 +294,20 @@ public function down()
             )
             ->dropForeignKey(
                 'product_id'
-            )
-            ->update();
+            );
 
         $this->table('orders')
             ->dropForeignKey(
                 [
                     'product_category',
                     'product_id',
                 ]
-            )
-            ->update();
+            );
 
         $this->table('products')
             ->dropForeignKey(
                 'category_id'
-            )
-            ->update();
+            );
 
         $this->dropTable('articles');
         $this->dropTable('categories');

diff --git a/...Migration/sqlite/testNotEmptySnapshot.php → ...sqlite/test_not_empty_snapshot_sqlite.php b/...Migration/sqlite/testNotEmptySnapshot.php → ...sqlite/test_not_empty_snapshot_sqlite.php
@@ -1,7 +1,7 @@
 <?php
 use Migrations\AbstractMigration;
 
-class NotEmptySnapshot extends AbstractMigration
+class TestNotEmptySnapshotSqlite extends AbstractMigration
 {
     public function up()
     {
@@ -256,14 +256,12 @@ public function down()
             )
             ->dropForeignKey(
                 'product_id'
-            )
-            ->update();
+            );
 
         $this->table('products')
             ->dropForeignKey(
                 'category_id'
-            )
-            ->update();
+            );
 
         $this->dropTable('articles');
         $this->dropTable('categories');

diff --git a/.../Migration/testAutoIdDisabledSnapshot.php → ...ration/test_auto_id_disabled_snapshot.php b/.../Migration/testAutoIdDisabledSnapshot.php → ...ration/test_auto_id_disabled_snapshot.php
@@ -1,7 +1,7 @@
 <?php
 use Migrations\AbstractMigration;
 
-class AutoIdDisabledSnapshot extends AbstractMigration
+class TestAutoIdDisabledSnapshot extends AbstractMigration
 {
 
     public $autoId = false;
@@ -297,14 +297,12 @@ public function down()
             )
             ->dropForeignKey(
                 'product_id'
-            )
-            ->update();
+            );
 
         $this->table('products')
             ->dropForeignKey(
                 'category_id'
-            )
-            ->update();
+            );
 
         $this->dropTable('articles');
         $this->dropTable('categories');