Verified Commit 07d570cf authored by Théodore Biadala's avatar Théodore Biadala
Browse files

Issue #3393400 by mglaman, finnsky, m4olivei, bnjmnm, plopesc, ckrina,... 

Issue #3393400 by mglaman, finnsky, m4olivei, bnjmnm, plopesc, ckrina, smustgrave: Implement Nightwatch tests for Navigation module

(cherry picked from commit 9e83195c)
parent 7be520e6

core/modules/navigation/navigation.module

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ function navigation_theme($existing, $type, $theme, $path) { 
    'base hook' => 'menu',

    'variables' => [

      'menu_name' => NULL,

      'title' => NULL,

      'items' => [],

      'attributes' => [],

    ],

core/modules/navigation/src/ShortcutLazyBuilder.php

+1 −1
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ public function lazyLinks(string $label = 'Shortcuts') { 
    ];



    return [

      '#title' => $label,

      '#theme' => 'navigation_menu',

      '#menu_name' => 'shortcuts',

      '#title' => $label,

      '#items' => $shortcuts_items,

      '#cache' => $shortcut_links['#cache'],

    ];

core/modules/navigation/templates/menu-region--footer.html.twig

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
 * @ingroup themeable

 */

#}

{% set menu_heading_id = 'menu--' ~ menu_name|clean_unique_id %}

<div class="admin-toolbar__item">

  <h4 id="{{ menu_heading_id }}" class="toolbar-block__title visually-hidden focusable">{{ title }}</h4>

  {# @todo id & aria-labelledby will be brought back via JS in https://www.drupal.org/project/drupal/issues/3452724 #}

  <h4 class="visually-hidden focusable">{{ title }}</h4>

  <ul class="toolbar-block__list">

    {% if help %}

      <li class="toolbar-block__list-item">

core/modules/navigation/templates/navigation-menu.html.twig

+2 −3
Original line number Diff line number Diff line 
{% import _self as menus %}

{% set menu_heading_id = 'menu--' ~ menu_name|clean_unique_id %}

<div class="admin-toolbar__item">

  <h4 id="{{ menu_heading_id }}" class="toolbar-block__title visually-hidden focusable">{{ title }}</h4>

  <ul class="toolbar-block__list" aria-labelledby="{{ menu_heading_id }}">

  <h4 class="visually-hidden focusable">{{ title }}</h4>

  <ul class="toolbar-block__list">

    {{ menus.menu_items(items, attributes, 0) }}

  </ul>

</div>

core/modules/navigation/tests/src/Functional/NavigationShortcutsBlockTest.php

+0 −2
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ public function testNavigationBlock(): void { 
    ]));

    $this->verifyDynamicPageCache($test_page_url, 'MISS');

    $this->verifyDynamicPageCache($test_page_url, 'HIT');

    $this->assertSession()->elementNotExists('css', '#menu--shortcuts');

    $this->assertSession()->pageTextNotContains('Shortcuts');

    $this->assertSession()->linkNotExists('Cron');
@@ -118,7 +117,6 @@ public function testNavigationBlock(): void { 
    $this->verifyDynamicPageCache($test_page_url, 'MISS');

    $this->verifyDynamicPageCache($test_page_url, 'HIT');

    $this->assertCacheContexts(['user', 'url.query_args:_wrapper_format', 'session']);

    $this->assertSession()->elementExists('css', '#menu--shortcuts');

    $this->assertSession()->pageTextContains('Shortcuts');

    $this->assertSession()->linkExists('Cron');