Merge branch 'master' into 2.x-dev

hydephp · Apr 30, 2024 · 45397da · 45397da
2 parents 3833e22 + 3d2d696
commit 45397da
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 0 deletions.
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -281,4 +281,38 @@ protected function createNavigationMenu(): MainNavigationMenu
     {
         return NavigationMenuGenerator::handle(MainNavigationMenu::class);
     }
+
+    public function testHasDropdownsReturnsTrueWhenGroupIsExplicitlySetInFrontMatter()
+    {
+        config(['hyde.navigation.subdirectories' => 'hidden']);
+
+        Routes::addRoute((new MarkdownPage('foo', matter: ['navigation.group' => 'test-group']))->getRoute());
+
+        $this->assertTrue(NavigationMenu::create()->hasDropdowns());
+    }
+
+    public function testGetDropdownsReturnsCorrectArrayWhenGroupIsExplicitlySetInFrontMatter()
+    {
+        config(['hyde.navigation.subdirectories' => 'hidden']);
+
+        Routes::addRoute((new MarkdownPage('foo', matter: ['navigation.group' => 'test-group']))->getRoute());
+
+        $menu = NavigationMenu::create();
+        $this->assertCount(1, $menu->getDropdowns());
+
+        $this->assertEquals([
+            DropdownNavItem::fromArray('test-group', [
+                NavItem::fromRoute((new MarkdownPage('foo'))->getRoute()),
+            ]),
+        ], $menu->getDropdowns());
+    }
+
+    public function testHasDropdownsReturnsFalseWhenGroupIsNotExplicitlySetInFrontMatter()
+    {
+        config(['hyde.navigation.subdirectories' => 'hidden']);
+
+        Routes::addRoute((new MarkdownPage('foo'))->getRoute());
+        $menu = NavigationMenu::create();
+        $this->assertFalse($menu->hasDropdowns());
+    }
 }
diff --git a/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php b/packages/framework/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -237,6 +237,36 @@ public function testSearchForHiddenInConfigsSelectsCorrectConfigurationBasedOnPa
         $this->assertFalse($factory->makeHidden());
     }
 
+    public function testMakeGroupUsesFrontMatterGroupIfSet()
+    {
+        $frontMatter = new FrontMatter(['navigation.group' => 'Test Group']);
+        $coreDataObject = new CoreDataObject($frontMatter, new Markdown(), MarkdownPage::class, 'test.md', '', '', '');
+        $factory = new NavigationConfigTestClass($coreDataObject);
+
+        $this->assertSame('Test Group', $factory->makeGroup());
+    }
+
+    public function testMakeGroupUsesFrontMatterGroupIfSetRegardlessOfSubdirectoryConfiguration()
+    {
+        self::mockConfig(['hyde.navigation.subdirectories' => 'hidden']);
+
+        $frontMatter = new FrontMatter(['navigation.group' => 'Test Group']);
+        $coreDataObject = new CoreDataObject($frontMatter, new Markdown(), MarkdownPage::class, 'test.md', '', '', '');
+        $factory = new NavigationConfigTestClass($coreDataObject);
+
+        $this->assertSame('Test Group', $factory->makeGroup());
+    }
+
+    public function testMakeGroupDefaultsToNullIfFrontMatterGroupNotSetAndSubdirectoriesNotUsed()
+    {
+        self::mockConfig(['hyde.navigation.subdirectories' => 'hidden']);
+
+        $coreDataObject = new CoreDataObject(new FrontMatter(), new Markdown(), MarkdownPage::class, 'test.md', '', '', '');
+        $factory = new NavigationConfigTestClass($coreDataObject);
+
+        $this->assertNull($factory->makeGroup());
+    }
+
     protected function makeCoreDataObject(string $identifier = '', string $routeKey = '', string $pageClass = MarkdownPage::class): CoreDataObject
     {
         return new CoreDataObject(new FrontMatter(), new Markdown(), $pageClass, $identifier, '', '', $routeKey);
@@ -264,4 +294,9 @@ public function makeHidden(): bool
     {
         return parent::makeHidden();
     }
+
+    public function makeGroup(): ?string
+    {
+        return parent::makeGroup();
+    }
 }