mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-19 11:06:15 +00:00
fixes #4958, Windows directory separator issue
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7221 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
f7a4858503
commit
66ea6be098
2 changed files with 14 additions and 14 deletions
|
@ -156,6 +156,7 @@ class SessionHelperTest extends CakeTestCase {
|
|||
$result = ob_get_contents();
|
||||
ob_clean();
|
||||
|
||||
$result = str_replace("\r\n", "\n", $result);
|
||||
$expected = "<div id=\"notificationLayout\">\n\t<h1>Alert!</h1>\n\t<h3>Notice!</h3>\n\t<p>This is a test of the emergency broadcasting system</p>\n</div>";
|
||||
$this->assertEqual($result, $expected);
|
||||
$this->assertFalse($this->Session->check('Message.notification'));
|
||||
|
|
|
@ -236,7 +236,7 @@ class ThemeViewTest extends UnitTestCase {
|
|||
$expected = str_replace(array("\t", "\r\n", "\n"), "", ob_get_clean());
|
||||
set_error_handler('simpleTestErrorHandler');
|
||||
$this->assertPattern("/PagesController::/", $expected);
|
||||
$this->assertPattern("/views\/themed\/my_theme\/pages\/does_not_exist.ctp/", $expected);
|
||||
$this->assertPattern("/views(\/|\\\)themed(\/|\\\)my_theme(\/|\\\)pages(\/|\\\)does_not_exist.ctp/", $expected);
|
||||
}
|
||||
/**
|
||||
* testMissingLayout method
|
||||
|
@ -258,7 +258,7 @@ class ThemeViewTest extends UnitTestCase {
|
|||
$expected = str_replace(array("\t", "\r\n", "\n"), "", ob_get_clean());
|
||||
set_error_handler('simpleTestErrorHandler');
|
||||
$this->assertPattern("/Missing Layout/", $expected);
|
||||
$this->assertPattern("/views\/themed\/my_theme\/layouts\/whatever.ctp/", $expected);
|
||||
$this->assertPattern("/views(\/|\\\)themed(\/|\\\)my_theme(\/|\\\)layouts(\/|\\\)whatever.ctp/", $expected);
|
||||
}
|
||||
/**
|
||||
* tearDown method
|
||||
|
@ -270,7 +270,6 @@ class ThemeViewTest extends UnitTestCase {
|
|||
unset($this->ThemeView);
|
||||
unset($this->PostsController);
|
||||
unset($this->Controller);
|
||||
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
Loading…
Add table
Reference in a new issue