rename to DuplicateNamedRouteException and tests

cakephp · Aug 19, 2016 · ee96e83 · ee96e83
1 parent f2d7c7c
commit ee96e83
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/...ing/Exception/DuplicateRouteException.php → ...xception/DuplicateNamedRouteException.php b/...ing/Exception/DuplicateRouteException.php → ...xception/DuplicateNamedRouteException.php
@@ -15,10 +15,9 @@
 use Cake\Core\Exception\Exception;
 
 /**
- * Exception raised when a URL cannot be reverse routed
- * or when a URL cannot be parsed.
+ * Exception raised when a route names used twice.
  */
-class DuplicateRouteException extends Exception
+class DuplicateNamedRouteException extends Exception
 {
 
     /**

diff --git a/src/Routing/RouteCollection.php b/src/Routing/RouteCollection.php
@@ -15,7 +15,7 @@
 namespace Cake\Routing;
 
 use Cake\Routing\Exception\MissingRouteException;
-use Cake\Routing\Exception\DuplicateRouteException;
+use Cake\Routing\Exception\DuplicateNamedRouteException;
 use Cake\Routing\Route\Route;
 
 /**
@@ -79,7 +79,7 @@ public function add(Route $route, array $options = [])
         // Explicit names
         if (isset($options['_name'])) {
             if (isset($this->_named[$options['_name']])) {
-                throw new DuplicateRouteException([
+                throw new DuplicateNamedRouteException([
                     'url' => $options['_name'],
                     'message' => 'A named route was found for "%s" that is already used, route names must be unique across your entire application.'
                 ]);

diff --git a/src/Template/Error/duplicate_route.ctp → src/Template/Error/duplicate_named_route.ctp b/src/Template/Error/duplicate_route.ctp → src/Template/Error/duplicate_named_route.ctp
@@ -19,7 +19,7 @@ use Cake\Error\Debugger;
 $this->layout = 'dev_error';
 
 $this->assign('title', 'Duplicate Route');
-$this->assign('templateName', 'duplicate_route.ctp');
+$this->assign('templateName', 'duplicate_named_route.ctp');
 
 $attributes = $error->getAttributes();
 

diff --git a/tests/TestCase/Routing/RouteCollectionTest.php b/tests/TestCase/Routing/RouteCollectionTest.php
@@ -358,11 +358,11 @@ public function testAddingRoutes()
     /**
      * Test the add() with some _name.
 	 * 
-     * @expectedException \Cake\Routing\Exception\DuplicateRouteException
+     * @expectedException \Cake\Routing\Exception\DuplicateNamedRouteException
 	 * 
      * @return void
      */
-    public function testAddingDuplicatedRoutesName()
+    public function testAddingDuplicateNamedRoutes()
     {
         $one = new Route('/pages/*', ['controller' => 'Pages', 'action' => 'display']);
         $two = new Route('/', ['controller' => 'Dashboards', 'action' => 'display']);

diff --git a/tests/TestCase/Routing/RouterTest.php b/tests/TestCase/Routing/RouterTest.php
@@ -1194,10 +1194,10 @@ public function testNamedRouteException()
     /**
      * Test that using duplicate names causes exceptions.
      *
-     * @expectedException \Cake\Routing\Exception\DuplicateRouteException
+     * @expectedException \Cake\Routing\Exception\DuplicateNamedRouteException
      * @return void
      */
-    public function testDuplicateRouteException()
+    public function testDuplicateNamedRouteException()
     {
         Router::connect(
             '/users/:name',
@@ -1221,7 +1221,7 @@ public function testDuplicateRouteException()
      *
      * @return void
      */
-    public function testNoDuplicateRouteException()
+    public function testNoDuplicateNamedRouteException()
     {
         Router::connect(
             '/users/:name',
@@ -1231,7 +1231,7 @@ public function testNoDuplicateRouteException()
 		Router::connect(
             '/users/:name',
             ['controller' => 'users', 'action' => 'view'],
-            ['_name' => 'otherName']
+            ['_name' => 'test2']
         );
 		Router::connect(
             '/users/:name',