Fix failing tests

Author: SOHELAHMED7

tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000002_delete_table_ubigpks.php

@@ -15,12 +15,6 @@ public function down()
         $this->createTable('{{%ubigpks}}', [
             'id' => $this->bigPrimaryKey()->unsigned(),
             'name' => $this->string(150)->null()->defaultValue(null),
-            'size' => 'enum("x-small", "small", "medium", "large", "x-large") NOT NULL DEFAULT \'x-small\'',
-            'd' => 'smallint(5) unsigned zerofill NULL DEFAULT NULL',
-            'e' => 'mediumint(8) unsigned zerofill NULL DEFAULT NULL',
-            'f' => 'decimal(12,4) NULL DEFAULT NULL',
-            'dp' => $this->double()->null()->defaultValue(null),
-            'dp2' => 'double(10,4) NULL DEFAULT NULL',
         ]);
     }
 }

tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php

@@ -7,12 +7,6 @@
  *
  * @property string $id
  * @property string $name
- * @property string $size
- * @property integer $d
- * @property integer $e
- * @property string $f
- * @property double $dp
- * @property double $dp2
  *
  */
 abstract class Ubigpk extends \yii\db\ActiveRecord
@@ -25,22 +19,8 @@ public static function tableName()
     public function rules()
     {
         return [
-            'trim' => [['name', 'f'], 'trim'],
+            'trim' => [['name'], 'trim'],
             'name_string' => [['name'], 'string', 'max' => 150],
-            'size_string' => [['size'], 'string'],
-            'size_in' => [['size'], 'in', 'range' => [
-                'x-small',
-                'small',
-                'medium',
-                'large',
-                'x-large',
-            ]],
-            'size_default' => [['size'], 'default', 'value' => 'x-small'],
-            'd_integer' => [['d'], 'integer'],
-            'e_integer' => [['e'], 'integer'],
-            'f_string' => [['f'], 'string', 'max' => 12],
-            'dp_double' => [['dp'], 'double'],
-            'dp2_double' => [['dp2'], 'double'],
         ];
     }
 }

tests/unit/IssueFixTest.php

@@ -239,48 +239,48 @@ public function testNullableFalseInRequired()
         $this->checkFiles($actualFiles, $expectedFiles);
     }
 
-    // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
-    // https://github.com/cebe/yii2-openapi/issues/132
     // https://github.com/php-openapi/yii2-openapi/pull/4#discussion_r1688225258
     public function testCreateMigrationForDropTable132IndependentTablesDropSort()
     {
         $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.php");
-        $this->createTablesForCreateMigrationForDropTable132();
+
+        Yii::$app->db->createCommand()->createTable('{{%upks}}', [
+            'id' => 'upk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%bigpks}}', [
+            'id' => 'bigpk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%ubigpks}}', [
+            'id' => 'ubigpk',
+            'name' => 'string(150)',
+        ])->execute();
+
         $this->runGenerator($testFile);
         $this->runActualMigrations('mysql', 4);
 
         $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
-           'recursive' => true,
+            'recursive' => true,
         ]);
         $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql"), [
-           'recursive' => true,
+            'recursive' => true,
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
 
-        $this->deleteTablesForCreateMigrationForDropTable132();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
     }
 
     // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
     // https://github.com/cebe/yii2-openapi/issues/132
     public function testCreateMigrationForDropTable132()
     {
         $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
-
-        Yii::$app->db->createCommand()->createTable('{{%upks}}', [
-            'id' => 'upk',
-            'name' => 'string(150)',
-        ])->execute();
-        Yii::$app->db->createCommand()->createTable('{{%bigpks}}', [
-            'id' => 'bigpk',
-            'name' => 'string(150)',
-        ])->execute();
-        Yii::$app->db->createCommand()->createTable('{{%ubigpks}}', [
-            'id' => 'ubigpk',
-            'name' => 'string(150)',
-        ])->execute();
-
+        $this->createTablesForCreateMigrationForDropTable132();
         $this->runGenerator($testFile);
-        $this->runActualMigrations('mysql', 3);
+        $this->runActualMigrations('mysql', 8);
 
         $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
            'recursive' => true,
@@ -290,9 +290,7 @@ public function testCreateMigrationForDropTable132()
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
 
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
+        $this->deleteTablesForCreateMigrationForDropTable132();
     }
 
     private function createTablesForCreateMigrationForDropTable132()