Permalink
Browse files

Fixing failing tests caused by me forgetting to run tests in [7032729]

  • Loading branch information...
1 parent a95d4ac commit ca3e606ec8829fdbbeca4cf2bd04cee02d9cacdf @markstory markstory committed Feb 17, 2011
Showing with 6 additions and 6 deletions.
  1. +6 −6 cake/tests/cases/dispatcher.test.php
@@ -1173,7 +1173,7 @@ function testBaseUrlAndWebrootWithBaseUrl() {
$result = $Dispatcher->baseUrl();
$expected = '/index.php';
$this->assertEqual($expected, $result);
- $expectedWebroot = '/';
+ $expectedWebroot = '/app/webroot/';
$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
Configure::write('App.baseUrl', '/CakeBB/app/webroot/index.php');
@@ -1287,7 +1287,7 @@ function testMissingController() {
$controller = $Dispatcher->dispatch($url, array('return' => 1));
$expected = array('missingController', array(array(
'className' => 'SomeControllerController',
- 'webroot' => '/',
+ 'webroot' => '/app/webroot/',
'url' => 'some_controller/home/param:value/param2:value2',
'base' => '/index.php'
)));
@@ -1310,7 +1310,7 @@ function testPrivate() {
$expected = array('privateAction', array(array(
'className' => 'SomePagesController',
'action' => '_protected',
- 'webroot' => '/',
+ 'webroot' => '/app/webroot/',
'url' => 'some_pages/_protected/param:value/param2:value2',
'base' => '/index.php'
)));
@@ -1333,7 +1333,7 @@ function testMissingAction() {
$expected = array('missingAction', array(array(
'className' => 'SomePagesController',
'action' => 'home',
- 'webroot' => '/',
+ 'webroot' => '/app/webroot/',
'url' => '/index.php/some_pages/home/param:value/param2:value2',
'base' => '/index.php'
)));
@@ -1348,7 +1348,7 @@ function testMissingAction() {
$expected = array('missingAction', array(array(
'className' => 'SomePagesController',
'action' => 'redirect',
- 'webroot' => '/',
+ 'webroot' => '/app/webroot/',
'url' => '/index.php/some_pages/redirect/param:value/param2:value2',
'base' => '/index.php'
)));
@@ -1455,7 +1455,7 @@ function testDispatchWithGarbageUrl() {
$result = $Dispatcher->dispatch($url);
$expected = array('missingController', array(array(
'className' => 'Controller',
- 'webroot' => '/',
+ 'webroot' => '/app/webroot/',
'url' => 'http://google.com',
'base' => '/index.php'
)));

0 comments on commit ca3e606

Please sign in to comment.