Skip to content

Commit 504eb5b

Browse files
Merge pull request #4 from vierge-noire/cake3_next
#2 Fix tests
2 parents 3158e11 + 8893575 commit 504eb5b

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

.github/workflows/php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ jobs:
5454
if [ ${{ matrix.db-type }} == 'mysql' ]; then
5555
sudo service mysql start && mysql -h 127.0.0.1 -u root -proot -e 'CREATE DATABASE IF NOT EXISTS test_migrator;';
5656
fi
57-
composer run-tests-${{ matrix.db-type }}
57+
composer ${{ matrix.db-type }}

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
}
2929
},
3030
"scripts": {
31-
"run-tests-mysql": "bash run_tests.sh Mysql",
32-
"run-tests-pgsql": "bash run_tests.sh Postgres",
33-
"run-tests-sqlite": "bash run_tests.sh Sqlite"
31+
"mysql": "bash run_tests.sh Mysql",
32+
"pgsql": "bash run_tests.sh Postgres",
33+
"sqlite": "bash run_tests.sh Sqlite"
3434
},
3535
"config": {
3636
"sort-packages": true
3737
}
38-
}
38+
}

tests/TestCase/MigratorTest.php

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
namespace CakephpTestMigrator\Test\TestCase;
1515

1616

17+
use Cake\Datasource\ConnectionManager;
1718
use Cake\TestSuite\TestCase;
1819
use CakephpTestMigrator\Migrator;
19-
use CakephpTestSuiteLight\FixtureManager;
20-
use CakephpTestSuiteLight\Sniffer\BaseTableSniffer;
2120

2221
class MigratorTest extends TestCase
2322
{
@@ -26,28 +25,19 @@ class MigratorTest extends TestCase
2625
*/
2726
public $migrator;
2827

29-
/**
30-
* @var BaseTableSniffer
31-
*/
32-
public $sniffer;
33-
3428
public function setUp()
3529
{
3630
$this->migrator = new Migrator();
37-
38-
$fm = new FixtureManager();
39-
$this->sniffer = $fm->getSniffer('test');
4031
}
4132

4233
public function tearDown()
4334
{
4435
unset($this->migrator);
45-
unset($this->sniffer);
4636
}
4737

4838
private function fetchMigrationsInDB(string $dbTable): array
4939
{
50-
return $this->sniffer->fetchQuery("SELECT migration_name FROM $dbTable");
40+
return ConnectionManager::get('test')->execute("SELECT migration_name FROM $dbTable")->fetch();
5141
}
5242

5343
public function testGetConfig()

0 commit comments

Comments
 (0)