Loading core/modules/toolbar/tests/src/FunctionalJavascript/ToolbarActiveTrailTest.php +6 −14 Original line number Diff line number Diff line Loading @@ -70,30 +70,22 @@ public function testToolbarActiveTrail(string $orientation): void { $this->clickLink('Edit'); if ($orientation === 'vertical') { $this->assertNotEmpty($assert_session->waitForElementVisible('named', ['link', 'Structure'])); // Assert that menu-item--active-trail was maintained. $this->assertTrue($assert_session->waitForElementVisible('named', ['link', 'Structure'])->getParent()->getParent()->hasClass('menu-item--active-trail')); $this->assertTrue($assert_session->waitForElementVisible('named', ['link', 'Content types'])->getParent()->getParent()->hasClass('menu-item--active-trail')); $this->assertNotNull($assert_session->waitForElementVisible('css', '.menu-item--active-trail a:contains("Structure")')); $this->assertNotNull($assert_session->waitForElementVisible('css', '.menu-item--active-trail a:contains("Content types")')); // Change orientation and check focus is maintained. $page->pressButton('Horizontal orientation'); $this->assertTrue($assert_session->waitForElementVisible('css', '#toolbar-link-system-admin_structure')->hasClass('is-active')); $this->assertNotNull($assert_session->waitForElementVisible('css', '#toolbar-link-system-admin_structure.is-active')); } else { $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#toolbar-link-system-admin_structure')); // Assert that is-active was maintained. $this->assertTrue($assert_session->waitForElementVisible('css', '#toolbar-link-system-admin_structure')->hasClass('is-active')); $this->assertNotNull($assert_session->waitForElementVisible('css', '#toolbar-link-system-admin_structure.is-active')); // Change orientation and check focus is maintained. $page->pressButton('Vertical orientation'); // Introduce a delay to let the focus load. $this->getSession()->wait(150); $this->assertTrue($assert_session->waitForElementVisible('named', ['link', 'Structure'])->getParent()->getParent()->hasClass('menu-item--active-trail')); $this->assertTrue($assert_session->waitForElementVisible('named', ['link', 'Content types'])->getParent()->getParent()->hasClass('menu-item--active-trail')); $this->assertNotNull($assert_session->waitForElementVisible('css', '.menu-item--active-trail a:contains("Structure")')); $this->assertNotNull($assert_session->waitForElementVisible('css', '.menu-item--active-trail a:contains("Content types")')); } } Loading Loading
core/modules/toolbar/tests/src/FunctionalJavascript/ToolbarActiveTrailTest.php +6 −14 Original line number Diff line number Diff line Loading @@ -70,30 +70,22 @@ public function testToolbarActiveTrail(string $orientation): void { $this->clickLink('Edit'); if ($orientation === 'vertical') { $this->assertNotEmpty($assert_session->waitForElementVisible('named', ['link', 'Structure'])); // Assert that menu-item--active-trail was maintained. $this->assertTrue($assert_session->waitForElementVisible('named', ['link', 'Structure'])->getParent()->getParent()->hasClass('menu-item--active-trail')); $this->assertTrue($assert_session->waitForElementVisible('named', ['link', 'Content types'])->getParent()->getParent()->hasClass('menu-item--active-trail')); $this->assertNotNull($assert_session->waitForElementVisible('css', '.menu-item--active-trail a:contains("Structure")')); $this->assertNotNull($assert_session->waitForElementVisible('css', '.menu-item--active-trail a:contains("Content types")')); // Change orientation and check focus is maintained. $page->pressButton('Horizontal orientation'); $this->assertTrue($assert_session->waitForElementVisible('css', '#toolbar-link-system-admin_structure')->hasClass('is-active')); $this->assertNotNull($assert_session->waitForElementVisible('css', '#toolbar-link-system-admin_structure.is-active')); } else { $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#toolbar-link-system-admin_structure')); // Assert that is-active was maintained. $this->assertTrue($assert_session->waitForElementVisible('css', '#toolbar-link-system-admin_structure')->hasClass('is-active')); $this->assertNotNull($assert_session->waitForElementVisible('css', '#toolbar-link-system-admin_structure.is-active')); // Change orientation and check focus is maintained. $page->pressButton('Vertical orientation'); // Introduce a delay to let the focus load. $this->getSession()->wait(150); $this->assertTrue($assert_session->waitForElementVisible('named', ['link', 'Structure'])->getParent()->getParent()->hasClass('menu-item--active-trail')); $this->assertTrue($assert_session->waitForElementVisible('named', ['link', 'Content types'])->getParent()->getParent()->hasClass('menu-item--active-trail')); $this->assertNotNull($assert_session->waitForElementVisible('css', '.menu-item--active-trail a:contains("Structure")')); $this->assertNotNull($assert_session->waitForElementVisible('css', '.menu-item--active-trail a:contains("Content types")')); } } Loading