--- patches/test-only_18_0.patch 2017-07-01 01:25:19.745466952 +0300 +++ 2828528-61.patch 2017-07-06 18:46:00.215913420 +0300 @@ -1,6 +1,6 @@ diff --git a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php b/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php new file mode 100644 -index 0000000..1bec47f +index 0000000..704e4e7 --- /dev/null +++ b/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageEditorTestTrait.php @@ -0,0 +1,76 @@ @@ -80,7 +80,6 @@ + } + +} -\ No newline at end of file diff --git a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php b/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php index 12e43e7..10e74fa 100644 --- a/core/modules/image/tests/src/FunctionalJavascript/QuickEditImageTest.php @@ -250,10 +249,10 @@ $this->drupalGet('node/' . $node->id()); diff --git a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php new file mode 100644 -index 0000000..bd4eaf9 +index 0000000..9512dd5 --- /dev/null +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php -@@ -0,0 +1,316 @@ +@@ -0,0 +1,318 @@ +click('h1.js-quickedit-page-title > span'); ++ $assert_session = $this->assertSession(); ++ $assert_session->waitForElement('css', '.quickedit-toolbar-field div[id*="title"]'); + $this->assertQuickEditEntityToolbar((string) $node->label(), 'Title'); + $this->assertEntityInstanceFieldStates('node', 1, 0, [ + 'node/1/title/en/full' => 'active', @@ -449,7 +450,7 @@ + 'node/1/body/en/full' => '.cke_editable_inline', + 'node/1/field_tags/en/full' => ':not(.quickedit-editor-is-popup)', + ]); -+ $this->assertSession()->elementExists('css', '#quickedit-entity-toolbar .quickedit-toolgroup.wysiwyg-main > .cke_chrome .cke_top[role="presentation"] .cke_toolbar[role="toolbar"] .cke_toolgroup[role="presentation"] > .cke_button[title="Bold"][role="button"]'); ++ $this->assertSession()->elementExists('css', '#quickedit-entity-toolbar .quickedit-toolgroup.wysiwyg-main > .cke_chrome .cke_top[role="presentation"] .cke_toolbar[role="toolbar"] .cke_toolgroup[role="presentation"] > .cke_button[title~="Bold"][role="button"]'); + + // Wait for the validating & saving of the tags field to complete. + $this->awaitEntityInstanceFieldState('node', 1, 0, 'field_tags', 'en', 'candidate'); @@ -515,11 +516,11 @@ + * Tests if a custom can be in-place edited with Quick Edit. + */ + public function testCustomBlock() { -+ $block_content_type = BlockContentType::create(array( ++ $block_content_type = BlockContentType::create([ + 'id' => 'basic', + 'label' => 'basic', + 'revision' => FALSE -+ )); ++ ]); + $block_content_type->save(); + block_content_add_body_field($block_content_type->id()); + @@ -566,27 +567,21 @@ + $this->assertEntityInstanceFieldMarkup('block_content', 1, 0, [ + 'block_content/1/body/en/full' => '.cke_editable_inline', + ]); -+ $this->assertSession()->elementExists('css', '#quickedit-entity-toolbar .quickedit-toolgroup.wysiwyg-main > .cke_chrome .cke_top[role="presentation"] .cke_toolbar[role="toolbar"] .cke_toolgroup[role="presentation"] > .cke_button[title="Bold"][role="button"]'); ++ $this->assertSession()->elementExists('css', '#quickedit-entity-toolbar .quickedit-toolgroup.wysiwyg-main > .cke_chrome .cke_top[role="presentation"] .cke_toolbar[role="toolbar"] .cke_toolgroup[role="presentation"] > .cke_button[title~="Bold"][role="button"]'); + } + +} diff --git a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditJavascriptTestBase.php b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditJavascriptTestBase.php new file mode 100644 -index 0000000..1fe686d +index 0000000..6ccea9a --- /dev/null +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditJavascriptTestBase.php -@@ -0,0 +1,332 @@ +@@ -0,0 +1,326 @@ +assertFalse($toolbar_edit_button->hasClass('is-active'), 'The "Edit" button in the toolbar is not yet marked as active.'); + foreach ($page->findAll('css', $contextual_links_trigger_selector) as $dom_node) { + /** @var \Behat\Mink\Element\NodeElement $dom_node */ -+ $this->assertTrue($dom_node->hasClass('visually-hidden'), 'The contextual links trigger "' . $dom_node->getParent()->getAttribute('data-contextual-id') .'" is hidden.'); ++ $this->assertTrue($dom_node->hasClass('visually-hidden'), 'The contextual links trigger "' . $dom_node->getParent()->getAttribute('data-contextual-id') . '" is hidden.'); + } + $this->assertTrue(TRUE, 'All contextual links triggers are hidden.'); + @@ -653,7 +648,7 @@ + $this->assertTrue($toolbar_edit_button->hasClass('is-active'), 'The "Edit" button in the toolbar is marked as active.'); + foreach ($page->findAll('css', $contextual_links_trigger_selector) as $dom_node) { + /** @var \Behat\Mink\Element\NodeElement $dom_node */ -+ $this->assertFalse($dom_node->hasClass('visually-hidden'), 'The contextual links trigger "' . $dom_node->getParent()->getAttribute('data-contextual-id') .'" is visible.'); ++ $this->assertFalse($dom_node->hasClass('visually-hidden'), 'The contextual links trigger "' . $dom_node->getParent()->getAttribute('data-contextual-id') . '" is visible.'); + } + $this->assertTrue(TRUE, 'All contextual links triggers are visible.'); +