Commit 5db87356 authored by webchick's avatar webchick

Issue #2872104 by Wim Leers, michielnugter, tedbow: Resolve @todo in...

Issue #2872104 by Wim Leers, michielnugter, tedbow: Resolve @todo in \Drupal\Tests\outside_in\FunctionalJavascript\OutsideInBlockFormTest
parent 75fdbf08
......@@ -185,7 +185,6 @@ public function providerTestBlocks() {
*/
protected function enableEditMode() {
$this->pressToolbarEditButton();
$this->waitForToolbarToLoad();
$this->assertEditModeEnabled();
}
......@@ -194,7 +193,6 @@ protected function enableEditMode() {
*/
protected function disableEditMode() {
$this->pressToolbarEditButton();
$this->waitForToolbarToLoad();
$this->assertEditModeDisabled();
}
......@@ -229,7 +227,6 @@ protected function assertOffCanvasBlockFormIsValid() {
* A css selector selects the block or an element within it.
*/
protected function openBlockForm($block_selector) {
$this->waitForToolbarToLoad();
$this->click($block_selector);
$this->waitForOffCanvasToOpen();
$this->assertOffCanvasBlockFormIsValid();
......@@ -274,11 +271,6 @@ public function testQuickEditLinks() {
// Load the same page twice.
foreach ([1, 2] as $page_load_times) {
$this->drupalGet('node/' . $node->id());
// Waiting for Toolbar module.
// @todo Remove the hack after https://www.drupal.org/node/2542050.
$this->assertElementVisibleAfterWait('css', '.toolbar-fixed');
// Waiting for Toolbar animation.
$web_assert->assertWaitOnAjaxRequest();
// The 2nd page load we should already be in edit mode.
if ($page_load_times == 1) {
$this->enableEditMode();
......
......@@ -118,18 +118,6 @@ protected function toggleContextualTriggerVisibility($selector) {
$this->getSession()->executeScript("jQuery('{$selector} .contextual .trigger').toggleClass('visually-hidden');");
}
/**
* Waits for Toolbar to load.
*/
protected function waitForToolbarToLoad() {
$web_assert = $this->assertSession();
// Waiting for Toolbar module.
// @todo Remove the hack after https://www.drupal.org/node/2542050.
$this->assertElementVisibleAfterWait('css', '.toolbar-fixed');
// Waiting for Toolbar animation.
$web_assert->assertWaitOnAjaxRequest();
}
/**
* Get themes to test.
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment