diff --git a/core/drupalci.yml b/core/drupalci.yml index 94aa2ad22f..30128a3ee5 100644 --- a/core/drupalci.yml +++ b/core/drupalci.yml @@ -4,43 +4,10 @@ build: assessment: testing: - # Run code quality checks. - 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.javascript: concurrency: 15 types: 'PHPUnit-FunctionalJavascript' - testgroups: '--all' + testgroups: '--class "\Drupal\Tests\quickedit\FunctionalJavascript\QuickEditIntegrationTest"' suppress-deprecations: false halt-on-fail: false - # Run nightwatch testing. - # @see https://www.drupal.org/project/drupal/issues/2869825 - nightwatchjs: {} + repeat: 100 diff --git a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditFileTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditFileTest.php index 53fad46e43..dac348073e 100644 --- a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditFileTest.php +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditFileTest.php @@ -2,6 +2,7 @@ namespace Drupal\Tests\quickedit\FunctionalJavascript; +use Drupal\Core\Entity\Entity\EntityViewDisplay; use Drupal\file\Entity\File; use Drupal\node\Entity\Node; use Drupal\Tests\file\Functional\FileFieldCreationTrait; @@ -40,6 +41,13 @@ protected function setUp(): void { // Add file field to Article node type. $this->createFileField('field_file', 'node', 'article', ['file_extensions' => 'txt']); + // Move file field to the top of all fields, so its QuickEdit Toolbar won't + // overlap any QuickEdit-able fields, which causes (semi-)random test + // failures. + $entity_display = EntityViewDisplay::load('node.article.default'); + $entity_display->setComponent('field_file', ['weight' => 0]); + $entity_display->save(); + // Log in as a content author who can use Quick Edit and edit Articles. $user = $this->drupalCreateUser([ 'access contextual links', diff --git a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php index a15bb9ac5b..53369216da 100644 --- a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php +++ b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditIntegrationTest.php @@ -10,6 +10,7 @@ use Drupal\taxonomy\Entity\Term; use Drupal\taxonomy\Entity\Vocabulary; use Drupal\Tests\field\Traits\EntityReferenceTestTrait; +use PHPUnit\Framework\AssertionFailedError; /** * @group quickedit @@ -119,7 +120,6 @@ protected function setUp(): void { * Tests if an article node can be in-place edited with Quick Edit. */ public function testArticleNode() { - $this->markTestSkipped(); $term = Term::create([ 'name' => 'foo', 'vid' => 'tags', @@ -261,6 +261,19 @@ public function testArticleNode() { // Wait for the saving of the tags field to complete. $this->assertJsCondition("Drupal.quickedit.collections.entities.get('node/1[0]').get('state') === 'closed'"); + try { + $this->assertJsCondition("Drupal.quickedit.collections.entities.get('node/1[0]').get('state') === 'closed'"); + } + catch (AssertionFailedError $error) { + $this->assertEntityInstanceFieldStates('node', 1, 0, [ + 'node/1/body/en/full' => 'closed', + 'node/1/title/en/full' => 'closed', + 'node/1/field_tags/en/full' => 'closed', + ]); + $this->createScreenshot(\Drupal::root() . '/sites/default/files/simpletest/screen_QuickEditIntegrationTest_CLUNK_' . time() . '.png'); + throw $error; + } + $this->assertEntityInstanceStates([ 'node/1[0]' => 'closed', ]); @@ -272,62 +285,4 @@ public function testArticleNode() { $this->assertSession()->linkExists('bar'); } - /** - * 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', - 'revision' => FALSE, - ]); - $block_content_type->save(); - block_content_add_body_field($block_content_type->id()); - - $block_content = BlockContent::create([ - 'info' => 'Llama', - 'type' => 'basic', - 'body' => [ - 'value' => 'The name "llama" was adopted by European settlers from native Peruvians.', - 'format' => 'some_format', - ], - ]); - $block_content->save(); - $this->drupalPlaceBlock('block_content:' . $block_content->uuid(), [ - 'label' => 'My custom block!', - ]); - - $this->drupalGet(''); - - // Initial state. - $this->awaitQuickEditForEntity('block_content', 1); - $this->assertEntityInstanceStates([ - 'block_content/1[0]' => 'closed', - ]); - - // Start in-place editing of the article node. - $this->startQuickEditViaToolbar('block_content', 1, 0); - $this->assertEntityInstanceStates([ - 'block_content/1[0]' => 'opened', - ]); - $this->assertQuickEditEntityToolbar((string) $block_content->label(), 'Body'); - $this->assertEntityInstanceFieldStates('block_content', 1, 0, [ - 'block_content/1/body/en/full' => 'highlighted', - ]); - - // Click the body field. - $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->assertEntityInstanceFieldStates('block_content', 1, 0, [ - 'block_content/1/body/en/full' => 'active', - ]); - $this->assertEntityInstanceFieldMarkup([ - '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"]'); - } - }