Skip to content

Commit d70c222

Browse files
committed
fix tests
1 parent d34553f commit d70c222

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

tests/TestCase/DebugSqlTest.php

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,21 +71,13 @@ public function testSqlHtmlOnCli()
7171

7272
ob_start();
7373
$this->assertSame($query, DebugSql::sql($query, true, true));
74-
$result = ob_get_clean();
74+
$result = strip_tags(ob_get_clean());
75+
$result = preg_replace("/[\n\r]/", '', $result);
7576

76-
$expected = <<<EXPECTED
77-
<div class="cake-debug-output">
78-
<span><strong>%s</strong> (line <strong>%d</strong>)</span>
79-
<pre class="cake-debug">
80-
SELECT
81-
panels.id AS %s
82-
FROM
83-
panels panels
84-
</pre>
85-
</div>
86-
EXPECTED;
87-
$expected = sprintf($expected, str_replace(ROOT, '', __FILE__), __LINE__ - 9);
88-
$this->assertTextContains(str_replace("\r", '', $expected), str_replace("\r", '', $result));
77+
$this->assertStringContainsString(sprintf('%s (line %s)', str_replace(ROOT, '', __FILE__), __LINE__ - 4), $result);
78+
$this->assertStringContainsString('SELECT panels.id AS', $result);
79+
$this->assertStringContainsString('panels__id', $result);
80+
$this->assertStringContainsString('FROM panels panels', $result);
8981
}
9082

9183
/**

0 commit comments

Comments
 (0)