Skip to content
Browse files

Merge branch '1.3' of github.com:cakephp/cakephp into 1.3

  • Loading branch information...
2 parents 5efddf9 + d04b327 commit 86cae09d7961735e20e8faba12b7479704f3bf9d @markstory markstory committed Jul 31, 2010
Showing with 1 addition and 3 deletions.
  1. +1 −3 cake/tests/cases/libs/router.test.php
View
4 cake/tests/cases/libs/router.test.php
@@ -2007,9 +2007,7 @@ function testConnectDefaultRoutes() {
App::objects('plugin', null, false);
Router::reload();
- $plugins = App::objects('plugin');
- $plugin = Inflector::underscore($plugins[0]);
- $result = Router::url(array('plugin' => $plugin, 'controller' => 'js_file', 'action' => 'index'));
+ $result = Router::url(array('plugin' => 'plugin_js', 'controller' => 'js_file', 'action' => 'index'));
$this->assertEqual($result, '/plugin_js/js_file');
$result = Router::parse('/plugin_js/js_file');

0 comments on commit 86cae09

Please sign in to comment.
Something went wrong with that request. Please try again.