Issue #3317520 by mstrelan, nod_, wim leers: [random test failure] Drupal\Tests\settings_tray\FunctionalJavascript\SettingsTrayBlockFormTest::testEditModeEnableDisable

2 files changed, 7 insertions, 5 deletions

diff --git a/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php b/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
index 85eb9eadcf1..b274fa34182 100644
--- a/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
+++ b/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayBlockFormTest.php
@@ -6,6 +6,7 @@ namespace Drupal\Tests\settings_tray\FunctionalJavascript;
 
 use Drupal\settings_tray_test\Plugin\Block\SettingsTrayFormAnnotationIsClassBlock;
 use Drupal\settings_tray_test\Plugin\Block\SettingsTrayFormAnnotationNoneBlock;
+use Drupal\Tests\WaitTerminateTestTrait;
 use Drupal\user\Entity\Role;
 
 /**
@@ -15,6 +16,8 @@ use Drupal\user\Entity\Role;
  */
 class SettingsTrayBlockFormTest extends SettingsTrayTestBase {
 
+  use WaitTerminateTestTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -44,6 +47,7 @@ class SettingsTrayBlockFormTest extends SettingsTrayTestBase {
       'search content',
     ]);
     $this->drupalLogin($user);
+    $this->setWaitForTerminate();
   }
 
   /**
@@ -231,7 +235,6 @@ class SettingsTrayBlockFormTest extends SettingsTrayTestBase {
    * Tests enabling and disabling Edit Mode.
    */
   public function testEditModeEnableDisable(): void {
-    $this->markTestSkipped("Skipped due to frequent random test failures. See https://www.drupal.org/project/drupal/issues/3317520");
     foreach (static::getTestThemes() as $theme) {
       $this->enableTheme($theme);
       $block = $this->placeBlock('system_powered_by_block');
diff --git a/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php b/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php
index 15b14a771e8..0de26a07a08 100644
--- a/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php
+++ b/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php
@@ -49,11 +49,10 @@ class SettingsTrayTestBase extends OffCanvasTestBase {
     // When page first loads Edit Mode is not triggered until first contextual
     // link is added.
     $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', '.dialog-off-canvas-main-canvas.js-settings-tray-edit-mode'));
-    // @todo https://www.drupal.org/project/drupal/issues/3317520 Work why the
-    //   sleep is necessary in.
-    usleep(100000);
 
-    $block = $this->getSession()->getPage()->find('css', $block_selector);
+    $block = $this->assertSession()->waitForElementVisible('css', $block_selector);
+    $this->assertNotEmpty($block);
+
     $block->mouseOver();
     $block->click();
     $this->waitForOffCanvasToOpen();