diff --git a/tests/TestCase/DebugSqlTest.php b/tests/TestCase/DebugSqlTest.php index 1175dca6b..934d600a6 100644 --- a/tests/TestCase/DebugSqlTest.php +++ b/tests/TestCase/DebugSqlTest.php @@ -14,7 +14,6 @@ */ namespace DebugKit\Test\TestCase; -use Cake\Database\Driver\Postgres; use Cake\Datasource\ConnectionManager; use Cake\TestSuite\TestCase; use DebugKit\DebugSql; @@ -72,17 +71,13 @@ public function testSqlHtmlOnCli() ob_start(); $this->assertSame($query, DebugSql::sql($query, true, true)); - $result = ob_get_clean(); + $result = strip_tags(ob_get_clean()); + $result = preg_replace("/[\n\r]/", '', $result); - $expected = << -%s (line %d) -
-SELECT
-EXPECTED;
-        $fieldName = $this->connection->getDriver() instanceof Postgres ? '"panels__id"' : 'panels__id';
-        $expected = sprintf($expected, str_replace(ROOT, '', __FILE__), __LINE__ - 10, $fieldName);
-        $this->assertTextContains(str_replace(["\n", "\r"], '', $expected), str_replace(["\n", "\r"], '', $result));
+        $this->assertStringContainsString(sprintf('%s (line %s)', str_replace(ROOT, '', __FILE__), __LINE__ - 4), $result);
+        $this->assertStringContainsString('SELECT  panels.id AS', $result);
+        $this->assertStringContainsString('panels__id', $result);
+        $this->assertStringContainsString('FROM  panels panels', $result);
     }
 
     /**