Commit cff7a5b6 authored by catch's avatar catch
Browse files

Issue #3174928 by alexpott, andypost: Improve the stability of core JS testing... 

Issue #3174928 by alexpott, andypost: Improve the stability of core JS testing and prepare for update of MinkSelenium2Driver

(cherry picked from commit 9a28c1a7)
parent 6175523f

core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public function testAddAjaxBlock() { 
    // Find the radio buttons.

    $name = 'settings[ajax_test]';

    /** @var \Behat\Mink\Element\NodeElement[] $radios */

    $radios = $this->cssSelect('input[name="' . $name . '"]');

    $radios = $this->assertSession()->fieldExists($name);

    // Click them both a couple of times.

    foreach ([1, 2] as $rounds) {

      foreach ($radios as $radio) {
@@ -91,7 +91,7 @@ public function testAddAjaxBlock() { 
      }

    }

    // Then add the block.

    $page->pressButton('Add block');

    $assert_session->waitForElementVisible('named', ['button', 'Add block'])->press();

    $assert_session->assertWaitOnAjaxRequest();

    $block_elements = $this->cssSelect('.block-layout-builder-test-testajax');

    // Should be exactly one of these in there.

core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderNestedFormUiTest.php

+2 −2
Original line number Diff line number Diff line
@@ -141,10 +141,10 @@ protected function addFormBlock($label, $path, $expected_save_message) { 
    // Add the form block.

    $assert_session->linkExists('Add block');

    $this->clickLink('Add block');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->waitForElementVisible('named', ['link', $label]);

    $assert_session->linkExists($label);

    $this->clickLink($label);

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->waitForElementVisible('named', ['button', 'Add block']);

    $page->pressButton('Add block');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->pageTextContains($label);

core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php

+3 −3
Original line number Diff line number Diff line
@@ -102,11 +102,11 @@ public function testQuickEditIgnoresDuplicateFields() { 
    $this->drupalGet('admin/structure/types/manage/article/display/default/layout');

    $page->clickLink('Add block');

    $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#drupal-off-canvas'));

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->waitForElementVisible('named', ['link', 'Body']);

    $page->clickLink('Body');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->waitForElementVisible('named', ['button', 'Add block']);

    $page->pressButton('Add block');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->waitForElementVisible('named', ['button', 'Save layout']);

    $page->pressButton('Save layout');

    $this->assertNotEmpty($assert_session->waitForElement('css', '.messages--status'));

    $assert_session->pageTextContains('The layout has been saved.');

core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php

+2 −4
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ public function testLayoutBuilderUi() { 
    $this->assertNotEmpty($assert_session->waitForElementVisible('named', ['link', 'Two column']));



    $this->clickLink('Two column');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->waitForElementVisible('named', ['button', 'Add section']);

    $page->pressButton('Add section');

    $assert_session->assertWaitOnAjaxRequest();
@@ -293,7 +293,7 @@ public function testConfigurableLayoutSections() { 
    // Add another section.

    $assert_session->linkExists('Add section');

    $this->clickLink('Add section');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->waitForElementVisible('named', ['link', 'Layout plugin (with settings)']);

    $assert_session->elementExists('css', '#drupal-off-canvas');



    $assert_session->linkExists('Layout plugin (with settings)');
@@ -301,7 +301,6 @@ public function testConfigurableLayoutSections() { 
    $this->assertOffCanvasFormAfterWait('layout_builder_configure_section');

    $assert_session->fieldExists('layout_settings[setting_1]');

    $page->pressButton('Add section');

    $assert_session->assertWaitOnAjaxRequest();



    $assert_session->assertNoElementAfterWait('css', '#drupal-off-canvas');

    $assert_session->pageTextContains('Default');
@@ -313,7 +312,6 @@ public function testConfigurableLayoutSections() { 
    $this->assertOffCanvasFormAfterWait('layout_builder_configure_section');

    $page->fillField('layout_settings[setting_1]', 'Test setting value');

    $page->pressButton('Update');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->assertNoElementAfterWait('css', '#drupal-off-canvas');

    $assert_session->pageTextContains('Test setting value');

    $this->assertPageNotReloaded();

core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderUiTest.php

+2 −2
Original line number Diff line number Diff line
@@ -115,10 +115,10 @@ protected function assertModifiedLayout($path) { 


    $this->drupalGet($path);

    $page->clickLink('Add section');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->waitForElementVisible('named', ['link', 'One column']);

    $assert_session->pageTextNotContains('You have unsaved changes.');

    $page->clickLink('One column');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->waitForElementVisible('named', ['button', 'Add section']);

    $page->pressButton('Add section');

    $assert_session->assertWaitOnAjaxRequest();

    $assert_session->pageTextContainsOnce('You have unsaved changes.');