Permalink
Browse files

Updating Dispatcher tests for changes in Router.

  • Loading branch information...
1 parent cfb3e8a commit f0819d364cd525ac1f4f19303f165b73cf0af208 @markstory markstory committed Jul 17, 2011
Showing with 9 additions and 0 deletions.
  1. +9 −0 lib/Cake/Test/Case/Routing/DispatcherTest.php
@@ -651,6 +651,7 @@ public function testQueryStringOnRoot() {
Router::reload();
Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+ Router::connect('/:controller/:action/*');
$_GET = array('coffee' => 'life', 'sleep' => 'sissies');
$Dispatcher = new Dispatcher();
@@ -680,6 +681,8 @@ public function testQueryStringOnRoot() {
* @return void
*/
public function testMissingController() {
+ Router::connect('/:controller/:action/*');
+
$Dispatcher = new TestDispatcher();
Configure::write('App.baseUrl', '/index.php');
$url = new CakeRequest('some_controller/home/param:value/param2:value2');
@@ -726,6 +729,7 @@ public function testDispatchBasic() {
unset($Dispatcher);
+ require CAKE . 'Config' . DS . 'routes.php';
$Dispatcher = new TestDispatcher();
Configure::write('App.baseUrl', '/timesheets/index.php');
@@ -756,6 +760,7 @@ public function testDispatchBasic() {
* @return void
*/
public function testDispatchActionReturnsResponse() {
+ Router::connect('/:controller/:action');
$Dispatcher = new Dispatcher();
$request = new CakeRequest('some_pages/responseGenerator');
$response = $this->getMock('CakeResponse', array('_sendHeader'));
@@ -892,6 +897,7 @@ public function testAutomaticPluginControllerDispatch() {
Router::reload();
+ require CAKE . 'Config' . DS . 'routes.php';
$Dispatcher = new TestDispatcher();
$Dispatcher->base = false;
@@ -914,6 +920,7 @@ public function testAutomaticPluginControllerDispatch() {
Configure::write('Routing.prefixes', array('admin'));
Router::reload();
+ require CAKE . 'Config' . DS . 'routes.php';
$Dispatcher = new TestDispatcher();
$url = new CakeRequest('admin/my_plugin/my_plugin/add/5/param:value/param2:value2');
@@ -936,6 +943,7 @@ public function testAutomaticPluginControllerDispatch() {
Configure::write('Routing.prefixes', array('admin'));
CakePlugin::load('ArticlesTest', array('path' => '/fake/path'));
Router::reload();
+ require CAKE . 'Config' . DS . 'routes.php';
$Dispatcher = new TestDispatcher();
@@ -1313,6 +1321,7 @@ public function testFullPageCachingDispatch() {
Router::reload();
Router::connect('/', array('controller' => 'test_cached_pages', 'action' => 'index'));
+ Router::connect('/:controller/:action/*');
App::build(array(
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS),

0 comments on commit f0819d3

Please sign in to comment.