diff --git a/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php b/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php index dcdc4c0..4698072 100644 --- a/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php +++ b/core/modules/aggregator/src/Tests/AggregatorRenderingTest.php @@ -101,7 +101,7 @@ public function testFeedPage() { // Check for presence of an aggregator pager. $this->drupalGet('aggregator'); - $elements = $this->xpath("//ul[@class=:class]", array(':class' => 'pager__items')); + $elements = $this->xpath("//ul[@class=:class]", array(':class' => 'js-pager__items')); $this->assertTrue(!empty($elements), 'Individual source page contains a pager.'); // Check for sources page title. @@ -137,7 +137,7 @@ public function testFeedPage() { // Check for the presence of a pager. $this->drupalGet('aggregator/sources/' . $feed->id()); - $elements = $this->xpath("//ul[@class=:class]", array(':class' => 'pager__items')); + $elements = $this->xpath("//ul[@class=:class]", array(':class' => 'js-pager__items')); $this->assertTrue(!empty($elements), 'Individual source page contains a pager.'); $cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags')); $this->assertTrue(in_array('aggregator_feed:' . $feed->id(), $cache_tags)); diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module index b7e8ef2..b87f941 100644 --- a/core/modules/contextual/contextual.module +++ b/core/modules/contextual/contextual.module @@ -31,7 +31,7 @@ function contextual_toolbar() { ), ), '#wrapper_attributes' => array( - 'class' => array('hidden', 'contextual-toolbar-tab'), + 'class' => array('hidden','js-contextual-toolbar-tab'), ), '#attached' => array( 'library' => array( diff --git a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php index 9f81cb5..01ab5ae 100644 --- a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php +++ b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php @@ -73,7 +73,7 @@ protected function doTestBasicTranslation() { $this->drupalGet('', array('language' => $language)); $expected_path = \Drupal::urlGenerator()->generateFromRoute('user.page', array(), array('language' => $language)); $label = $entity->getTranslation($langcode)->label(); - $elements = $this->xpath('//nav[contains(@class, "toolbar-lining")]/ul[@class="menu"]/li/a[contains(@href, :href) and normalize-space(text())=:label]', array(':href' => $expected_path, ':label' => $label)); + $elements = $this->xpath('//nav[contains(@class, "js-toolbar-lining")]/ul[@class="menu"]/li/a[contains(@href, :href) and normalize-space(text())=:label]', array(':href' => $expected_path, ':label' => $label)); $this->assertTrue(!empty($elements), format_string('Translated @language shortcut link @label found.', array('@label' => $label, '@language' => $language->getName()))); } } diff --git a/core/modules/system/src/Tests/Pager/PagerTest.php b/core/modules/system/src/Tests/Pager/PagerTest.php index d7dd6b6..5eeb116 100644 --- a/core/modules/system/src/Tests/Pager/PagerTest.php +++ b/core/modules/system/src/Tests/Pager/PagerTest.php @@ -98,7 +98,7 @@ protected function testPagerQueryParametersAndCacheContext() { * The current pager page the internal browser is on. */ protected function assertPagerItems($current_page) { - $elements = $this->xpath('//ul[@class=:class]/li', array(':class' => 'pager__items')); + $elements = $this->xpath('//ul[@class=:class]/li', array(':class' => 'js-pager__items')); $this->assertTrue(!empty($elements), 'Pager found.'); // Make current page 1-based. diff --git a/core/modules/system/templates/pager.html.twig b/core/modules/system/templates/pager.html.twig index 7ba4ff3..2f49bc3 100644 --- a/core/modules/system/templates/pager.html.twig +++ b/core/modules/system/templates/pager.html.twig @@ -34,7 +34,7 @@ {% if items %}