diff --git a/composer.json b/composer.json index 1377e94..a2a8faf 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "php": ">=7.0", "cakephp/cakephp": "^3.7", "ext-pdo": "*", - "vierge-noire/cakephp-test-migrator": "^1.2" + "vierge-noire/cakephp-test-migrator": "^1.3" }, "require-dev": { "cakephp/migrations": "^2.3", diff --git a/src/Sniffer/BaseTableSniffer.php b/src/Sniffer/BaseTableSniffer.php index c0c90de..07df290 100644 --- a/src/Sniffer/BaseTableSniffer.php +++ b/src/Sniffer/BaseTableSniffer.php @@ -16,6 +16,7 @@ use Cake\Database\Exception; use Cake\Datasource\ConnectionInterface; +use CakephpTestMigrator\SchemaCleaner; abstract class BaseTableSniffer { @@ -183,7 +184,7 @@ public function getAllTables(bool $forceFetch = false): array */ public function fetchAllTables(): array { - return $this->getConnection()->getSchemaCollection()->listTables(); + return (new SchemaCleaner())->listTables($this->getConnection()); } /** diff --git a/tests/TestCase/FixtureInjectorSkipTruncationTest.php b/tests/TestCase/FixtureInjectorSkipTruncationTest.php index 139adb3..3a2efca 100644 --- a/tests/TestCase/FixtureInjectorSkipTruncationTest.php +++ b/tests/TestCase/FixtureInjectorSkipTruncationTest.php @@ -15,8 +15,6 @@ use Cake\ORM\TableRegistry; use Cake\TestSuite\TestCase; -use CakephpTestSuiteLight\FixtureInjector; -use CakephpTestSuiteLight\FixtureManager; use CakephpTestSuiteLight\SkipTablesTruncation; use TestApp\Model\Table\CountriesTable; @@ -25,29 +23,25 @@ class FixtureInjectorSkipTruncationTest extends TestCase use SkipTablesTruncation; /** - * @var FixtureManager + * @var CountriesTable */ - public $FixtureManager; + public $Countries; /** - * @var CountriesTable + * @var int */ - public $Countries; + public static $nInitialCities; /** - * Makes sure that the country table starts empty + * Get the original number of countries */ public static function setUpBeforeClass() { - TableRegistry::getTableLocator()->get('Countries')->deleteAll(['1 = 1']); + self::$nInitialCities = TableRegistry::getTableLocator()->get('Countries')->find()->count(); } public function setUp() { - $this->FixtureManager = new FixtureInjector( - $this->createMock(FixtureManager::class) - ); - $this->Countries = TableRegistry::getTableLocator()->get('Countries'); } @@ -71,6 +65,6 @@ public function testTruncationSkipped(int $expected) { $country = $this->Countries->newEntity(['name' => 'foo']); $this->Countries->saveOrFail($country); - $this->assertSame($expected, $this->Countries->find()->count()); + $this->assertSame($expected + self::$nInitialCities, $this->Countries->find()->count()); } -} \ No newline at end of file +}