Fix failing tests in RedirectRoute.

cakephp · Jul 4, 2012 · 84d57e2 · 84d57e2
1 parent 18e52d3
commit 84d57e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/Cake/Routing/Route/RedirectRoute.php b/lib/Cake/Routing/Route/RedirectRoute.php
@@ -80,7 +80,7 @@ public function parse($url) {
 			$redirect = $this->redirect[0];
 		}
 		if (isset($this->options['persist']) && is_array($redirect)) {
-			$redirect += array('named' => $params['named'], 'pass' => $params['pass'], 'url' => array());
+			$redirect += array('pass' => $params['pass'], 'url' => array());
 			$redirect = Router::reverse($redirect);
 		}
 		$status = 301;

diff --git a/lib/Cake/Test/TestCase/Routing/Route/RedirectRouteTest.php b/lib/Cake/Test/TestCase/Routing/Route/RedirectRouteTest.php
@@ -97,14 +97,14 @@ public function testParsing() {
 		$route = new RedirectRoute('/my_controllers/:action/*', array('controller' => 'tags', 'action' => 'add'), array('persist' => true));
 		$route->stop = false;
 		$route->response = $this->getMock('Cake\Network\Response', array('_sendHeader'));
-		$result = $route->parse('/my_controllers/do_something/passme/named:param');
+		$result = $route->parse('/my_controllers/do_something/passme');
 		$header = $route->response->header();
-		$this->assertEquals(Router::url('/tags/add/passme/named:param', true), $header['Location']);
+		$this->assertEquals(Router::url('/tags/add/passme', true), $header['Location']);
 
 		$route = new RedirectRoute('/my_controllers/:action/*', array('controller' => 'tags', 'action' => 'add'));
 		$route->stop = false;
 		$route->response = $this->getMock('Cake\Network\Response', array('_sendHeader'));
-		$result = $route->parse('/my_controllers/do_something/passme/named:param');
+		$result = $route->parse('/my_controllers/do_something/passme');
 		$header = $route->response->header();
 		$this->assertEquals(Router::url('/tags/add', true), $header['Location']);
 	}