Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing a couple of recently broken tests

  • Loading branch information...
commit 1814b06695f078f1153e125a7f4d4e27be818774 1 parent 5035bb9
@lorenzo lorenzo authored
View
2  lib/Cake/Test/Case/Console/Command/ShellTest.php
@@ -344,7 +344,7 @@ public function testErr() {
* @return void
*/
public function testNl() {
- $newLine = '\n';
+ $newLine = "\n";
if (DS === '\\') {
$newLine = "\r\n";
}
View
36 lib/Cake/Test/Case/Console/ShellDispatcherTest.php
@@ -367,23 +367,25 @@ public function testParseParams() {
$Dispatcher->parseParams($params);
$this->assertEqual($expected, $Dispatcher->params);
- $params = array(
- 'cake.php',
- '-working',
- 'D:\www',
- 'bake',
- 'my_app',
- );
- $expected = array(
- 'working' => 'D:\\\\www',
- 'app' => 'www',
- 'root' => 'D:\\',
- 'webroot' => 'webroot'
- );
-
- $Dispatcher->params = $Dispatcher->args = array();
- $Dispatcher->parseParams($params);
- $this->assertEqual($expected, $Dispatcher->params);
+ if (DS === '\\') {
+ $params = array(
+ 'cake.php',
+ '-working',
+ 'D:\www',
+ 'bake',
+ 'my_app',
+ );
+ $expected = array(
+ 'working' => 'D:\\\\www',
+ 'app' => 'www',
+ 'root' => 'D:\\',
+ 'webroot' => 'webroot'
+ );
+
+ $Dispatcher->params = $Dispatcher->args = array();
+ $Dispatcher->parseParams($params);
+ $this->assertEqual($expected, $Dispatcher->params);
+ }
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.