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

Issue #3304901 by bnjmnm, nod_: Fix intermittently failing Settings Tray Functional Javascript tests 

(cherry picked from commit 2b3f1b960e)
merge-requests/2674/head
xjm 2022-08-24 15:16:02 -05:00
parent 5368b3d3cf
commit ef4c3e6e60
No known key found for this signature in database
GPG Key ID: 206B0B8743BDF4C2
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
View File

@ -21,6 +21,7 @@ class SettingsTrayBlockFormTest extends SettingsTrayTestBase {
'node', 'node',
'search', 'search',
'settings_tray_test', 'settings_tray_test',
'off_canvas_test',
]; ];
/** /**
@ -241,7 +242,6 @@ class SettingsTrayBlockFormTest extends SettingsTrayTestBase {
case 'contextual_link': case 'contextual_link':
$this->clickContextualLink($this->getBlockSelector($block), "Quick edit"); $this->clickContextualLink($this->getBlockSelector($block), "Quick edit");
$this->waitForOffCanvasToOpen(); $this->waitForOffCanvasToOpen();
$this->markTestSkipped("Skipped temporarily for random fails.");
$this->assertEditModeEnabled(); $this->assertEditModeEnabled();
break; break;

13
core/modules/system/tests/src/FunctionalJavascript/OffCanvasTestBase.php
View File

@ -3,18 +3,22 @@
namespace Drupal\Tests\system\FunctionalJavascript; namespace Drupal\Tests\system\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\WebDriverTestBase; use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\Tests\system\Traits\OffCanvasTestTrait;
/** /**
* Base class contains common test functionality for the Off-canvas dialog. * Base class contains common test functionality for the Off-canvas dialog.
*/ */
abstract class OffCanvasTestBase extends WebDriverTestBase { abstract class OffCanvasTestBase extends WebDriverTestBase {
use OffCanvasTestTrait;
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected static $modules = [ protected static $modules = [
// @todo Remove this in https://www.drupal.org/node/3219959 // @todo Remove this in https://www.drupal.org/node/3219959
'block', 'block',
'off_canvas_test',
]; ];
/** /**
@ -75,14 +79,9 @@ abstract class OffCanvasTestBase extends WebDriverTestBase {
* @throws \Behat\Mink\Exception\ElementNotFoundException * @throws \Behat\Mink\Exception\ElementNotFoundException
*/ */
protected function waitForOffCanvasToOpen($position = 'side') { protected function waitForOffCanvasToOpen($position = 'side') {
$web_assert = $this->assertSession(); $this->waitForOffCanvasArea();
// Wait just slightly longer than the off-canvas dialog CSS animation.
// @see core/misc/dialog/off-canvas.motion.css
$this->getSession()->wait(800);
$web_assert->assertWaitOnAjaxRequest();
$this->assertElementVisibleAfterWait('css', '#drupal-off-canvas');
// Check that the canvas is positioned on the side. // Check that the canvas is positioned on the side.
$web_assert->elementExists('css', '.ui-dialog-position-' . $position); $this->assertSession()->elementExists('css', '.ui-dialog-position-' . $position);
} }
/** /**