Merge pull request #8 from dekey/fix_menu

Update node visit order
dmaicher · Apr 10, 2019 · 29a89bf · 29a89bf
2 parents 63bfb1d + f8deb96
commit 29a89bf
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 10 deletions.
diff --git a/src/DAMA/MenuBundle/Resources/config/services.yml b/src/DAMA/MenuBundle/Resources/config/services.yml
@@ -27,7 +27,7 @@ services:
     class: DAMA\MenuBundle\NodeVisitor\NodeFilter
     arguments: ["@security.token_storage", "@security.authorization_checker"]
     tags:
-      - { name: dama_menu.node_visitor, priority: 1 }
+      - { name: dama_menu.node_visitor, priority: 3 }
 
   dama_menu.node_visitor.activator:
     class: DAMA\MenuBundle\NodeVisitor\NodeActivator
@@ -38,4 +38,4 @@ services:
   dama_menu.node_visitor.node_route_propagator:
       class: DAMA\MenuBundle\NodeVisitor\NodeRoutePropagator
       tags:
-        - { name: dama_menu.node_visitor, priority: 3 }
+        - { name: dama_menu.node_visitor, priority: 1 }
diff --git a/tests/Functional/FunctionalTest.php b/tests/Functional/FunctionalTest.php
@@ -6,17 +6,20 @@
 
 class FunctionalTest extends WebTestCase
 {
-    public function testRenderMenuOne()
+    public function testRenderMenuOne(): void
     {
         $client = $this->createClient();
         $crawler = $client->request('GET', '/');
         $this->assertSame(200, $client->getResponse()->getStatusCode());
 
         $this->assertCount(1, $crawler->filter('ul.menu-layer-1'));
-        $this->assertCount(1, $crawler->filter('ul.menu-layer-2'));
+        $this->assertCount(2, $crawler->filter('ul.menu-layer-2'));
 
-        $this->assertCount(2, $crawler->filter('li.menu-item'));
+        $this->assertCount(4, $crawler->filter('li.menu-item'));
         $this->assertCount(0, $crawler->filter('li.bla-class'));
         $this->assertCount(1, $crawler->filter('li.foo-child-class'));
+
+        $this->assertCount(2, $crawler->filter('a[href="/test_2"]'));
+        $this->assertCount(0, $crawler->filter('a[href="/test_1"]'));
     }
 }
diff --git a/tests/Functional/TestMenuTreeBuilder.php b/tests/Functional/TestMenuTreeBuilder.php
@@ -4,11 +4,10 @@
 
 use DAMA\MenuBundle\MenuTree\MenuTreeBuilderInterface;
 use DAMA\MenuBundle\Node\Node;
-use Symfony\Component\ExpressionLanguage\Expression;
 
 class TestMenuTreeBuilder implements MenuTreeBuilderInterface
 {
-    public function build(Node $root)
+    public function build(Node $root): void
     {
         $root
             ->child('bla')
@@ -22,6 +21,16 @@ public function build(Node $root)
                     ->setAttr('class', 'foo-child-class')
                 ->end()
             ->end()
+            ->child('bar')
+                ->setAdditionalActiveRoutes(['test_1', 'test_2'])
+                ->child('bar-sub-1')
+                    ->setRoute('test_1')
+                    ->setRequiredPermissions(['IS_AUTHENTICATED_FULLY'])
+                ->end()
+                ->child('bar-sub-2')
+                    ->setRoute('test_2')
+                ->end()
+            ->end()
         ;
     }
 }
diff --git a/tests/Functional/routing.yml b/tests/Functional/routing.yml
@@ -4,3 +4,14 @@ test:
     defaults:
         template: test_menu.html.twig
 
+test_1:
+    path: /test_1
+    controller: 'FrameworkBundle:Template:template'
+    defaults:
+        template: test_menu.html.twig
+
+test_2:
+    path: /test_2
+    controller: 'FrameworkBundle:Template:template'
+    defaults:
+        template: test_menu.html.twig
diff --git a/tests/MenuTree/MenuTreeTraverserTest.php b/tests/MenuTree/MenuTreeTraverserTest.php
@@ -30,7 +30,7 @@ public function setUp()
         $this->traverser->addVisitor($this->visitors[1]);
     }
 
-    public function testTraverseCallsVisitOnEachVisitor()
+    public function testTraverseCallsVisitOnEachVisitor(): void
     {
         $root = new Node();
         $child = new Node();
@@ -43,7 +43,7 @@ public function testTraverseCallsVisitOnEachVisitor()
         $this->traverser->traverse($root);
     }
 
-    public function testStopTraversal()
+    public function testStopTraversal(): void
     {
         $root = new Node();
         $child = new Node();
@@ -64,7 +64,7 @@ public function testStopTraversal()
         $this->traverser->traverse($root);
     }
 
-    public function testTraverseRecursively()
+    public function testTraverseRecursively(): void
     {
         $root = new Node();
         $child = new Node();