Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2870146 by droplet, Lendude, michielnugter: Even more random fails in \Drupal\Tests\outside_in\FunctionalJavascript\OutsideInBlockFormTest

8.4.x
Nathaniel Catchpole 2017-04-28 09:59:20 -04:00
parent 0db6843c24
commit 13e8aca2c8
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInBlockFormTest.php
View File

@ -182,6 +182,7 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
*/
protected function enableEditMode() {
$this->pressToolbarEditButton();
$this->waitForToolbarToLoad();
$this->assertEditModeEnabled();
}
@ -190,6 +191,7 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
*/
protected function disableEditMode() {
$this->pressToolbarEditButton();
$this->waitForToolbarToLoad();
$this->assertEditModeDisabled();
}
@ -213,6 +215,7 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
* 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();
@ -249,11 +252,9 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
// 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.
$web_assert->waitForElementVisible('css', '.toolbar-fixed');
// Waiting for Toolbar animation.
$web_assert->assertWaitOnAjaxRequest();
$this->waitForToolbarToLoad();
// The 2nd page load we should already be in edit mode.
if ($page_load_times == 1) {
$this->enableEditMode();
@ -363,18 +364,13 @@ class OutsideInBlockFormTest extends OutsideInJavascriptTestBase {
* Press the toolbar Edit button provided by the contextual module.
*/
protected function pressToolbarEditButton() {
$this->assertSession()
->waitForElementVisible('css', 'div[data-contextual-id="block:block=powered:langcode=en|outside_in::langcode=en"] .contextual-links a', 10000);
// Waiting for QuickEdit icon animation.
$this->assertSession()->assertWaitOnAjaxRequest();
$this->assertSession()->waitForElement('css', '[data-contextual-id] .contextual-links a');
$edit_button = $this->getSession()
->getPage()
->find('css', static::TOOLBAR_EDIT_LINK_SELECTOR);
$edit_button->press();
// Waiting for Toolbar animation.
$this->assertSession()->assertWaitOnAjaxRequest();
}
/**

12
core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php
View File

@ -118,4 +118,16 @@ abstract class OutsideInJavascriptTestBase extends JavascriptTestBase {
$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.
$web_assert->waitForElementVisible('css', '.toolbar-fixed');
// Waiting for Toolbar animation.
$web_assert->assertWaitOnAjaxRequest();
}
}