Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updating Dispatcher tests for changes in Router.
  • Loading branch information
markstory committed Jul 23, 2011
1 parent cfb3e8a commit f0819d3
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions lib/Cake/Test/Case/Routing/DispatcherTest.php
Expand Up @@ -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();
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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');

Expand Down Expand Up @@ -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'));
Expand Down Expand Up @@ -892,6 +897,7 @@ public function testAutomaticPluginControllerDispatch() {


Router::reload();
require CAKE . 'Config' . DS . 'routes.php';
$Dispatcher = new TestDispatcher();
$Dispatcher->base = false;

Expand All @@ -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');
Expand All @@ -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();

Expand Down Expand Up @@ -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),
Expand Down

0 comments on commit f0819d3

Please sign in to comment.