From 84d57e2a4b2a18f73f62e8eea835b68266619d35 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 14 Apr 2012 23:10:10 -0400 Subject: [PATCH] Fix failing tests in RedirectRoute. --- lib/Cake/Routing/Route/RedirectRoute.php | 2 +- lib/Cake/Test/TestCase/Routing/Route/RedirectRouteTest.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Cake/Routing/Route/RedirectRoute.php b/lib/Cake/Routing/Route/RedirectRoute.php index 488eb9986ec..3acdcec9788 100644 --- 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 index ab3f20bb758..72f87a0894e 100644 --- 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']); }