diff --git a/core/modules/node/tests/src/FunctionalJavascript/TestSettingSummariesContentType.php b/core/modules/node/tests/src/FunctionalJavascript/TestSettingSummariesContentType.php index 210df1c..17d82e8 100644 --- a/core/modules/node/tests/src/FunctionalJavascript/TestSettingSummariesContentType.php +++ b/core/modules/node/tests/src/FunctionalJavascript/TestSettingSummariesContentType.php @@ -28,70 +28,29 @@ public function setUp() { } /** - * Tests updating summaries. + * Tests spaces between commas in summaries. */ - public function testSummariesUpdate() { + public function testSpacesBetweenCommasInSummariesUpdate() { $this->drupalGet('admin/structure/types/manage/test'); - $session = $this->getSession(); $page = $session->getPage(); - // Testing "Submission form settings" zone. - $id = '#edit-submission'; - $selector = '[href=\\' . $id . '] .vertical-tabs__menu-item-summary'; - $title = 'Test Title'; - $page->findField('edit-title-label')->setValue($title); - $is_change = $this->waitSummaryUpdateAfterChanges($page, [$title], $selector); - $this->assertTrue($is_change, 'Submission summary update.'); - $text = $page->findAll('css', $selector)[0]->getText(); - $this->assertNotContains(' , ', $text); - - // Testing "Workflow" zone. - $this->checkZone($page, 'workflow'); - - // Testing "Language settings" zone. - $this->checkZone($page, 'language'); - - // Testing "Display settings" zone. - $this->checkZone($page, 'display'); - } - - private function checkZone($page, $zone) { - $id = '#edit-' . $zone; - $selector = '[href=\\' . $id . '] .vertical-tabs__menu-item-summary'; - $labels = $this->checkedAllCheckboxes($page, $id); - $is_change = $this->waitSummaryUpdateAfterChanges($page, $labels, $selector); - $this->assertTrue($is_change, ucfirst($zone) . ' summary update.'); - $text = $page->findAll('css', $selector)[0]->getText(); - $this->assertNotContains(' , ', $text); - } - - private function checkedAllCheckboxes($page, $selector) { - $selector = $selector . ' .form-type-checkbox [type=checkbox]'; - $checkboxes = $page->findAll('css', $selector); + $checkboxes = $page->findAll('css', '.vertical-tabs__panes [type=checkbox]'); foreach ($checkboxes as $checkbox) { $checkbox->check(); } - $labels = []; - $items = $page->findAll('css', $selector . ' + label'); - foreach ($items as $item) { - $labels[] = $item->getText(); - } - - return $labels; - } - - private function waitSummaryUpdateAfterChanges($page, $items, $selector) { - return $page->waitFor(10, function () use ($page, $items, $selector) { - $summary = $page->findAll('css', $selector)[0]->getText(); - foreach ($items as $item) { - if (!preg_match('/\b' . $item . '\b/', $summary)) { - return FALSE; + $is_spaces_between_comma = $page->waitFor(10, function () use ($page) { + $summaries = $page->findAll('css', '.vertical-tabs__menu-item-summary'); + foreach ($summaries as $summary) { + if (strpos($summary->getText(), ' , ') !== FALSE) { + return TRUE; } } - return TRUE; + return FALSE; }); + + $this->assertFalse($is_spaces_between_comma, 'Spaces between commas'); } }