Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing tests broken by previous commit.

  • Loading branch information...
commit 38d743335953bbfe1ee6ff1fa0e1eff147fbf85d 1 parent f2a5811
@ADmad ADmad authored
View
5 lib/Cake/Test/Case/Core/AppTest.php
@@ -316,11 +316,6 @@ public function testListObjects() {
$result = App::objects('Model/Behavior', null, false);
$this->assertTrue(in_array('TreeBehavior', $result));
- $result = App::objects('controller', null, false);
- $this->assertTrue(in_array('PagesController', $result));
- $result = App::objects('Controller', null, false);
- $this->assertTrue(in_array('PagesController', $result));
-
$result = App::objects('component', null, false);
$this->assertTrue(in_array('AuthComponent', $result));
$result = App::objects('Controller/Component', null, false);
View
6 lib/Cake/Test/Case/Routing/DispatcherTest.php
@@ -19,7 +19,7 @@
App::uses('Dispatcher', 'Routing');
if (!class_exists('AppController', false)) {
- require_once CAKE . 'Controller' . DS . 'AppController.php';
+ require_once CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS . 'AppController.php';
} elseif (!defined('APP_CONTROLLER_EXISTS')){
define('APP_CONTROLLER_EXISTS', true);
}
@@ -1206,7 +1206,7 @@ public function testAssets() {
public static function assetProvider() {
return array(
array(
- 'theme/test_theme/flash/theme_test.swf',
+ 'theme/test_theme/flash/theme_test.swf',
'View/Themed/TestTheme/webroot/flash/theme_test.swf'
),
array(
@@ -1369,7 +1369,7 @@ public static function cacheActionProvider() {
array('test_cached_pages/themed'),
);
}
-
+
/**
* testFullPageCachingDispatch method
*
Please sign in to comment.
Something went wrong with that request. Please try again.