Merge pull request #192 from localgovdrupal/1.x

Release 1.0.6
localgovdrupal · Aug 22, 2024 · 46313b3 · 46313b3
2 parents c796c4b + db58907
commit 46313b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Plugin/Block/PublicationNavigationBlock.php b/src/Plugin/Block/PublicationNavigationBlock.php
@@ -115,7 +115,7 @@ public function build() {
     // page publication) don't show the menu block, as there isn't anything
     // else to navigate to.
     $top = reset($tree);
-    if (!isset($top['below'])) {
+    if (!isset($top['below']) || $top['below'] === []) {
       return [];
     }
 

diff --git a/tests/src/Functional/PublicationPageNavigationTest.php b/tests/src/Functional/PublicationPageNavigationTest.php
@@ -33,7 +33,7 @@ class PublicationPageNavigationTest extends BrowserTestBase {
   ];
 
   /**
-   * Test the 'next page' link on a publication.
+   * Test that links and nav are present on a multi-page publication.
    */
   public function testPreviousNextLinks() {
     $adminUser = $this->drupalCreateUser([], NULL, TRUE);
@@ -93,6 +93,9 @@ public function testPreviousNextLinks() {
     $this->drupalGet('/node/' . $node_child_one->id());
     $this->assertSession()->responseContains('<a href="/publication-parent-page" rel="prev" title="Go to previous page">');
     $this->assertSession()->responseContains('<a href="/publication-parent-page/publication-child-page-two" rel="next" title="Go to next page">');
+
+    // This is the default title of the publication navigation block.
+    $this->assertSession()->pageTextContains('Publication navigation');
   }
 
   /**
@@ -113,7 +116,10 @@ public function testBookNavigationIsNotDisplayed() {
       'status' => NodeInterface::PUBLISHED,
     ]);
     $this->drupalGet('/node/' . $node_parent->id());
-    $this->assertSession()->elementNotExists('css', '#block-booknavigation');
+
+    // This is the default title of the publication navigation block.
+    // It shouldn't show on a single page publication.
+    $this->assertSession()->pageTextNotContains('Publication navigation');
   }
 
 }