Fixing notice errors in Router.

Updating AuthComponent tests for changes in Router behavior.
cakephp · Jul 23, 2011 · 16073b4 · 16073b4
1 parent be98e0b
commit 16073b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
@@ -921,8 +921,8 @@ public static function reverse($params, $full = false) {
 		} else {
 			$url = $params['url'];
 		}
-		$pass = $params['pass'];
-		$named = $params['named'];
+		$pass = isset($params['pass']) ? $params['pass'] : array();
+		$named = isset($params['named']) ? $params['named'] : array();
 
 		unset(
 			$params['pass'], $params['named'], $params['paging'], $params['models'], $params['url'], $url['url'],

diff --git a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
@@ -292,12 +292,12 @@ public function redirect($url, $status = null, $exit = true) {
 }
 
 /**
-* AuthTest class
+* AuthComponentTest class
 *
 * @package       cake
 * @package       cake.tests.cases.libs.controller.components
 */
-class AuthTest extends CakeTestCase {
+class AuthComponentTest extends CakeTestCase {
 
 /**
  * name property
@@ -351,6 +351,7 @@ public function setUp() {
 
 		$this->initialized = true;
 		Router::reload();
+		Router::connect('/:controller/:action/*');
 
 		$User = ClassRegistry::init('AuthUser');
 		$User->updateAll(array('password' => $User->getDataSource()->value(Security::hash('cake', null, true))));
@@ -925,6 +926,7 @@ public function testAdminRoute() {
 		$prefixes = Configure::read('Routing.prefixes');
 		Configure::write('Routing.prefixes', array('admin'));
 		Router::reload();
+		require CAKE . 'Config' . DS . 'routes.php';
 
 		$url = '/admin/auth_test/add';
 		$this->Auth->request->addParams(Router::parse($url));
@@ -977,6 +979,7 @@ public function testLoginActionRedirect() {
 		$admin = Configure::read('Routing.prefixes');
 		Configure::write('Routing.prefixes', array('admin'));
 		Router::reload();
+		require CAKE . 'Config' . DS . 'routes.php';
 
 		$url = '/admin/auth_test/login';
 		$this->Auth->request->addParams(Router::parse($url));