Added webtest for Request Identity Voter

Author: dantleech

Tests/Resources/Controller/CmiTestController.php

@@ -23,7 +23,8 @@ public function requestContentIdentityAction(Request $request)
         $content = $request->get(DynamicRouter::CONTENT_KEY);
         if (!$content) {
             $content = $this->container->get('doctrine_phpcr.odm.document_manager')->find(null, '/test/content-1');
-            $request->query->set(DynamicRouter::CONTENT_KEY, $content);
+            $request->attributes->set(DynamicRouter::CONTENT_KEY, $content);
+
             return $this->render('::tests/cmi/requestContentVoterActive.html.twig', array('content' => $content));
         }
         return $this->render('::tests/cmi/requestContent.html.twig', array('content' => $content));

Tests/Resources/DataFixtures/PHPCR/LoadMenuData.php

@@ -136,16 +136,11 @@ protected function loadSideMenu($manager)
         $manager->persist($content);
 
         $route = new Route();
-        $route->setContent($content);
         $route->setId('/test/routes/contents/content-1');
         $route->setDefault('_controller', 'Symfony\Cmf\Bundle\MenuBundle\Tests\Resources\Controller\CmiTestController::requestContentIdentityAction');
+        $route->setContent($content);
         $manager->persist($route);
 
-        $content = new Content;
-        $content->setTitle('CMI Content 1');
-        $content->setId('/test/cmi-content-1');
-        $manager->persist($content);
-
         $menu = new Menu;
         $menu->setName('side-menu');
         $menu->setLabel('Side Menu');
@@ -163,7 +158,7 @@ protected function loadSideMenu($manager)
         $menuNode->setParent($menu);
         $menuNode->setLabel('Request Content Identity Voter');
         $menuNode->setName('request-content-identity-voter');
-        $menuNode->setContent($route);
+        $menuNode->setContent($content);
         $manager->persist($menuNode);
 
         $menuNode = new MenuNode;

Tests/Resources/Document/Content.php

@@ -45,9 +45,18 @@ class Content implements MenuNodeReferrersInterface, RouteReferrersReadInterface
      */
     protected $menuNodes;
 
+    /**
+     * @PHPCRODM\Referrers(
+     *     referringDocument="Symfony\Cmf\Bundle\RoutingBundle\Doctrine\Phpcr\Route",
+     *     referencedBy="content"
+     * )
+     */
+    protected $routes;
+
     public function __construct()
     {
         $this->menuNodes = new ArrayCollection();
+        $this->routes = new ArrayCollection();
     }
 
     public function getId()
@@ -80,13 +89,21 @@ public function addMenuNode(NodeInterface $menuNode)
         $this->menuNodes->add($menuNode);
     }
 
+    public function addRoute($route)
+    {
+        $this->routes->add($route);
+    }
+
+
     public function removeMenuNode(NodeInterface $menuNode)
     {
         $this->menuNodes->remove($menuNode);
     }
 
     public function getRoutes()
     {
-        return array(new Route('http://www.example.com/content'));
+        foreach ($this->routes as $route) {
+        }
+        return $this->routes;
     }
 }

Tests/Resources/app/Resources/views/tests/cmi/_sideMenu.html.twig

@@ -1,3 +1,24 @@
 <nav class="side">
 {{ knp_menu_render('side-menu') }}
 </nav>
+<h3>Test Links</h3>
+<ul>
+    <li><a href="{{ path('current_menu_item_request_content_identity') }}">Test Request Content Identity Voter</a></li>
+</ul>
+<h3>Request Content</h3>
+{% if content is defined %}
+<table>
+    <tr>
+        <th>Title</th>
+        <td>{{ content.title }}</td>
+    </tr>
+    <tr>
+        <th>URI</th>
+        <td>{{ path(content) }}</td>
+    </tr>
+</table>
+{% else %}
+<p>
+No content
+</p>
+{% endif %}

Tests/Resources/app/Resources/views/tests/cmi/requestContent.html.twig

@@ -1,8 +1,6 @@
 {% extends "::layout.html.twig" %}
 {% block content %}
 {% include "::tests/cmi/_sideMenu.html.twig" %}
-<h1>Request Content</h1>
-This is the content: {{ content.title }}
 <p>
 This page does NOT use the content identity voter because the URI of the request matches that of the content.
 </p>

Tests/Resources/app/Resources/views/tests/cmi/requestContentVoterActive.html.twig

@@ -1,8 +1,7 @@
 {% extends "::layout.html.twig" %}
 {% block content %}
 {% include "::tests/cmi/_sideMenu.html.twig" %}
-<h1>Request Content</h1>
-This is the content: {{ content.title }}
+<h1>Content Identity Test</h1>
 <p>
 The content identity voter should now be in use and the "Request Content Identity" menu item should be hilighted.
 </p>

Tests/Resources/app/config/cmf_menu.yml

@@ -10,6 +10,8 @@ cmf_menu:
             enabled: true
             use_sonata_admin: true
             menu_basepath: /test/menus
+    voters:
+        content_identity: ~
 
 cmf_routing:
     dynamic: