#2 - Move Migrations::resetStorage() into tearDown() method

phalcon · Feb 1, 2020 · 1f89e37 · 1f89e37
1 parent c3e8b94
commit 1f89e37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tests/Integration/IntegrationTestCase.php b/tests/Integration/IntegrationTestCase.php
@@ -6,6 +6,7 @@
 use Phalcon\Config;
 use Phalcon\Db\Adapter\Pdo\AbstractPdo;
 use Phalcon\Db\Adapter\PdoFactory;
+use Phalcon\Migrations\Migrations;
 use PHPUnit\Framework\TestCase;
 use function Phalcon\Migrations\Tests\remove_dir;
 use function Phalcon\Migrations\Tests\root_path;
@@ -61,6 +62,11 @@ public function tearDown(): void
          * Cleanup Database
          */
         $this->db->query('DROP DATABASE IF EXISTS `' . getenv('TEST_DB_DATABASE') . '`;');
+
+        /**
+         * Reset filename or DB connection
+         */
+        Migrations::resetStorage();
     }
 
     protected function initializeDatabase(): AbstractPdo

diff --git a/tests/Integration/Issue29Test.php b/tests/Integration/Issue29Test.php
@@ -16,8 +16,6 @@ public function testIssue29(): void
             'migrationsInDb' => true,
         ]);
 
-        Migrations::resetStorage();
-
         $this->assertTrue($this->db->tableExists('tasks'));
         $this->assertTrue($this->db->tableExists('task_jobs'));
         $this->assertArrayHasKey('task_jobs_tasks_id_fk', $this->db->describeReferences('task_jobs'));