diff --git a/core/drupalci.yml b/core/drupalci.yml index 413272eff3..f27d7ec322 100644 --- a/core/drupalci.yml +++ b/core/drupalci.yml @@ -8,42 +8,42 @@ build: assessment: testing: # Run code quality checks. - container_command.commit-checks: - commands: - - "core/scripts/dev/commit-code-check.sh --drupalci" - halt-on-fail: true +# container_command.commit-checks: +# commands: +# - "core/scripts/dev/commit-code-check.sh --drupalci" +# halt-on-fail: true # run_tests task is executed several times in order of performance speeds. # halt-on-fail can be set on the run_tests tasks in order to fail fast. # suppress-deprecations is false in order to be alerted to usages of # deprecated code. - run_tests.phpunit: - types: 'PHPUnit-Unit' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false - run_tests.kernel: - types: 'PHPUnit-Kernel' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false - run_tests.build: - # Limit concurrency due to disk space concerns. - concurrency: 15 - types: 'PHPUnit-Build' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false - run_tests.functional: - types: 'PHPUnit-Functional' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false +# run_tests.phpunit: +# types: 'PHPUnit-Unit' +# testgroups: '--all' +# suppress-deprecations: false +# halt-on-fail: false +# run_tests.kernel: +# types: 'PHPUnit-Kernel' +# testgroups: '--all' +# suppress-deprecations: false +# halt-on-fail: false +# run_tests.build: +# # Limit concurrency due to disk space concerns. +# concurrency: 15 +# types: 'PHPUnit-Build' +# testgroups: '--all' +# suppress-deprecations: false +# halt-on-fail: false +# run_tests.functional: +# types: 'PHPUnit-Functional' +# testgroups: '--all' +# suppress-deprecations: false +# halt-on-fail: false run_tests.javascript: concurrency: 15 types: 'PHPUnit-FunctionalJavascript' testgroups: '--all' suppress-deprecations: false halt-on-fail: false - # Run nightwatch testing. - # @see https://www.drupal.org/project/drupal/issues/2869825 - nightwatchjs: {} +# # Run nightwatch testing. +# # @see https://www.drupal.org/project/drupal/issues/2869825 +# nightwatchjs: {} diff --git a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php index b24c4e90a0..f10d9576f7 100644 --- a/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php +++ b/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php @@ -307,16 +307,4 @@ protected function getElementVerticalPosition($css_selector, $position_type) { return (int) $this->getSession()->evaluateScript("document.querySelector('$css_selector').getBoundingClientRect().$position_type + window.pageYOffset"); } - /** - * Moves mouse pointer to location of $selector. - * - * @param string $selector - * CSS selector. - */ - protected function movePointerTo($selector) { - $driver_session = $this->getSession()->getDriver()->getWebDriverSession(); - $element = $driver_session->element('css selector', $selector); - $driver_session->moveto(['element' => $element->getID()]); - } - } diff --git a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php index 8125b13911..b236cb9592 100644 --- a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php @@ -167,7 +167,7 @@ public function testArticleNode() { // Click the title field. $this->click('[data-quickedit-field-id="node/1/title/en/full"].quickedit-candidate'); $assert_session->waitForElement('css', '.quickedit-toolbar-field div[id*="title"]'); - $this->assertQuickEditEntityToolbar((string) $node->label(), 'Title'); + $this->assertQuickEditEntityToolbar((string) $node->label(), 'Title', 'node/1/title/en/full'); $this->assertEntityInstanceFieldStates('node', 1, 0, [ 'node/1/title/en/full' => 'active', 'node/1/body/en/full' => 'candidate', @@ -190,7 +190,7 @@ public function testArticleNode() { hold_test_response(TRUE); $this->click('[data-quickedit-entity-id="node/1"] .field--name-body'); $assert_session->waitForElement('css', '.quickedit-toolbar-field div[id*="body"]'); - $this->assertQuickEditEntityToolbar((string) $node->label(), 'Body'); + $this->assertQuickEditEntityToolbar((string) $node->label(), 'Body', 'node/1'); $this->assertEntityInstanceFieldStates('node', 1, 0, [ 'node/1/title/en/full' => 'saving', 'node/1/body/en/full' => 'active', @@ -211,7 +211,7 @@ public function testArticleNode() { hold_test_response(TRUE); $this->click('[data-quickedit-field-id="node/1/field_tags/en/full"]'); $assert_session->waitForElement('css', '.quickedit-toolbar-field div[id*="tags"]'); - $this->assertQuickEditEntityToolbar((string) $node->label(), 'Tags'); + $this->assertQuickEditEntityToolbar((string) $node->label(), 'Tags', 'node/1/field_tags/en/full'); $this->assertEntityInstanceFieldStates('node', 1, 0, [ 'node/1/body/en/full' => 'candidate', 'node/1/field_tags/en/full' => 'activating', @@ -259,6 +259,7 @@ public function testArticleNode() { hold_test_response(FALSE); // Wait for the saving of the tags field to complete. + $assert_session->waitForElementRemoved('css', 'button.action-save'); $this->assertJsCondition("Drupal.quickedit.collections.entities.get('node/1[0]').get('state') === 'closed'"); $this->assertEntityInstanceStates([ 'node/1[0]' => 'closed', @@ -275,7 +276,6 @@ public function testArticleNode() { * Tests if a custom can be in-place edited with Quick Edit. */ public function testCustomBlock() { - $this->markTestSkipped('This test fails pretty consistently on the latest Chromedriver'); $block_content_type = BlockContentType::create([ 'id' => 'basic', 'label' => 'basic', @@ -310,7 +310,7 @@ public function testCustomBlock() { $this->assertEntityInstanceStates([ 'block_content/1[0]' => 'opened', ]); - $this->assertQuickEditEntityToolbar((string) $block_content->label(), 'Body'); + $this->assertQuickEditEntityToolbar((string) $block_content->label(), 'Body', 'block_content/1/body/en/full'); $this->assertEntityInstanceFieldStates('block_content', 1, 0, [ 'block_content/1/body/en/full' => 'highlighted', ]); @@ -319,7 +319,7 @@ public function testCustomBlock() { $this->click('[data-quickedit-entity-id="block_content/1"] .field--name-body'); $assert_session = $this->assertSession(); $assert_session->waitForElement('css', '.quickedit-toolbar-field div[id*="body"]'); - $this->assertQuickEditEntityToolbar((string) $block_content->label(), 'Body'); + $this->assertQuickEditEntityToolbar((string) $block_content->label(), 'Body', 'block_content/1'); $this->assertEntityInstanceFieldStates('block_content', 1, 0, [ 'block_content/1/body/en/full' => 'active', ]); diff --git a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditJavascriptTestBase.php b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditJavascriptTestBase.php index 99e99151d8..600df0a647 100644 --- a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditJavascriptTestBase.php +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditJavascriptTestBase.php @@ -160,8 +160,11 @@ protected function awaitEntityInstanceFieldState($entity_type_id, $entity_id, $e * @param string|null $expected_field_label * The expected field label in the Quick Edit Entity Toolbar, or NULL * if no field label is expected. + * @param string $data_quickedit_field_id + * (optional) The value of the CSS attribute 'data-quickedit-field-id' on + * the HTML element. */ - protected function assertQuickEditEntityToolbar($expected_entity_label, $expected_field_label) { + protected function assertQuickEditEntityToolbar($expected_entity_label, $expected_field_label, string $data_quickedit_field_id = '') { $quickedit_entity_toolbar = $this->getSession()->getPage()->findById('quickedit-entity-toolbar'); // We cannot use ->getText() because it also returns the text of all child // nodes. We also cannot use XPath to select text node in Selenium. So we @@ -169,6 +172,15 @@ protected function assertQuickEditEntityToolbar($expected_entity_label, $expecte $this->assertSame($expected_entity_label, $this->getSession()->evaluateScript("return window.jQuery('#quickedit-entity-toolbar .quickedit-toolbar-label').clone().children().remove().end().text();")); if ($expected_field_label !== NULL) { $field_label = $quickedit_entity_toolbar->find('css', '.quickedit-toolbar-label > .field'); + if ($field_label === NULL && $data_quickedit_field_id !== '') { + // The field label only appears when the CSS element is hovered on by + // the mouse pointer. If this hasn't been picked up by our WebDriver + // yet, we move the mouse pointer to the page title block and back to + // our quick edit element here to trigger it. + $this->movePointerTo('.block-page-title-block'); + $this->movePointerTo("[data-quickedit-field-id='" . $data_quickedit_field_id . "']"); + $field_label = $quickedit_entity_toolbar->find('css', '.quickedit-toolbar-label > .field'); + } // Only try to find the text content of the element if it was actually // found; otherwise use the returned value for assertion. This helps // us find a more useful stack/error message from testbot instead of the diff --git a/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php b/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php index 7f92b9ed00..697376930a 100644 --- a/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php +++ b/core/tests/Drupal/FunctionalJavascriptTests/WebDriverTestBase.php @@ -221,4 +221,16 @@ protected function getHtmlOutputHeaders() { return ''; } + /** + * Moves mouse pointer to location of $selector. + * + * @param string $selector + * CSS selector. + */ + protected function movePointerTo(string $selector): void { + $driver_session = $this->getSession()->getDriver()->getWebDriverSession(); + $element = $driver_session->element('css selector', $selector); + $driver_session->moveto(['element' => $element->getID()]); + } + }