Test that XML and YAML route collections forward requirements and def…

…aults
FriendsOfSymfony · Feb 9, 2015 · 4290af3 · 4290af3
1 parent 1777fe4
commit 4290af3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/...s/Fixtures/Routes/routes_with_options.xml → ...ith_options_requirements_and_defaults.xml b/...s/Fixtures/Routes/routes_with_options.xml → ...ith_options_requirements_and_defaults.xml
@@ -7,5 +7,7 @@
     <route id="get_users" pattern="/users">
         <default key="_controller">FOSRestBundle:UsersController:getUsers</default>
         <option key="expose">true</option>
+        <requirement key="slug">[a-z]+</requirement>
+        <default key="slug">home</default>
     </route>
 </routes>
diff --git a/...s/Fixtures/Routes/routes_with_options.yml → ...ith_options_requirements_and_defaults.yml b/...s/Fixtures/Routes/routes_with_options.yml → ...ith_options_requirements_and_defaults.yml
@@ -3,3 +3,7 @@ users:
   resource: FOS\RestBundle\Tests\Fixtures\Controller\UsersController
   options:
     expose: true
+  requirements:
+    slug: "[a-z]+"
+  defaults:
+    slug: home
diff --git a/Tests/Routing/Loader/RestXmlCollectionLoaderTest.php b/Tests/Routing/Loader/RestXmlCollectionLoaderTest.php
@@ -109,21 +109,14 @@ public function testManualRoutesWithDefaultFormat()
         $this->assertEquals('xml', $route->getDefault('_format'));
     }
 
-    public function testForwardOptions()
+    public function testForwardOptionsRequirementsAndDefaults()
     {
-        $collection = $this->loadFromXmlCollectionFixture(
-            'routes_with_options.xml',
-            true,
-            array(
-                'json' => false,
-                'xml'  => false,
-                'html' => true,
-            ),
-            'xml'
-        );
+        $collection = $this->loadFromXmlCollectionFixture('routes_with_options_requirements_and_defaults.xml');
 
         foreach ($collection as $route) {
             $this->assertTrue('true' === $route->getOption('expose'));
+            $this->assertEquals('[a-z]+', $route->getRequirement('slug'));
+            $this->assertEquals('home', $route->getDefault('slug'));
         }
     }
     /**

diff --git a/Tests/Routing/Loader/RestYamlCollectionLoaderTest.php b/Tests/Routing/Loader/RestYamlCollectionLoaderTest.php
@@ -92,12 +92,14 @@ public function testNamedPrefixedReportsFixtureHasNoDuplicates()
         $this->assertEquals(count($names), count(array_unique($names)));
     }
 
-    public function testForwardOptions()
+    public function testForwardOptionsRequirementsAndDefaults()
     {
-        $collection = $this->loadFromYamlCollectionFixture('routes_with_options.yml');
+        $collection = $this->loadFromYamlCollectionFixture('routes_with_options_requirements_and_defaults.yml');
 
         foreach ($collection as $route) {
             $this->assertTrue($route->getOption('expose'));
+            $this->assertEquals('[a-z]+', $route->getRequirement('slug'));
+            $this->assertEquals('home', $route->getDefault('slug'));
         }
     }