diff --git a/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php b/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
index c3731b85ae5a3ad007307943039cd8279c427d9e..33900bdea47fd36d711c1ae1910d3e40108e8cde 100644
--- a/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
+++ b/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
@@ -376,13 +376,13 @@ protected function assertBigPipePlaceholders(array $expected_big_pipe_placeholde
$placeholder_positions[$pos] = $big_pipe_placeholder_id;
// Verify expected placeholder replacement.
$expected_placeholder_replacement = '<script type="application/vnd.drupal-ajax" data-big-pipe-replacement-for-placeholder-with-id="' . $big_pipe_placeholder_id . '">';
- $result = $this->xpath('//script[@data-big-pipe-replacement-for-placeholder-with-id=:id]', [':id' => Html::decodeEntities($big_pipe_placeholder_id)]);
+ $xpath = '//script[@data-big-pipe-replacement-for-placeholder-with-id="' . Html::decodeEntities($big_pipe_placeholder_id) . '"]';
if ($expected_ajax_response === NULL) {
- $this->assertCount(0, $result);
+ $this->assertSession()->elementNotExists('xpath', $xpath);
$this->assertSession()->responseNotContains($expected_placeholder_replacement);
continue;
}
- $this->assertEquals($expected_ajax_response, trim($result[0]->getText()));
+ $this->assertSession()->elementTextContains('xpath', $xpath, $expected_ajax_response);
$this->assertSession()->responseContains($expected_placeholder_replacement);
$pos = strpos($this->getSession()->getPage()->getContent(), $expected_placeholder_replacement);
$placeholder_replacement_positions[$pos] = $big_pipe_placeholder_id;
diff --git a/core/modules/block/tests/src/Functional/AssertBlockAppearsTrait.php b/core/modules/block/tests/src/Functional/AssertBlockAppearsTrait.php
index b229c6f23c157e3a38b7b66f0bab67814479b9ad..f78b1404d7104b6d18217a0aef244bd82a415e61 100644
--- a/core/modules/block/tests/src/Functional/AssertBlockAppearsTrait.php
+++ b/core/modules/block/tests/src/Functional/AssertBlockAppearsTrait.php
@@ -18,8 +18,7 @@ trait AssertBlockAppearsTrait {
* The block entity to find on the page.
*/
protected function assertBlockAppears(Block $block) {
- $result = $this->findBlockInstance($block);
- $this->assertNotEmpty($result, sprintf('The block %s should appear on the page.', $block->id()));
+ $this->assertSession()->elementExists('xpath', "//div[@id = 'block-{$block->id()}']");
}
/**
@@ -29,8 +28,7 @@ protected function assertBlockAppears(Block $block) {
* The block entity to find on the page.
*/
protected function assertNoBlockAppears(Block $block) {
- $result = $this->findBlockInstance($block);
- $this->assertEmpty($result, sprintf('The block %s should not appear on the page.', $block->id()));
+ $this->assertSession()->elementNotExists('xpath', "//div[@id = 'block-{$block->id()}']");
}
/**
@@ -41,8 +39,14 @@ protected function assertNoBlockAppears(Block $block) {
*
* @return array
* The result from the xpath query.
+ *
+ * @deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. There is no
+ * replacement.
+ *
+ * @see https://www.drupal.org/node/3293310
*/
protected function findBlockInstance(Block $block) {
+ @trigger_error(__METHOD__ . '() is deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3293310', E_USER_DEPRECATED);
return $this->xpath('//div[@id = :id]', [':id' => 'block-' . $block->id()]);
}
diff --git a/core/modules/block/tests/src/Functional/BlockHtmlTest.php b/core/modules/block/tests/src/Functional/BlockHtmlTest.php
index 17b67a7b64ae2e68a2647fbe98502930b4a7cfad..07af38369050c5b55bcc9df537c5d25234ac8828 100644
--- a/core/modules/block/tests/src/Functional/BlockHtmlTest.php
+++ b/core/modules/block/tests/src/Functional/BlockHtmlTest.php
@@ -51,8 +51,7 @@ public function testHtml() {
$this->assertSession()->elementExists('xpath', '//div[@id="block-test-html-block" and @data-custom-attribute="foo"]');
// Ensure expected markup for a menu block.
- $elements = $this->xpath('//nav[@id="block-test-menu-block"]/ul/li');
- $this->assertNotEmpty($elements, 'The proper block markup was found.');
+ $this->assertSession()->elementExists('xpath', '//nav[@id="block-test-menu-block"]/ul/li');
}
}
diff --git a/core/modules/block/tests/src/Functional/BlockLanguageTest.php b/core/modules/block/tests/src/Functional/BlockLanguageTest.php
index 7fe06c9c1bacef0d54c13250389dca97671715e1..7020fd5df9c0ad32a02daa3bf11ca7ab110a8614 100644
--- a/core/modules/block/tests/src/Functional/BlockLanguageTest.php
+++ b/core/modules/block/tests/src/Functional/BlockLanguageTest.php
@@ -138,8 +138,7 @@ public function testLanguageBlockVisibilityLanguageDelete() {
// Ensure that the block visibility for language is gone from the UI.
$this->drupalGet('admin/structure/block');
$this->clickLink('Configure');
- $elements = $this->xpath('//details[@id="edit-visibility-language"]');
- $this->assertEmpty($elements);
+ $this->assertSession()->elementNotExists('xpath', '//details[@id="edit-visibility-language"]');
}
/**
diff --git a/core/modules/block/tests/src/Functional/BlockSystemBrandingTest.php b/core/modules/block/tests/src/Functional/BlockSystemBrandingTest.php
index 56615669da528b759a7f0b88804fea82f6f8f285..abf78ae3e8659e03a5f08bbe3fdb132e2b7b122d 100644
--- a/core/modules/block/tests/src/Functional/BlockSystemBrandingTest.php
+++ b/core/modules/block/tests/src/Functional/BlockSystemBrandingTest.php
@@ -44,12 +44,11 @@ public function testSystemBrandingSettings() {
// Set default block settings.
$this->drupalGet('');
- $site_logo_element = $this->xpath($site_logo_xpath);
- $site_name_element = $this->xpath($site_name_xpath);
// Test that all branding elements are displayed.
- $this->assertNotEmpty($site_logo_element, 'The branding block logo was found.');
- $this->assertNotEmpty($site_name_element, 'The branding block site name was found.');
+ $this->assertSession()->elementExists('xpath', $site_logo_xpath);
+ $this->assertSession()->elementExists('xpath', $site_name_xpath);
+ $this->assertSession()->elementExists('xpath', $site_slogan_xpath);
$this->assertSession()->elementTextContains('xpath', $site_slogan_xpath, 'Community plumbing');
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'config:system.site');
// Just this once, assert that the img src of the logo is as expected.
@@ -61,18 +60,18 @@ public function testSystemBrandingSettings() {
->set('slogan', '<script>alert("Community carpentry");</script>')
->save();
$this->drupalGet('');
- $this->assertSession()->elementTextContains('xpath', $site_slogan_xpath, 'alert("Community carpentry");');
+ $this->assertSession()->elementTextEquals('xpath', $site_slogan_xpath, 'alert("Community carpentry");');
$this->assertSession()->responseNotContains('<script>alert("Community carpentry");</script>');
+
// Turn just the logo off.
$this->config('block.block.site-branding')
->set('settings.use_site_logo', 0)
->save();
$this->drupalGet('');
- $site_logo_element = $this->xpath($site_logo_xpath);
- $site_name_element = $this->xpath($site_name_xpath);
+
// Re-test all branding elements.
- $this->assertEmpty($site_logo_element, 'The branding block logo was disabled.');
- $this->assertNotEmpty($site_name_element, 'The branding block site name was found.');
+ $this->assertSession()->elementNotExists('xpath', $site_logo_xpath);
+ $this->assertSession()->elementExists('xpath', $site_name_xpath);
$this->assertSession()->elementTextContains('xpath', $site_slogan_xpath, 'alert("Community carpentry");');
$this->assertSession()->responseNotContains('<script>alert("Community carpentry");</script>');
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'config:system.site');
@@ -83,11 +82,10 @@ public function testSystemBrandingSettings() {
->set('settings.use_site_name', 0)
->save();
$this->drupalGet('');
- $site_logo_element = $this->xpath($site_logo_xpath);
- $site_name_element = $this->xpath($site_name_xpath);
+
// Re-test all branding elements.
- $this->assertNotEmpty($site_logo_element, 'The branding block logo was found.');
- $this->assertEmpty($site_name_element, 'The branding block site name was disabled.');
+ $this->assertSession()->elementExists('xpath', $site_logo_xpath);
+ $this->assertSession()->elementNotExists('xpath', $site_name_xpath);
$this->assertSession()->elementTextContains('xpath', $site_slogan_xpath, 'alert("Community carpentry");');
$this->assertSession()->responseNotContains('<script>alert("Community carpentry");</script>');
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'config:system.site');
@@ -98,11 +96,10 @@ public function testSystemBrandingSettings() {
->set('settings.use_site_slogan', 0)
->save();
$this->drupalGet('');
- $site_logo_element = $this->xpath($site_logo_xpath);
- $site_name_element = $this->xpath($site_name_xpath);
+
// Re-test all branding elements.
- $this->assertNotEmpty($site_logo_element, 'The branding block logo was found.');
- $this->assertNotEmpty($site_name_element, 'The branding block site name was found.');
+ $this->assertSession()->elementExists('xpath', $site_logo_xpath);
+ $this->assertSession()->elementExists('xpath', $site_name_xpath);
$this->assertSession()->elementTextNotContains('xpath', $site_slogan_xpath, 'Community carpentry');
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'config:system.site');
@@ -112,11 +109,10 @@ public function testSystemBrandingSettings() {
->set('settings.use_site_slogan', 0)
->save();
$this->drupalGet('');
- $site_logo_element = $this->xpath($site_logo_xpath);
- $site_name_element = $this->xpath($site_name_xpath);
+
// Re-test all branding elements.
- $this->assertNotEmpty($site_logo_element, 'The branding block logo was found.');
- $this->assertEmpty($site_name_element, 'The branding block site name was disabled.');
+ $this->assertSession()->elementExists('xpath', $site_logo_xpath);
+ $this->assertSession()->elementNotExists('xpath', $site_name_xpath);
$this->assertSession()->elementTextNotContains('xpath', $site_slogan_xpath, 'Community carpentry');
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', 'config:system.site');
}
diff --git a/core/modules/block/tests/src/Functional/BlockUiTest.php b/core/modules/block/tests/src/Functional/BlockUiTest.php
index 4efba996147162e5e4f76ce4af7bc24d8199378d..b60818f2d74ef1d7ace4d466df788b75184f6086 100644
--- a/core/modules/block/tests/src/Functional/BlockUiTest.php
+++ b/core/modules/block/tests/src/Functional/BlockUiTest.php
@@ -116,14 +116,12 @@ public function testBlockAdminUiPage() {
// Visit the blocks admin ui.
$this->drupalGet('admin/structure/block');
// Look for the blocks table.
- $blocks_table = $this->xpath("//table[@id='blocks']");
- $this->assertNotEmpty($blocks_table, 'The blocks table is being rendered.');
+ $this->assertSession()->elementExists('xpath', "//table[@id='blocks']");
// Look for test blocks in the table.
foreach ($this->blockValues as $delta => $values) {
$block = $this->blocks[$delta];
$label = $block->label();
- $element = $this->xpath('//*[@id="blocks"]/tbody/tr[' . $values['tr'] . ']/td[1]/text()');
- $this->assertEquals($element[0]->getText(), $label, 'The "' . $label . '" block title is set inside the ' . $values['settings']['region'] . ' region.');
+ $this->assertSession()->elementTextEquals('xpath', '//*[@id="blocks"]/tbody/tr[' . $values['tr'] . ']/td[1]/text()', $label);
// Look for a test block region select form element.
$this->assertSession()->fieldExists('blocks[' . $values['settings']['id'] . '][region]');
// Move the test block to the header region.
@@ -144,8 +142,7 @@ public function testBlockAdminUiPage() {
// Add a block with a machine name the same as a region name.
$this->drupalPlaceBlock('system_powered_by_block', ['region' => 'header', 'id' => 'header']);
$this->drupalGet('admin/structure/block');
- $element = $this->xpath('//tr[contains(@class, :class)]', [':class' => 'region-title-header']);
- $this->assertNotEmpty($element);
+ $this->assertSession()->elementExists('xpath', '//tr[contains(@class, "region-title-header")]');
// Ensure hidden themes do not appear in the UI. Enable another non base
// theme and place the local tasks block.
@@ -179,17 +176,9 @@ public function testBlockAdminUiPage() {
* Tests the block categories on the listing page.
*/
public function testCandidateBlockList() {
- $arguments = [
- ':title' => 'Display message',
- ':category' => 'Block test',
- ':href' => 'admin/structure/block/add/test_block_instantiation/stark',
- ];
- $pattern = '//tr[.//td/div[text()=:title] and .//td[text()=:category] and .//td//a[contains(@href, :href)]]';
-
$this->drupalGet('admin/structure/block');
$this->clickLink('Place block');
- $elements = $this->xpath($pattern, $arguments);
- $this->assertNotEmpty($elements, 'The test block appears in the category for its module.');
+ $this->assertSession()->elementExists('xpath', '//tr[.//td/div[text()="Display message"] and .//td[text()="Block test"] and .//td//a[contains(@href, "admin/structure/block/add/test_block_instantiation/stark")]]');
// Trigger the custom category addition in block_test_block_alter().
$this->container->get('state')->set('block_test_info_alter', TRUE);
@@ -197,9 +186,7 @@ public function testCandidateBlockList() {
$this->drupalGet('admin/structure/block');
$this->clickLink('Place block');
- $arguments[':category'] = 'Custom category';
- $elements = $this->xpath($pattern, $arguments);
- $this->assertNotEmpty($elements, 'The test block appears in a custom category controlled by block_test_block_alter().');
+ $this->assertSession()->elementExists('xpath', '//tr[.//td/div[text()="Display message"] and .//td[text()="Custom category"] and .//td//a[contains(@href, "admin/structure/block/add/test_block_instantiation/stark")]]');
}
/**
@@ -225,17 +212,10 @@ public function testContextAwareBlocks() {
$this->assertSession()->responseNotContains($expected_text);
$block_url = 'admin/structure/block/add/test_context_aware/stark';
- $arguments = [
- ':title' => 'Test context-aware block',
- ':category' => 'Block test',
- ':href' => $block_url,
- ];
- $pattern = '//tr[.//td/div[text()=:title] and .//td[text()=:category] and .//td//a[contains(@href, :href)]]';
$this->drupalGet('admin/structure/block');
$this->clickLink('Place block');
- $elements = $this->xpath($pattern, $arguments);
- $this->assertNotEmpty($elements, 'The context-aware test block appears.');
+ $this->assertSession()->elementExists('xpath', '//tr[.//td/div[text()="Test context-aware block"] and .//td[text()="Block test"] and .//td//a[contains(@href, "' . $block_url . '")]]');
$definition = \Drupal::service('plugin.manager.block')->getDefinition('test_context_aware');
$this->assertNotEmpty($definition, 'The context-aware test block exists.');
$edit = [
@@ -366,10 +346,7 @@ public function testBlockValidateErrors() {
], 'Save block');
$this->assertSession()->statusMessageContains('Only digits are allowed', 'error');
-
- $error_class_pattern = '//div[contains(@class,"form-item-settings-digits")]/input[contains(@class,"error")]';
- $error_class = $this->xpath($error_class_pattern);
- $this->assertNotEmpty($error_class, 'Plugin error class found in parent form.');
+ $this->assertSession()->elementExists('xpath', '//div[contains(@class,"form-item-settings-digits")]/input[contains(@class,"error")]');
}
/**
diff --git a/core/modules/comment/tests/src/Functional/CommentCSSTest.php b/core/modules/comment/tests/src/Functional/CommentCSSTest.php
index 5d970398d1373e00aef53a42570ce919220487da..5ad9c93248be2fce55ec2814c39814361d6fd3e5 100644
--- a/core/modules/comment/tests/src/Functional/CommentCSSTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentCSSTest.php
@@ -93,43 +93,43 @@ public function testCommentClasses() {
// Verify the data-history-node-id attribute, which is necessary for the
// by-viewer class and the "new" indicator, see below.
- $this->assertCount(1, $this->xpath('//*[@data-history-node-id="' . $node->id() . '"]'), 'data-history-node-id attribute is set on node.');
+ $this->assertSession()->elementsCount('xpath', '//*[@data-history-node-id="' . $node->id() . '"]', 1);
// Verify classes if the comment is visible for the current user.
if ($case['comment_status'] == CommentInterface::PUBLISHED || $case['user'] == 'admin') {
// Verify the by-anonymous class.
- $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-anonymous")]');
+ $comments = '//*[contains(@class, "comment") and contains(@class, "by-anonymous")]';
if ($case['comment_uid'] == 0) {
- $this->assertCount(1, $comments, 'by-anonymous class found.');
+ $this->assertSession()->elementsCount('xpath', $comments, 1);
}
else {
- $this->assertCount(0, $comments, 'by-anonymous class not found.');
+ $this->assertSession()->elementNotExists('xpath', $comments);
}
// Verify the by-node-author class.
- $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "by-node-author")]');
+ $comments = '//*[contains(@class, "comment") and contains(@class, "by-node-author")]';
if ($case['comment_uid'] > 0 && $case['comment_uid'] == $case['node_uid']) {
- $this->assertCount(1, $comments, 'by-node-author class found.');
+ $this->assertSession()->elementsCount('xpath', $comments, 1);
}
else {
- $this->assertCount(0, $comments, 'by-node-author class not found.');
+ $this->assertSession()->elementNotExists('xpath', $comments);
}
// Verify the data-comment-user-id attribute, which is used by the
// drupal.comment-by-viewer library to add a by-viewer when the current
// user (the viewer) was the author of the comment. We do this in Java-
// Script to prevent breaking the render cache.
- $this->assertCount(1, $this->xpath('//*[contains(@class, "comment") and @data-comment-user-id="' . $case['comment_uid'] . '"]'), 'data-comment-user-id attribute is set on comment.');
+ $this->assertSession()->elementsCount('xpath', '//*[contains(@class, "comment") and @data-comment-user-id="' . $case['comment_uid'] . '"]', 1);
$this->assertSession()->responseContains($this->getModulePath('comment') . '/js/comment-by-viewer.js');
}
// Verify the unpublished class.
- $comments = $this->xpath('//*[contains(@class, "comment") and contains(@class, "unpublished")]');
+ $comments = '//*[contains(@class, "comment") and contains(@class, "unpublished")]';
if ($case['comment_status'] == CommentInterface::NOT_PUBLISHED && $case['user'] == 'admin') {
- $this->assertCount(1, $comments, 'unpublished class found.');
+ $this->assertSession()->elementsCount('xpath', $comments, 1);
}
else {
- $this->assertCount(0, $comments, 'unpublished class not found.');
+ $this->assertSession()->elementNotExists('xpath', $comments);
}
// Verify the data-comment-timestamp attribute, which is used by the
@@ -137,7 +137,7 @@ public function testCommentClasses() {
// comment that was created or changed after the last time the current
// user read the corresponding node.
if ($case['comment_status'] == CommentInterface::PUBLISHED || $case['user'] == 'admin') {
- $this->assertCount(1, $this->xpath('//*[contains(@class, "comment")]/*[@data-comment-timestamp="' . $comment->getChangedTime() . '"]'), 'data-comment-timestamp attribute is set on comment');
+ $this->assertSession()->elementsCount('xpath', '//*[contains(@class, "comment")]/*[@data-comment-timestamp="' . $comment->getChangedTime() . '"]', 1);
$expectedJS = ($case['user'] !== 'anonymous');
$this->assertSame($expectedJS, isset($settings['ajaxPageState']['libraries']) && in_array('comment/drupal.comment-new-indicator', explode(',', $settings['ajaxPageState']['libraries'])), 'drupal.comment-new-indicator library is present.');
}
diff --git a/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
index 098c50e40425be6638813c64571e4318d4e55f3e..eca7d143b421bdee46090de5a38f7d9de6f23f3b 100644
--- a/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
@@ -87,12 +87,7 @@ public function testCommentInterface() {
$this->drupalGet('node/' . $this->node->id());
$this->assertSession()->pageTextContains($subject_text);
$this->assertSession()->pageTextContains($comment_text);
- $arguments = [
- ':link' => base_path() . 'comment/' . $comment->id() . '#comment-' . $comment->id(),
- ];
- $pattern_permalink = '//footer/a[contains(@href,:link) and text()="Permalink"]';
- $permalink = $this->xpath($pattern_permalink, $arguments);
- $this->assertNotEmpty($permalink, 'Permalink link found.');
+ $this->assertSession()->elementExists('xpath', '//footer/a[contains(@href,"' . base_path() . 'comment/' . $comment->id() . '#comment-' . $comment->id() . '") and text()="Permalink"]');
// Set comments to have subject and preview to optional.
$this->drupalLogout();
diff --git a/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php b/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
index f0548a9433ad03878cefdaaed9194670bf4e94c7..a0e6e543ec5a060211ae3a66ebddbb1aea1094ee 100644
--- a/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentNewIndicatorTest.php
@@ -66,7 +66,7 @@ public function testCommentNewCommentsIndicator() {
// used by the drupal.node-new-comments-link library to determine whether
// a "x new comments" link might be necessary or not. We do this in
// JavaScript to prevent breaking the render cache.
- $this->assertCount(0, $this->xpath('//*[@data-history-node-last-comment-timestamp]'), 'data-history-node-last-comment-timestamp attribute is not set.');
+ $this->assertSession()->elementNotExists('xpath', '//*[@data-history-node-last-comment-timestamp]');
// Create a new comment. This helper function may be run with different
// comment settings so use $comment->save() to avoid complex setup.
@@ -94,8 +94,8 @@ public function testCommentNewCommentsIndicator() {
// value, the drupal.node-new-comments-link library would determine that the
// node received a comment after the user last viewed it, and hence it would
// perform an HTTP request to render the "new comments" node link.
- $this->assertCount(1, $this->xpath('//*[@data-history-node-last-comment-timestamp="' . $comment->getChangedTime() . '"]'), 'data-history-node-last-comment-timestamp attribute is set to the correct value.');
- $this->assertCount(1, $this->xpath('//*[@data-history-node-field-name="comment"]'), 'data-history-node-field-name attribute is set to the correct value.');
+ $this->assertSession()->elementsCount('xpath', '//*[@data-history-node-last-comment-timestamp="' . $comment->getChangedTime() . '"]', 1);
+ $this->assertSession()->elementsCount('xpath', '//*[@data-history-node-field-name="comment"]', 1);
// The data will be pre-seeded on this particular page in drupalSettings, to
// avoid the need for the client to make a separate request to the server.
$settings = $this->getDrupalSettings();
diff --git a/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php b/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
index faf48498796feca8313215b2c5b141864ef86b49..f695911e8ed0450c9581db22764015e729e842ed 100644
--- a/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
@@ -286,8 +286,7 @@ public function testCommentFunctionality() {
// Test breadcrumb on comment add page.
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment');
- $xpath = '//nav[@aria-labelledby="system-breadcrumb"]/ol/li[last()]/a';
- $this->assertEquals($this->entity->label(), current($this->xpath($xpath))->getText(), 'Last breadcrumb item is equal to node title on comment reply page.');
+ $this->assertSession()->elementTextEquals('xpath', '//nav[@aria-labelledby="system-breadcrumb"]/ol/li[last()]/a', $this->entity->label());
// Post a comment.
/** @var \Drupal\comment\CommentInterface $comment1 */
@@ -296,18 +295,15 @@ public function testCommentFunctionality() {
// Test breadcrumb on comment reply page.
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment/' . $comment1->id());
- $xpath = '//nav[@aria-labelledby="system-breadcrumb"]/ol/li[last()]/a';
- $this->assertEquals($comment1->getSubject(), current($this->xpath($xpath))->getText(), 'Last breadcrumb item is equal to comment title on comment reply page.');
+ $this->assertSession()->elementTextEquals('xpath', '//nav[@aria-labelledby="system-breadcrumb"]/ol/li[last()]/a', $comment1->getSubject());
// Test breadcrumb on comment edit page.
$this->drupalGet('comment/' . $comment1->id() . '/edit');
- $xpath = '//nav[@aria-labelledby="system-breadcrumb"]/ol/li[last()]/a';
- $this->assertEquals($comment1->getSubject(), current($this->xpath($xpath))->getText(), 'Last breadcrumb item is equal to comment subject on edit page.');
+ $this->assertSession()->elementTextEquals('xpath', '//nav[@aria-labelledby="system-breadcrumb"]/ol/li[last()]/a', $comment1->getSubject());
// Test breadcrumb on comment delete page.
$this->drupalGet('comment/' . $comment1->id() . '/delete');
- $xpath = '//nav[@aria-labelledby="system-breadcrumb"]/ol/li[last()]/a';
- $this->assertEquals($comment1->getSubject(), current($this->xpath($xpath))->getText(), 'Last breadcrumb item is equal to comment subject on delete confirm page.');
+ $this->assertSession()->elementTextEquals('xpath', '//nav[@aria-labelledby="system-breadcrumb"]/ol/li[last()]/a', $comment1->getSubject());
// Test threading replying to comment #1 creating comment #1_2.
$this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment/' . $comment1->id());
diff --git a/core/modules/comment/tests/src/Functional/CommentPreviewTest.php b/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
index f54f7d0542996afb5ece030a34af1b792a73be33..6e24d5ebb0f0927777c783ab73403806b09c0137 100644
--- a/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
@@ -121,8 +121,7 @@ public function testCommentPreviewDuplicateSubmission() {
// Store the content of this page.
$this->submitForm([], 'Save');
$this->assertSession()->pageTextContains('Your comment has been posted.');
- $elements = $this->xpath('//section[contains(@class, "comments")]/article');
- $this->assertCount(1, $elements);
+ $this->assertSession()->elementsCount('xpath', '//section[contains(@class, "comments")]/article', 1);
// Go back and re-submit the form.
$this->getSession()->getDriver()->back();
diff --git a/core/modules/comment/tests/src/Functional/Views/CommentRowTest.php b/core/modules/comment/tests/src/Functional/Views/CommentRowTest.php
index 09e157ce94bc66792883d0cb399c630958ff13b0..c3a9503dbe50d467763444905efb9c1ab3eb63e5 100644
--- a/core/modules/comment/tests/src/Functional/Views/CommentRowTest.php
+++ b/core/modules/comment/tests/src/Functional/Views/CommentRowTest.php
@@ -26,9 +26,7 @@ class CommentRowTest extends CommentTestBase {
*/
public function testCommentRow() {
$this->drupalGet('test-comment-row');
-
- $result = $this->xpath('//article[contains(@class, "comment")]');
- $this->assertCount(1, $result, 'One rendered comment found.');
+ $this->assertSession()->elementsCount('xpath', '//article[contains(@class, "comment")]', 1);
}
}
diff --git a/core/modules/config/tests/src/Functional/ConfigImportUITest.php b/core/modules/config/tests/src/Functional/ConfigImportUITest.php
index 7f34153b25c5e2c21c0034ab918d7d8b7f657e90..bfb329686835b2148aeb6f251e2897b7c60cc7d6 100644
--- a/core/modules/config/tests/src/Functional/ConfigImportUITest.php
+++ b/core/modules/config/tests/src/Functional/ConfigImportUITest.php
@@ -325,8 +325,7 @@ public function testImportDiff() {
$this->assertSession()->pageTextContains("404: '<em>herp</em>'");
// Verify diff colors are displayed.
- $result = $this->xpath('//table[contains(@class, :class)]', [':class' => 'diff']);
- $this->assertCount(1, $result, "Diff UI is displaying colors.");
+ $this->assertSession()->elementsCount('xpath', '//table[contains(@class, "diff")]', 1);
// Reset data back to original, and remove a key
$sync_data = $original_data;
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
index 391d3a0e51e5e229b4c8e37c56e117754d8c1bf9..3d7ad6533eebf6220da4fbac3a1eed0645c2d329 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationFormTest.php
@@ -308,7 +308,7 @@ public function testContentTranslationNodeForm() {
'body[0][value]' => 'First version of the content.',
'moderation_state[0][state]' => 'draft',
], 'Save');
- $this->assertNotEmpty($this->xpath('//ul[@class="entity-moderation-form"]'));
+ $this->assertSession()->elementExists('xpath', '//ul[@class="entity-moderation-form"]');
$node = $this->drupalGetNodeByTitle('Some moderated content');
$this->assertNotEmpty($node->language(), 'en');
@@ -319,7 +319,7 @@ public function testContentTranslationNodeForm() {
$this->drupalGet($latest_version_path);
$this->assertSession()->statusCodeEquals('403');
- $this->assertEmpty($this->xpath('//ul[@class="entity-moderation-form"]'));
+ $this->assertSession()->elementNotExists('xpath', '//ul[@class="entity-moderation-form"]');
// Add french translation (revision 2).
$this->drupalGet($translate_path);
@@ -333,7 +333,7 @@ public function testContentTranslationNodeForm() {
$this->drupalGet($latest_version_path, ['language' => $french]);
$this->assertSession()->statusCodeEquals('403');
- $this->assertEmpty($this->xpath('//ul[@class="entity-moderation-form"]'));
+ $this->assertSession()->elementNotExists('xpath', '//ul[@class="entity-moderation-form"]');
// Add french pending revision (revision 3).
$this->drupalGet($edit_path, ['language' => $french]);
@@ -356,14 +356,14 @@ public function testContentTranslationNodeForm() {
], 'Save (this translation)');
$this->drupalGet($latest_version_path, ['language' => $french]);
- $this->assertNotEmpty($this->xpath('//ul[@class="entity-moderation-form"]'));
+ $this->assertSession()->elementExists('xpath', '//ul[@class="entity-moderation-form"]');
$this->drupalGet($edit_path);
$this->clickLink('Delete');
$this->assertSession()->buttonExists('Delete');
$this->drupalGet($latest_version_path);
- $this->assertEmpty($this->xpath('//ul[@class="entity-moderation-form"]'));
+ $this->assertSession()->elementNotExists('xpath', '//ul[@class="entity-moderation-form"]');
// Publish the french pending revision (revision 4).
$this->drupalGet($edit_path, ['language' => $french]);
@@ -376,7 +376,7 @@ public function testContentTranslationNodeForm() {
], 'Save (this translation)');
$this->drupalGet($latest_version_path, ['language' => $french]);
- $this->assertEmpty($this->xpath('//ul[@class="entity-moderation-form"]'));
+ $this->assertSession()->elementNotExists('xpath', '//ul[@class="entity-moderation-form"]');
// Publish the English pending revision (revision 5).
$this->drupalGet($edit_path);
@@ -389,7 +389,7 @@ public function testContentTranslationNodeForm() {
], 'Save (this translation)');
$this->drupalGet($latest_version_path);
- $this->assertEmpty($this->xpath('//ul[@class="entity-moderation-form"]'));
+ $this->assertSession()->elementNotExists('xpath', '//ul[@class="entity-moderation-form"]');
// Make sure we are allowed to create a pending French revision.
$this->drupalGet($edit_path, ['language' => $french]);
@@ -408,9 +408,9 @@ public function testContentTranslationNodeForm() {
], 'Save (this translation)');
$this->drupalGet($latest_version_path);
- $this->assertNotEmpty($this->xpath('//ul[@class="entity-moderation-form"]'));
+ $this->assertSession()->elementExists('xpath', '//ul[@class="entity-moderation-form"]');
$this->drupalGet($latest_version_path, ['language' => $french]);
- $this->assertEmpty($this->xpath('//ul[@class="entity-moderation-form"]'));
+ $this->assertSession()->elementNotExists('xpath', '//ul[@class="entity-moderation-form"]');
// Publish the English pending revision (revision 7)
$this->drupalGet($edit_path);
@@ -423,7 +423,7 @@ public function testContentTranslationNodeForm() {
], 'Save (this translation)');
$this->drupalGet($latest_version_path);
- $this->assertEmpty($this->xpath('//ul[@class="entity-moderation-form"]'));
+ $this->assertSession()->elementNotExists('xpath', '//ul[@class="entity-moderation-form"]');
// Make sure we are allowed to create a pending French revision.
$this->drupalGet($edit_path, ['language' => $french]);
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
index 5c0f9d8d3543e938cb66b3ca400010c082590b42..1d25cc06cf30f4fcde2a7d209f7b753afd5d8d27 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
@@ -154,8 +154,7 @@ public function testCanonicalAlternateTagsMissing() {
$this->drupalGet($entity->toUrl('edit-form'));
$this->assertSession()->statusCodeEquals(200);
- $result = $this->xpath('//link[@rel="alternate" and @hreflang]');
- $this->assertEmpty($result, 'No alternate link tag found.');
+ $this->assertSession()->elementNotExists('xpath', '//link[@rel="alternate" and @hreflang]');
}
}
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
index 82c0ed482dd7bef2549c4feb3b077ded32ff4c43..e012360be7140abb2294cba2dcc5f6e4d4824398 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
@@ -263,12 +263,12 @@ protected function doTestOutdatedStatus() {
if ($added_langcode == $langcode) {
// Verify that the retranslate flag is not checked by default.
$this->assertSession()->fieldValueEquals('content_translation[retranslate]', FALSE);
- $this->assertEmpty($this->xpath('//details[@id="edit-content-translation" and @open="open"]'), 'The translation tab should be collapsed by default.');
+ $this->assertSession()->elementNotExists('xpath', '//details[@id="edit-content-translation" and @open="open"]');
}
else {
// Verify that the translate flag is checked by default.
$this->assertSession()->fieldValueEquals('content_translation[outdated]', TRUE);
- $this->assertNotEmpty($this->xpath('//details[@id="edit-content-translation" and @open="open"]'), 'The translation tab is correctly expanded when the translation is outdated.');
+ $this->assertSession()->elementExists('xpath', '//details[@id="edit-content-translation" and @open="open"]');
$edit = ['content_translation[outdated]' => FALSE];
$this->drupalGet($url);
$this->submitForm($edit, $this->getFormSubmitAction($entity, $added_langcode));
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationUntranslatableFieldsTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationUntranslatableFieldsTest.php
index bf0cedb936151ca4278b7a5ff5d5f034156dba9a..07470bc7e9a0930077fe178673628d8e623d6412 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationUntranslatableFieldsTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationUntranslatableFieldsTest.php
@@ -88,9 +88,9 @@ public function testHiddenWidgets() {
$en_edit_url = $entity->toUrl('edit-form');
$this->drupalGet($en_edit_url);
$field_xpath = '//input[@name="' . $this->fieldName . '[0][value]"]';
- $this->assertNotEmpty($this->xpath($field_xpath));
+ $this->assertSession()->elementExists('xpath', $field_xpath);
$clue_xpath = '//label[@for="edit-' . strtr($this->fieldName, '_', '-') . '-0-value"]/span[text()="(all languages)"]';
- $this->assertEmpty($this->xpath($clue_xpath));
+ $this->assertSession()->elementNotExists('xpath', $clue_xpath);
$this->assertSession()->pageTextContains('Untranslatable-but-visible test field');
// Add a translation and check that the untranslatable field widget is
@@ -102,20 +102,20 @@ public function testHiddenWidgets() {
'target' => 'it',
]);
$this->drupalGet($add_url);
- $this->assertNotEmpty($this->xpath($field_xpath));
- $this->assertNotEmpty($this->xpath($clue_xpath));
+ $this->assertSession()->elementExists('xpath', $field_xpath);
+ $this->assertSession()->elementExists('xpath', $clue_xpath);
$this->assertSession()->pageTextContains('Untranslatable-but-visible test field');
$this->submitForm([], 'Save');
// Check that the widget is displayed along with its clue in the edit form
// for both languages.
$this->drupalGet($en_edit_url);
- $this->assertNotEmpty($this->xpath($field_xpath));
- $this->assertNotEmpty($this->xpath($clue_xpath));
+ $this->assertSession()->elementExists('xpath', $field_xpath);
+ $this->assertSession()->elementExists('xpath', $clue_xpath);
$it_edit_url = $entity->toUrl('edit-form', ['language' => ConfigurableLanguage::load('it')]);
$this->drupalGet($it_edit_url);
- $this->assertNotEmpty($this->xpath($field_xpath));
- $this->assertNotEmpty($this->xpath($clue_xpath));
+ $this->assertSession()->elementExists('xpath', $field_xpath);
+ $this->assertSession()->elementExists('xpath', $clue_xpath);
// Configure untranslatable field widgets to be hidden on non-default
// language edit forms.
@@ -128,22 +128,19 @@ public function testHiddenWidgets() {
// but no clue is displayed.
$this->drupalGet($en_edit_url);
$field_xpath = '//input[@name="' . $this->fieldName . '[0][value]"]';
- $this->assertNotEmpty($this->xpath($field_xpath));
- $this->assertEmpty($this->xpath($clue_xpath));
+ $this->assertSession()->elementExists('xpath', $field_xpath);
+ $this->assertSession()->elementNotExists('xpath', $clue_xpath);
$this->assertSession()->pageTextContains('Untranslatable-but-visible test field');
// Verify no widget is displayed on the non-default language edit form.
$this->drupalGet($it_edit_url);
- $this->assertEmpty($this->xpath($field_xpath));
- $this->assertEmpty($this->xpath($clue_xpath));
+ $this->assertSession()->elementNotExists('xpath', $field_xpath);
+ $this->assertSession()->elementNotExists('xpath', $clue_xpath);
$this->assertSession()->pageTextContains('Untranslatable-but-visible test field');
// Verify a warning is displayed.
$this->assertSession()->statusMessageContains('Fields that apply to all languages are hidden to avoid conflicting changes.', 'warning');
- $edit_path = $entity->toUrl('edit-form')->toString();
- $link_xpath = '//a[@href=:edit_path and text()="Edit them on the original language form"]';
- $elements = $this->xpath($link_xpath, [':edit_path' => $edit_path]);
- $this->assertNotEmpty($elements);
+ $this->assertSession()->elementExists('xpath', '//a[@href="' . $entity->toUrl('edit-form')->toString() . '" and text()="Edit them on the original language form"]');
// Configure untranslatable field widgets to be displayed on non-default
// language edit forms.
@@ -153,23 +150,22 @@ public function testHiddenWidgets() {
// Check that the widget is displayed along with its clue in the edit form
// for both languages.
$this->drupalGet($en_edit_url);
- $this->assertNotEmpty($this->xpath($field_xpath));
- $this->assertNotEmpty($this->xpath($clue_xpath));
+ $this->assertSession()->elementExists('xpath', $field_xpath);
+ $this->assertSession()->elementExists('xpath', $clue_xpath);
$this->drupalGet($it_edit_url);
- $this->assertNotEmpty($this->xpath($field_xpath));
- $this->assertNotEmpty($this->xpath($clue_xpath));
+ $this->assertSession()->elementExists('xpath', $field_xpath);
+ $this->assertSession()->elementExists('xpath', $clue_xpath);
// Enable content moderation and verify that widgets are hidden despite them
// being configured to be displayed.
$this->enableContentModeration();
$this->drupalGet($it_edit_url);
- $this->assertEmpty($this->xpath($field_xpath));
- $this->assertEmpty($this->xpath($clue_xpath));
+ $this->assertSession()->elementNotExists('xpath', $field_xpath);
+ $this->assertSession()->elementNotExists('xpath', $clue_xpath);
// Verify a warning is displayed.
$this->assertSession()->statusMessageContains('Fields that apply to all languages are hidden to avoid conflicting changes.', 'warning');
- $elements = $this->xpath($link_xpath, [':edit_path' => $edit_path]);
- $this->assertNotEmpty($elements);
+ $this->assertSession()->elementExists('xpath', '//a[@href="' . $entity->toUrl('edit-form')->toString() . '" and text()="Edit them on the original language form"]');
// Verify that checkboxes on the language content settings page are checked
// and disabled for moderated bundles.
diff --git a/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
index 34449781c4db3e5a85939ae5f357076a3f75a49b..880068483f437131fddb887156266a79d924f361 100644
--- a/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
+++ b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
@@ -918,8 +918,7 @@ public function testDateStorageSettings() {
$this->drupalGet('node/add/date_content');
$this->submitForm($edit, 'Save');
$this->drupalGet('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name . '/storage');
- $result = $this->xpath("//*[@id='edit-settings-datetime-type' and contains(@disabled, 'disabled')]");
- $this->assertCount(1, $result, "Changing datetime setting is disabled.");
+ $this->assertSession()->elementsCount('xpath', "//*[@id='edit-settings-datetime-type' and contains(@disabled, 'disabled')]", 1);
$this->assertSession()->pageTextContains('There is data for this field in the database. The field settings can no longer be changed.');
}
diff --git a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
index d621de54ae452efcb230583f142d09b4880caafe..d78c73875d9676834b75e9578b070ea16abce1a4 100644
--- a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
+++ b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
@@ -1416,8 +1416,7 @@ public function testDateStorageSettings() {
$this->drupalGet('node/add/date_content');
$this->submitForm($edit, 'Save');
$this->drupalGet('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name . '/storage');
- $result = $this->xpath("//*[@id='edit-settings-datetime-type' and contains(@disabled, 'disabled')]");
- $this->assertCount(1, $result, "Changing datetime setting is disabled.");
+ $this->assertSession()->elementsCount('xpath', "//*[@id='edit-settings-datetime-type' and contains(@disabled, 'disabled')]", 1);
$this->assertSession()->pageTextContains('There is data for this field in the database. The field settings can no longer be changed.');
}
diff --git a/core/modules/dblog/tests/src/Functional/DbLogTest.php b/core/modules/dblog/tests/src/Functional/DbLogTest.php
index 6ec963a0df3ace1f24d052865ccfb2714585a0cf..9e6be6aed3969b5273324d23372d5d9b8eaa8d62 100644
--- a/core/modules/dblog/tests/src/Functional/DbLogTest.php
+++ b/core/modules/dblog/tests/src/Functional/DbLogTest.php
@@ -162,23 +162,22 @@ public function test403LogEventPage() {
$wid = $query->execute()->fetchField();
$this->drupalGet('admin/reports/dblog/event/' . $wid);
- $table = $this->xpath("//table[@class='dblog-event']");
- $this->assertCount(1, $table);
+ $table = $this->assertSession()->elementExists('xpath', "//table[@class='dblog-event']");
// Verify type, severity and location.
- $type = $table[0]->findAll('xpath', "//tr/th[contains(text(), 'Type')]/../td");
- $this->assertCount(1, $type);
- $this->assertEquals('access denied', $type[0]->getText());
- $severity = $table[0]->findAll('xpath', "//tr/th[contains(text(), 'Severity')]/../td");
- $this->assertCount(1, $severity);
- $this->assertEquals('Warning', $severity[0]->getText());
- $location = $table[0]->findAll('xpath', "//tr/th[contains(text(), 'Location')]/../td/a");
+ $type = "//tr/th[contains(text(), 'Type')]/../td";
+ $this->assertSession()->elementsCount('xpath', $type, 1, $table);
+ $this->assertEquals('access denied', $table->findAll('xpath', $type)[0]->getText());
+ $severity = "//tr/th[contains(text(), 'Severity')]/../td";
+ $this->assertSession()->elementsCount('xpath', $severity, 1, $table);
+ $this->assertEquals('Warning', $table->findAll('xpath', $severity)[0]->getText());
+ $location = $table->findAll('xpath', "//tr/th[contains(text(), 'Location')]/../td/a");
$this->assertCount(1, $location);
$href = $location[0]->getAttribute('href');
$this->assertEquals($this->baseUrl . '/' . $uri, $href);
// Verify message.
- $message = $table[0]->findAll('xpath', "//tr/th[contains(text(), 'Message')]/../td");
+ $message = $table->findAll('xpath', "//tr/th[contains(text(), 'Message')]/../td");
$this->assertCount(1, $message);
$regex = "@Path: .+admin/reports\. Drupal\\\\Core\\\\Http\\\\Exception\\\\CacheableAccessDeniedHttpException: The 'access site reports' permission is required\. in Drupal\\\\Core\\\\Routing\\\\AccessAwareRouter->checkAccess\(\) \(line \d+ of .+/core/lib/Drupal/Core/Routing/AccessAwareRouter\.php\)\.@";
$this->assertMatchesRegularExpression($regex, $message[0]->getText());
diff --git a/core/modules/editor/tests/src/Functional/EditorLoadingTest.php b/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
index c4dcef03ceee9c4835ea638a4eb9a156e994d942..efdccccc84fd06bf4799e53e06d1f62b014f5a70 100644
--- a/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
+++ b/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
@@ -153,7 +153,7 @@ public function testLoading() {
[, $editor_settings_present, $editor_js_present, $body] = $this->getThingsToCheck('body');
$this->assertFalse($editor_settings_present, 'No Text Editor module settings.');
$this->assertFalse($editor_js_present, 'No Text Editor JavaScript.');
- $this->assertCount(1, $body, 'A body field exists.');
+ $this->assertSession()->elementsCount('xpath', $body, 1);
$this->assertSession()->elementNotExists('css', 'select.js-filter-list');
$this->drupalLogout($this->normalUser);
@@ -177,7 +177,7 @@ public function testLoading() {
$this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
$this->assertSame($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct.");
$this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
- $this->assertCount(1, $body, 'A body field exists.');
+ $this->assertSession()->elementsCount('xpath', $body, 1);
$this->assertSession()->elementsCount('css', 'select.js-filter-list', 1);
$select = $this->assertSession()->elementExists('css', 'select.js-filter-list');
$this->assertSame('edit-body-0-value', $select->getAttribute('data-editor-for'));
@@ -215,7 +215,7 @@ public function testLoading() {
$this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
$this->assertSame($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct.");
$this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
- $this->assertCount(1, $body, 'A body field exists.');
+ $this->assertSession()->elementsCount('xpath', $body, 1);
$this->assertSession()->elementNotExists('css', 'select.js-filter-list');
// Verify that a single text format hidden input exists on the page and has
// a "data-editor-for" attribute with the correct value.
@@ -239,7 +239,7 @@ public function testLoading() {
[, $editor_settings_present, $editor_js_present, $body] = $this->getThingsToCheck('body');
$this->assertTrue($editor_settings_present, 'Text Editor module settings.');
$this->assertTrue($editor_js_present, 'Text Editor JavaScript.');
- $this->assertCount(1, $body, 'A body field exists.');
+ $this->assertSession()->elementsCount('xpath', $body, 1);
$this->assertSession()->fieldDisabled("edit-body-0-value");
$this->assertSession()->fieldValueEquals("edit-body-0-value", 'This field has been disabled because you do not have sufficient permissions to edit it.');
$this->assertSession()->elementNotExists('css', 'select.js-filter-list');
@@ -279,7 +279,7 @@ public function testSupportedElementTypes() {
[, $editor_settings_present, $editor_js_present, $field] = $this->getThingsToCheck('field-text', 'input');
$this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page.");
$this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.');
- $this->assertCount(1, $field, 'A text field exists.');
+ $this->assertSession()->elementsCount('xpath', $field, 1);
// Verify that a single text format selector exists on the page and has the
// "editor" class and a "data-editor-for" attribute with the correct value.
$this->assertSession()->elementsCount('css', 'select.js-filter-list', 1);
@@ -298,7 +298,7 @@ public function testSupportedElementTypes() {
[, $editor_settings_present, $editor_js_present, $field] = $this->getThingsToCheck('field-text', 'input');
$this->assertFalse($editor_settings_present, "Text Editor module's JavaScript settings are not on the page.");
$this->assertFalse($editor_js_present, 'Text Editor JavaScript is not present.');
- $this->assertCount(1, $field, 'A text field exists.');
+ $this->assertSession()->elementsCount('xpath', $field, 1);
// Verify that a single text format selector exists on the page but without
// the "editor" class or a "data-editor-for" attribute with the expected
// value.
@@ -318,7 +318,7 @@ protected function getThingsToCheck($field_name, $type = 'textarea') {
// Editor.module's JS present.
strpos($this->getSession()->getPage()->getContent(), $this->getModulePath('editor') . '/js/editor.js') !== FALSE,
// Body field.
- $this->xpath('//' . $type . '[@id="edit-' . $field_name . '-0-value"]'),
+ '//' . $type . '[@id="edit-' . $field_name . '-0-value"]',
];
}
diff --git a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
index ea1843f8558a08a619c31d43616bbbad1fd7e984..e096d19f69e2598b10db767ed94f27d4d3567c75 100644
--- a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
@@ -399,19 +399,15 @@ public function testWidgetElement() {
$this->drupalGet('node/add/article');
- $elements = $this->xpath($xpath);
-
// If the field has no item, the table should not be visible.
- $this->assertCount(0, $elements);
+ $this->assertSession()->elementNotExists('xpath', $xpath);
// Upload a file.
$edit['files[' . $field_name . '_0][]'] = $this->container->get('file_system')->realpath($file->getFileUri());
$this->submitForm($edit, "{$field_name}_0_upload_button");
- $elements = $this->xpath($xpath);
-
// If the field has at least one item, the table should be visible.
- $this->assertCount(1, $elements);
+ $this->assertSession()->elementsCount('xpath', $xpath, 1);
// Test for AJAX error when using progress bar on file field widget.
$http_client = $this->getHttpClient();
diff --git a/core/modules/file/tests/src/Functional/FileListingTest.php b/core/modules/file/tests/src/Functional/FileListingTest.php
index 97a9ec0171b954a5943eb4280bd48e354074bfb8..ca5534ca5f41d1352aa0adbc5441b5d6d7c9a021 100644
--- a/core/modules/file/tests/src/Functional/FileListingTest.php
+++ b/core/modules/file/tests/src/Functional/FileListingTest.php
@@ -140,8 +140,7 @@ public function testFileListingPages() {
$usage = $this->sumUsages($file_usage->listUsage($file));
$this->assertSession()->responseContains('admin/content/files/usage/' . $file->id() . '">' . $usage);
- $result = $this->xpath("//td[contains(@class, 'views-field-status') and contains(text(), :value)]", [':value' => 'Temporary']);
- $this->assertCount(1, $result, 'Unused file marked as temporary.');
+ $this->assertSession()->elementsCount('xpath', "//td[contains(@class, 'views-field-status') and contains(text(), 'Temporary')]", 1);
// Test file usage page.
foreach ($nodes as $node) {
diff --git a/core/modules/filter/tests/src/Functional/FilterAdminTest.php b/core/modules/filter/tests/src/Functional/FilterAdminTest.php
index 932db0ab341eea020a9f395f0b04514444d21db9..a947bb841af68b143ebcf6dfeb237109997c8828 100644
--- a/core/modules/filter/tests/src/Functional/FilterAdminTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterAdminTest.php
@@ -224,12 +224,7 @@ public function testFilterAdmin() {
$this->drupalGet('admin/config/content/formats/manage/' . $restricted);
// Check that the allowed HTML tag was added and the string reformatted.
$this->assertSession()->fieldValueEquals('filters[filter_html][settings][allowed_html]', "<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <quote>");
-
- $elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', [
- ':first' => 'filters[' . $first_filter . '][weight]',
- ':second' => 'filters[' . $second_filter . '][weight]',
- ]);
- $this->assertNotEmpty($elements, 'Order confirmed in admin interface.');
+ $this->assertSession()->elementExists('xpath', "//select[@name='filters[" . $first_filter . "][weight]']/following::select[@name='filters[" . $second_filter . "][weight]']");
// Reorder filters.
$edit = [];
@@ -240,12 +235,7 @@ public function testFilterAdmin() {
$this->drupalGet('admin/config/content/formats/manage/' . $restricted);
$this->assertSession()->fieldValueEquals('filters[' . $second_filter . '][weight]', 1);
$this->assertSession()->fieldValueEquals('filters[' . $first_filter . '][weight]', 2);
-
- $elements = $this->xpath('//select[@name=:first]/following::select[@name=:second]', [
- ':first' => 'filters[' . $second_filter . '][weight]',
- ':second' => 'filters[' . $first_filter . '][weight]',
- ]);
- $this->assertNotEmpty($elements, 'Reorder confirmed in admin interface.');
+ $this->assertSession()->elementExists('xpath', "//select[@name='filters[" . $second_filter . "][weight]']/following::select[@name='filters[" . $first_filter . "][weight]']");
$filter_format = FilterFormat::load($restricted);
foreach ($filter_format->filters() as $filter_name => $filter) {
diff --git a/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php b/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
index 01dcab6aa96764864c61981378acf3d54020405e..7502129a79a07cc74f79f3f58cca7974194d4394 100644
--- a/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
+++ b/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
@@ -175,17 +175,7 @@ public function _testImageFieldFormatters($scheme) {
$this->assertSession()->responseHeaderContains('X-Drupal-Cache-Tags', $file->getCacheTags()[0]);
// Verify that no image style cache tags are found.
$this->assertSession()->responseHeaderNotContains('X-Drupal-Cache-Tags', 'image_style:');
- $elements = $this->xpath(
- '//a[@href=:path]/img[@src=:url and @alt=:alt and @width=:width and @height=:height]',
- [
- ':path' => $node->toUrl()->toString(),
- ':url' => $file->createFileUrl(),
- ':width' => $image['#width'],
- ':height' => $image['#height'],
- ':alt' => $alt,
- ]
- );
- $this->assertCount(1, $elements, 'Image linked to content formatter displaying correctly on full node view.');
+ $this->assertSession()->elementsCount('xpath', '//a[@href="' . $node->toUrl()->toString() . '"]/img[@src="' . $file->createFileUrl() . '" and @alt="' . $alt . '" and @width="' . $image['#width'] . '" and @height="' . $image['#height'] . '"]', 1);
// Test the image style 'thumbnail' formatter.
$display_options['settings']['image_link'] = '';
diff --git a/core/modules/node/tests/src/Functional/NodeTitleTest.php b/core/modules/node/tests/src/Functional/NodeTitleTest.php
index 0d1a93e5023f67f98c7f9bb0eb8490adb844b100..fe3213902de10508596eb25e964890a07583aafd 100644
--- a/core/modules/node/tests/src/Functional/NodeTitleTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTitleTest.php
@@ -68,8 +68,7 @@ public function testNodeTitle() {
// Test <title> tag.
$this->drupalGet('node/' . $node->id());
- $xpath = '//title';
- $this->assertEquals($this->xpath($xpath)[0]->getText(), $node->label() . ' | Drupal', 'Page title is equal to node title.');
+ $this->assertSession()->elementTextEquals('xpath', '//title', $node->label() . ' | Drupal');
// Test breadcrumb in comment preview.
$this->assertBreadcrumb('comment/reply/node/' . $node->id() . '/comment', [
@@ -93,8 +92,7 @@ public function testNodeTitle() {
$this->drupalGet('node/' . $node->id());
$this->assertSession()->titleEquals('0 | Drupal');
// Test that 0 appears in the template <h1>.
- $xpath = '//h1';
- $this->assertSame('0', $this->xpath($xpath)[0]->getText(), 'Node title is displayed as 0.');
+ $this->assertSession()->elementTextEquals('xpath', '//h1', '0');
// Test edge case where node title contains special characters.
$edge_case_title = 'article\'s "title".';
diff --git a/core/modules/node/tests/src/Functional/PagePreviewTest.php b/core/modules/node/tests/src/Functional/PagePreviewTest.php
index 1f9a389b7c35a3d6866e50d3ef4e5f1f531fb79a..9303d6d7c8d49fe0b61c4c3c10d746b53da49733 100644
--- a/core/modules/node/tests/src/Functional/PagePreviewTest.php
+++ b/core/modules/node/tests/src/Functional/PagePreviewTest.php
@@ -222,8 +222,7 @@ public function testPagePreview() {
$this->assertSession()->linkExists('Back to content editing');
// Check that we see the class of the node type on the body element.
- $body_class_element = $this->xpath("//body[contains(@class, 'page-node-type-page')]");
- $this->assertNotEmpty($body_class_element, 'Node type body class found.');
+ $this->assertSession()->elementExists('xpath', "//body[contains(@class, 'page-node-type-page')]");
// Get the UUID.
$url = parse_url($this->getUrl());
diff --git a/core/modules/path/tests/src/Functional/PathAliasTest.php b/core/modules/path/tests/src/Functional/PathAliasTest.php
index 47033eee9f092f0508842cbfe4e435e0b530a803..b55a8a4b6b4588005dfefc6064feac9ef186072b 100644
--- a/core/modules/path/tests/src/Functional/PathAliasTest.php
+++ b/core/modules/path/tests/src/Functional/PathAliasTest.php
@@ -269,10 +269,8 @@ public function testNodeAlias() {
$this->assertSession()->statusCodeEquals(200);
// Confirm the 'canonical' and 'shortlink' URLs.
- $elements = $this->xpath("//link[contains(@rel, 'canonical') and contains(@href, '" . $edit['path[0][alias]'] . "')]");
- $this->assertNotEmpty($elements, 'Page contains canonical link URL.');
- $elements = $this->xpath("//link[contains(@rel, 'shortlink') and contains(@href, 'node/" . $node1->id() . "')]");
- $this->assertNotEmpty($elements, 'Page contains shortlink URL.');
+ $this->assertSession()->elementExists('xpath', "//link[contains(@rel, 'canonical') and contains(@href, '" . $edit['path[0][alias]'] . "')]");
+ $this->assertSession()->elementExists('xpath', "//link[contains(@rel, 'shortlink') and contains(@href, 'node/" . $node1->id() . "')]");
$previous = $edit['path[0][alias]'];
// Change alias to one containing "exotic" characters.
diff --git a/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php b/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
index 9463b8bf04ee8b44bc892629f8acdb48273d1dae..f49d702de06ffbd2148741b2764ff9e5195de7eb 100644
--- a/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
+++ b/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
@@ -71,10 +71,8 @@ public function testTermAlias() {
$this->assertSession()->pageTextContains($description);
// Confirm the 'canonical' and 'shortlink' URLs.
- $elements = $this->xpath("//link[contains(@rel, 'canonical') and contains(@href, '" . $edit['path[0][alias]'] . "')]");
- $this->assertNotEmpty($elements, 'Term page contains canonical link URL.');
- $elements = $this->xpath("//link[contains(@rel, 'shortlink') and contains(@href, 'taxonomy/term/" . $tid . "')]");
- $this->assertNotEmpty($elements, 'Term page contains shortlink URL.');
+ $this->assertSession()->elementExists('xpath', "//link[contains(@rel, 'canonical') and contains(@href, '" . $edit['path[0][alias]'] . "')]");
+ $this->assertSession()->elementExists('xpath', "//link[contains(@rel, 'shortlink') and contains(@href, 'taxonomy/term/" . $tid . "')]");
// Change the term's URL alias.
$edit2 = [];
diff --git a/core/modules/search/tests/src/Functional/SearchBlockTest.php b/core/modules/search/tests/src/Functional/SearchBlockTest.php
index 884751e805440c758f0d2e4b3feed60072329ded..6ac385fe41de2ab6ef90613382af3b79b07e7d23 100644
--- a/core/modules/search/tests/src/Functional/SearchBlockTest.php
+++ b/core/modules/search/tests/src/Functional/SearchBlockTest.php
@@ -62,9 +62,7 @@ public function testSearchFormBlock() {
$this->assertSession()->pageTextContains($block->label());
// Check that name attribute is not empty.
- $pattern = "//input[@type='submit' and @name='']";
- $elements = $this->xpath($pattern);
- $this->assertEmpty($elements, 'The search input field does not have empty name attribute.');
+ $this->assertSession()->elementNotExists('xpath', "//input[@type='submit' and @name='']");
// Test a normal search via the block form, from the front page.
$terms = ['keys' => 'test'];
diff --git a/core/modules/syslog/tests/src/Functional/SyslogTest.php b/core/modules/syslog/tests/src/Functional/SyslogTest.php
index 2bdac37427c6da87a9747775fe0ff0ebf10b44d0..e622f681e409515b795d71d00eaa15735135216f 100644
--- a/core/modules/syslog/tests/src/Functional/SyslogTest.php
+++ b/core/modules/syslog/tests/src/Functional/SyslogTest.php
@@ -38,8 +38,8 @@ public function testSettings() {
$this->drupalGet('admin/config/development/logging');
// Should be one field.
- $field = $this->xpath('//option[@value=:value]', [':value' => LOG_LOCAL6]);
- $this->assertSame('selected', $field[0]->getAttribute('selected'), 'Facility value saved.');
+ $field = $this->assertSession()->elementExists('xpath', '//option[@value="' . LOG_LOCAL6 . '"]');
+ $this->assertSame('selected', $field->getAttribute('selected'), 'Facility value saved.');
}
}
diff --git a/core/modules/system/tests/src/Functional/Form/ElementTest.php b/core/modules/system/tests/src/Functional/Form/ElementTest.php
index 8a6b027c46dbbfb8181a6993b6d01284e2efee13..3513d7deb5536e88f0173515c95cdd847501b0e8 100644
--- a/core/modules/system/tests/src/Functional/Form/ElementTest.php
+++ b/core/modules/system/tests/src/Functional/Form/ElementTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\system\Functional\Form;
-use Drupal\Component\Render\FormattableMarkup;
use Drupal\Tests\BrowserTestBase;
/**
@@ -114,9 +113,8 @@ public function testWrapperIds() {
// Verify that wrapper id is different from element id.
foreach (['checkboxes', 'radios'] as $type) {
// A single element id is found.
- $this->assertSession()->elementsCount('xpath', "//div[@id='edit-$type']", 1);
- $wrapper_ids = $this->xpath('//fieldset[@id=:id]', [':id' => 'edit-' . $type . '--wrapper']);
- $this->assertCount(1, $wrapper_ids, new FormattableMarkup('A single wrapper id found for type %type', ['%type' => $type]));
+ $this->assertSession()->elementsCount('xpath', "//div[@id='edit-{$type}']", 1);
+ $this->assertSession()->elementsCount('xpath', "//fieldset[@id='edit-{$type}--wrapper']", 1);
}
}
@@ -129,9 +127,9 @@ public function testButtonClasses() {
// "button--foo" would contain "button". Instead, check
// " button ". Make sure it matches in the beginning and the end too
// by adding a space before and after.
- $this->assertCount(2, $this->xpath('//*[contains(concat(" ", @class, " "), " button ")]'));
- $this->assertCount(1, $this->xpath('//*[contains(concat(" ", @class, " "), " button--foo ")]'));
- $this->assertCount(1, $this->xpath('//*[contains(concat(" ", @class, " "), " button--danger ")]'));
+ $this->assertSession()->elementsCount('xpath', '//*[contains(concat(" ", @class, " "), " button ")]', 2);
+ $this->assertSession()->elementsCount('xpath', '//*[contains(concat(" ", @class, " "), " button--foo ")]', 1);
+ $this->assertSession()->elementsCount('xpath', '//*[contains(concat(" ", @class, " "), " button--danger ")]', 1);
}
/**
diff --git a/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php b/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
index f20a753b719d0d8239190c23af613d77d3ffcb24..6ca381f56af1556dc87ec64fb901730286c35a37 100644
--- a/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
+++ b/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
@@ -34,11 +34,11 @@ public function testMultipleTrue() {
$this->assertSession()->responseNotContains('Empty text.');
// Test for the presence of the Select all rows tableheader.
- $this->assertNotEmpty($this->xpath('//th[@class="select-all"]'), 'Presence of the "Select all" checkbox.');
+ $this->assertSession()->elementExists('xpath', '//th[@class="select-all"]');
$rows = ['row1', 'row2', 'row3'];
foreach ($rows as $row) {
- $this->assertNotEmpty($this->xpath('//input[@type="checkbox"]', [$row]), "Checkbox for the value $row.");
+ $this->assertSession()->elementExists('xpath', '//input[@type="checkbox"]');
}
}
@@ -55,7 +55,7 @@ public function testMultipleFalse() {
$rows = ['row1', 'row2', 'row3'];
foreach ($rows as $row) {
- $this->assertNotEmpty($this->xpath('//input[@type="radio"]', [$row], "Radio button value: $row"));
+ $this->assertSession()->elementExists('xpath', '//input[@type="radio"]');
}
}
@@ -70,18 +70,17 @@ public function testTableSelectColSpan() {
$this->assertSession()->pageTextNotContains('Four');
// There should be three labeled column headers and 1 for the input.
- $table_head = $this->xpath('//thead/tr/th');
- $this->assertCount(4, $table_head, 'There are four column headers');
+ $this->assertSession()->elementsCount('xpath', '//thead/tr/th', 4);
// The first two body rows should each have 5 table cells: One for the
// radio, one cell in the first column, one cell in the second column,
// and two cells in the third column which has colspan 2.
for ($i = 0; $i <= 1; $i++) {
- $this->assertCount(5, $this->xpath('//tbody/tr[' . ($i + 1) . ']/td'), 'There are five cells in row ' . $i);
+ $this->assertSession()->elementsCount('xpath', '//tbody/tr[' . ($i + 1) . ']/td', 5);
}
// The third row should have 3 cells, one for the radio, one spanning the
// first and second column, and a third in column 3 (which has colspan 3).
- $this->assertCount(3, $this->xpath('//tbody/tr[3]/td'), 'There are three cells in row 3.');
+ $this->assertSession()->elementsCount('xpath', '//tbody/tr[3]/td', 3);
}
/**
diff --git a/core/modules/system/tests/src/Functional/Form/FormObjectTest.php b/core/modules/system/tests/src/Functional/Form/FormObjectTest.php
index 174cdf39ac86065b1831b3f3b288c4c475afbc77..d96d8aaf83e31b3027dd92633f50207b8bf41ce4 100644
--- a/core/modules/system/tests/src/Functional/Form/FormObjectTest.php
+++ b/core/modules/system/tests/src/Functional/Form/FormObjectTest.php
@@ -33,8 +33,7 @@ public function testObjectFormCallback() {
$this->drupalGet('form-test/object-builder');
$this->assertSession()->pageTextContains('The FormTestObject::buildForm() method was used for this form.');
- $elements = $this->xpath('//form[@id="form-test-form-test-object"]');
- $this->assertTrue(!empty($elements), 'The correct form ID was used.');
+ $this->assertSession()->elementExists('xpath', '//form[@id="form-test-form-test-object"]');
$this->submitForm(['bananas' => 'green'], 'Save');
$this->assertSession()->pageTextContains('The FormTestObject::validateForm() method was used for this form.');
$this->assertSession()->pageTextContains('The FormTestObject::submitForm() method was used for this form.');
@@ -43,8 +42,7 @@ public function testObjectFormCallback() {
$this->drupalGet('form-test/object-arguments-builder/yellow');
$this->assertSession()->pageTextContains('The FormTestArgumentsObject::buildForm() method was used for this form.');
- $elements = $this->xpath('//form[@id="form-test-form-test-arguments-object"]');
- $this->assertTrue(!empty($elements), 'The correct form ID was used.');
+ $this->assertSession()->elementExists('xpath', '//form[@id="form-test-form-test-arguments-object"]');
$this->submitForm([], 'Save');
$this->assertSession()->pageTextContains('The FormTestArgumentsObject::validateForm() method was used for this form.');
$this->assertSession()->pageTextContains('The FormTestArgumentsObject::submitForm() method was used for this form.');
@@ -53,8 +51,7 @@ public function testObjectFormCallback() {
$this->drupalGet('form-test/object-service-builder');
$this->assertSession()->pageTextContains('The FormTestServiceObject::buildForm() method was used for this form.');
- $elements = $this->xpath('//form[@id="form-test-form-test-service-object"]');
- $this->assertTrue(!empty($elements), 'The correct form ID was used.');
+ $this->assertSession()->elementExists('xpath', '//form[@id="form-test-form-test-service-object"]');
$this->submitForm(['bananas' => 'brown'], 'Save');
$this->assertSession()->pageTextContains('The FormTestServiceObject::validateForm() method was used for this form.');
$this->assertSession()->pageTextContains('The FormTestServiceObject::submitForm() method was used for this form.');
@@ -64,8 +61,7 @@ public function testObjectFormCallback() {
$this->drupalGet('form-test/object-controller-builder');
$this->assertSession()->pageTextContains('The FormTestControllerObject::create() method was used for this form.');
$this->assertSession()->pageTextContains('The FormTestControllerObject::buildForm() method was used for this form.');
- $elements = $this->xpath('//form[@id="form-test-form-test-controller-object"]');
- $this->assertTrue(!empty($elements), 'The correct form ID was used.');
+ $this->assertSession()->elementExists('xpath', '//form[@id="form-test-form-test-controller-object"]');
// Ensure parameters are injected from request attributes.
$this->assertSession()->pageTextContains('custom_value');
// Ensure the request object is injected.
diff --git a/core/modules/system/tests/src/Functional/Menu/AssertMenuActiveTrailTrait.php b/core/modules/system/tests/src/Functional/Menu/AssertMenuActiveTrailTrait.php
index ad39414c5e7116aaaec5604fbece314b6369c67e..2ce7f8bc5ec97a0d78b1a2172af6414d80849330 100644
--- a/core/modules/system/tests/src/Functional/Menu/AssertMenuActiveTrailTrait.php
+++ b/core/modules/system/tests/src/Functional/Menu/AssertMenuActiveTrailTrait.php
@@ -43,8 +43,7 @@ protected function assertMenuActiveTrail($tree, $last_active, $active_trail_clas
$xpath .= $this->assertSession()->buildXPathQuery($part_xpath, $part_args);
$i++;
}
- $elements = $this->xpath($xpath);
- $this->assertNotEmpty($elements, 'Active trail to current page should be visible in menu tree.');
+ $this->assertSession()->elementExists('xpath', $xpath);
// Append prefix for active link asserted below.
$xpath .= '/following-sibling::ul/descendant::';
@@ -60,8 +59,7 @@ protected function assertMenuActiveTrail($tree, $last_active, $active_trail_clas
':href' => Url::fromUri('base:' . $active_link_path)->toString(),
':title' => $active_link_title,
];
- $elements = $this->xpath($xpath, $args);
- $this->assertNotEmpty($elements, sprintf('Active link %s should be visible in menu tree, including active trail links %s.', $active_link_title, implode(' » ', $tree)));
+ $this->assertSession()->elementExists('xpath', $this->assertSession()->buildXPathQuery($xpath, $args));
}
}
diff --git a/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
index 71102899bd69a7bd4278f9a5aa2b5b81bae66a12..bd918db59a52edc892e475b22c79b9775d94ab87 100644
--- a/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
+++ b/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
@@ -305,11 +305,7 @@ public function testBreadCrumbs() {
// untranslated menu links automatically generated from menu router items
// ('taxonomy/term/%') should never be translated and appear in any menu
// other than the breadcrumb trail.
- $elements = $this->xpath('//nav[contains(@class, :menu-class)]/descendant::a[@href=:href]', [
- ':menu-class' => 'menu--tools',
- ':href' => Url::fromUri('base:' . $link_path)->toString(),
- ]);
- $this->assertCount(1, $elements, "Link to {$link_path} appears only once.");
+ $this->assertSession()->elementsCount('xpath', '//nav[contains(@class, "menu--tools")]/descendant::a[@href="' . Url::fromUri('base:' . $link_path)->toString() . '"]', 1);
// Next iteration should expect this tag as parent link.
// Note: Term name, not link name, due to taxonomy_term_page().
diff --git a/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php b/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
index 0c6f5a70d0c1065699f0856c161f91093d57853b..c29438b2fc79eb964155351feefc22e454f6e064 100644
--- a/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
+++ b/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
@@ -93,10 +93,7 @@ protected function assertLocalTaskAppears(string $title): void {
* @internal
*/
protected function assertNoLocalTasks(int $level = 0): void {
- $elements = $this->xpath('//*[contains(@class, :class)]//a', [
- ':class' => $level == 0 ? 'tabs primary' : 'tabs secondary',
- ]);
- $this->assertEmpty($elements, 'Local tasks not found.');
+ $this->assertSession()->elementNotExists('xpath', '//*[contains(@class, "' . ($level == 0 ? 'tabs primary' : 'tabs secondary') . '")]//a');
}
/**
@@ -191,9 +188,8 @@ public function testPluginLocalTask() {
$this->assertLocalTasks($tasks, 0);
- $result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]');
- $this->assertCount(1, $result, 'There is one active tab.');
- $this->assertEquals('upcasting sub1(active tab)', $result[0]->getText(), 'The "upcasting sub1" tab is active.');
+ $this->assertSession()->elementsCount('xpath', '//ul[contains(@class, "tabs")]//li[contains(@class, "active")]', 1);
+ $this->assertSession()->elementTextEquals('xpath', '//ul[contains(@class, "tabs")]//li[contains(@class, "active")]', 'upcasting sub1(active tab)');
$this->drupalGet(Url::fromRoute('menu_test.local_task_test_upcasting_sub2', ['entity_test' => '1']));
@@ -203,9 +199,8 @@ public function testPluginLocalTask() {
];
$this->assertLocalTasks($tasks, 0);
- $result = $this->xpath('//ul[contains(@class, "tabs")]//li[contains(@class, "active")]');
- $this->assertCount(1, $result, 'There is one active tab.');
- $this->assertEquals('upcasting sub2(active tab)', $result[0]->getText(), 'The "upcasting sub2" tab is active.');
+ $this->assertSession()->elementsCount('xpath', '//ul[contains(@class, "tabs")]//li[contains(@class, "active")]', 1);
+ $this->assertSession()->elementTextEquals('xpath', '//ul[contains(@class, "tabs")]//li[contains(@class, "active")]', 'upcasting sub2(active tab)');
}
/**
diff --git a/core/modules/system/tests/src/Functional/Page/DefaultMetatagsTest.php b/core/modules/system/tests/src/Functional/Page/DefaultMetatagsTest.php
index 5230b2a70b2b2f13ffb8b223d9cd6d9f51f08200..b9506d48839815d39e4870975cb8c699a2d3666d 100644
--- a/core/modules/system/tests/src/Functional/Page/DefaultMetatagsTest.php
+++ b/core/modules/system/tests/src/Functional/Page/DefaultMetatagsTest.php
@@ -22,16 +22,14 @@ class DefaultMetatagsTest extends BrowserTestBase {
public function testMetaTag() {
$this->drupalGet('');
// Ensures that the charset metatag is on the page.
- $result = $this->xpath('//meta[@charset="utf-8"]');
- $this->assertCount(1, $result);
+ $this->assertSession()->elementsCount('xpath', '//meta[@charset="utf-8"]', 1);
// Ensure that the charset one is the first metatag.
$result = $this->xpath('//meta');
$this->assertEquals('utf-8', (string) $result[0]->getAttribute('charset'));
// Ensure that the icon is on the page.
- $result = $this->xpath('//link[@rel = "icon"]');
- $this->assertCount(1, $result, 'The icon is present.');
+ $this->assertSession()->elementsCount('xpath', '//link[@rel = "icon"]', 1);
}
}
diff --git a/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php b/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php
index a66e3d023260959d119411f3181449d7519e99de..b95d17eadd87250e28d8aa88f8514cfdd0050f4b 100644
--- a/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php
+++ b/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php
@@ -70,8 +70,7 @@ public function testAttachments() {
$this->assertEquals($expected_link_headers, $this->getSession()->getResponseHeaders()['Link']);
// Check that duplicate alternate URLs with different hreflangs are allowed.
- $test_link = $this->xpath('//head/link[@rel="alternate"][@href="/foo/bar"]');
- $this->assertEquals(2, count($test_link), 'Duplicate alternate URLs are allowed.');
+ $this->assertSession()->elementsCount('xpath', '//head/link[@rel="alternate"][@href="/foo/bar"]', 2);
}
/**
diff --git a/core/modules/system/tests/src/Functional/System/PageTitleTest.php b/core/modules/system/tests/src/Functional/System/PageTitleTest.php
index 4413a367a0685895843fc256963921dbdd9cc090..ce91f030bddb2b1cb85ccedef311d1c0050d54da 100644
--- a/core/modules/system/tests/src/Functional/System/PageTitleTest.php
+++ b/core/modules/system/tests/src/Functional/System/PageTitleTest.php
@@ -120,15 +120,13 @@ public function testRoutingTitle() {
$this->drupalGet('test-render-title');
$this->assertSession()->titleEquals('Foo | Drupal');
- $result = $this->xpath('//h1[@class="page-title"]');
- $this->assertEquals('Foo', $result[0]->getText());
+ $this->assertSession()->elementTextEquals('xpath', '//h1[@class="page-title"]', 'Foo');
// Test forms
$this->drupalGet('form-test/object-builder');
$this->assertSession()->titleEquals('Test dynamic title | Drupal');
- $result = $this->xpath('//h1[@class="page-title"]');
- $this->assertEquals('Test dynamic title', $result[0]->getText());
+ $this->assertSession()->elementTextEquals('xpath', '//h1[@class="page-title"]', 'Test dynamic title');
// Set some custom translated strings.
$settings_key = 'locale_custom_strings_en';
@@ -152,15 +150,13 @@ public function testRoutingTitle() {
$this->drupalGet('test-page-static-title');
$this->assertSession()->titleEquals('Static title translated | Drupal');
- $result = $this->xpath('//h1[@class="page-title"]');
- $this->assertEquals('Static title translated', $result[0]->getText());
+ $this->assertSession()->elementTextEquals('xpath', '//h1[@class="page-title"]', 'Static title translated');
// Test the dynamic '_title_callback' route option.
$this->drupalGet('test-page-dynamic-title');
$this->assertSession()->titleEquals('Dynamic title | Drupal');
- $result = $this->xpath('//h1[@class="page-title"]');
- $this->assertEquals('Dynamic title', $result[0]->getText());
+ $this->assertSession()->elementTextEquals('xpath', '//h1[@class="page-title"]', 'Dynamic title');
// Ensure that titles are cacheable and are escaped normally if the
// controller does not escape them.
diff --git a/core/modules/system/tests/src/Functional/Theme/HtmlAttributesTest.php b/core/modules/system/tests/src/Functional/Theme/HtmlAttributesTest.php
index 91799ae11bfd004b5348569e14dddfb67ac8420c..39dff899a5a607d3222fdd3e75586380cd11d8ad 100644
--- a/core/modules/system/tests/src/Functional/Theme/HtmlAttributesTest.php
+++ b/core/modules/system/tests/src/Functional/Theme/HtmlAttributesTest.php
@@ -29,8 +29,7 @@ class HtmlAttributesTest extends BrowserTestBase {
public function testThemeHtmlAttributes() {
$this->drupalGet('');
$this->assertSession()->responseContains('<html lang="en" dir="ltr" theme_test_html_attribute="theme test html attribute value">');
- $attributes = $this->xpath('/body[@theme_test_body_attribute="theme test body attribute value"]');
- $this->assertCount(1, $attributes, "Attribute set in the 'body' element via hook_preprocess_HOOK() found.");
+ $this->assertSession()->elementsCount('xpath', '/body[@theme_test_body_attribute="theme test body attribute value"]', 1);
}
}
diff --git a/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php b/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
index 51e64ff10b7a40c39c28f8876d7be1233c56dca6..833602c7f78c6070fdf4b4628686f75e3f687e3f 100644
--- a/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
+++ b/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
@@ -71,16 +71,16 @@ public function testStylesheets() {
// should work nevertheless.
$this->drupalGet('theme-test/info/stylesheets');
- $this->assertCount(1, $this->xpath('//link[contains(@href, :href)]', [':href' => "$base/base-add.css"]), "$base/base-add.css found");
- $this->assertCount(0, $this->xpath('//link[contains(@href, :href)]', [':href' => "base-remove.css"]), "base-remove.css not found");
+ $this->assertSession()->elementsCount('xpath', '//link[contains(@href, "' . $base . '/base-add.css")]', 1);
+ $this->assertSession()->elementNotExists('xpath', '//link[contains(@href, "base-remove.css")]');
- $this->assertCount(1, $this->xpath('//link[contains(@href, :href)]', [':href' => "$sub/sub-add.css"]), "$sub/sub-add.css found");
- $this->assertCount(0, $this->xpath('//link[contains(@href, :href)]', [':href' => "sub-remove.css"]), "sub-remove.css not found");
- $this->assertCount(0, $this->xpath('//link[contains(@href, :href)]', [':href' => "base-add.sub-remove.css"]), "base-add.sub-remove.css not found");
+ $this->assertSession()->elementsCount('xpath', '//link[contains(@href, "' . $sub . '/sub-add.css")]', 1);
+ $this->assertSession()->elementNotExists('xpath', '//link[contains(@href, "sub-remove.css")]');
+ $this->assertSession()->elementNotExists('xpath', '//link[contains(@href, "base-add.sub-remove.css")]');
// Verify that CSS files with the same name are loaded from both the base theme and subtheme.
- $this->assertCount(1, $this->xpath('//link[contains(@href, :href)]', [':href' => "$base/samename.css"]), "$base/samename.css found");
- $this->assertCount(1, $this->xpath('//link[contains(@href, :href)]', [':href' => "$sub/samename.css"]), "$sub/samename.css found");
+ $this->assertSession()->elementsCount('xpath', '//link[contains(@href, "' . $base . '/samename.css")]', 1);
+ $this->assertSession()->elementsCount('xpath', '//link[contains(@href, "' . $sub . '/samename.css")]', 1);
}
diff --git a/core/modules/system/tests/src/Functional/Theme/ThemeTest.php b/core/modules/system/tests/src/Functional/Theme/ThemeTest.php
index 514c1f4c4a24366fd1c114fae91cfcf0b5fc6b02..96d154f2309d710ca576e92d105d0831c8cf7f32 100644
--- a/core/modules/system/tests/src/Functional/Theme/ThemeTest.php
+++ b/core/modules/system/tests/src/Functional/Theme/ThemeTest.php
@@ -149,8 +149,7 @@ public function testTemplateOverride() {
*/
public function testPreprocessHtml() {
$this->drupalGet('');
- $attributes = $this->xpath('/body[@theme_test_page_variable="Page variable is an array."]');
- $this->assertCount(1, $attributes, 'In template_preprocess_html(), the page variable is still an array (not rendered yet).');
+ $this->assertSession()->elementsCount('xpath', '/body[@theme_test_page_variable="Page variable is an array."]', 1);
$this->assertSession()->pageTextContains('theme test page bottom markup');
}
diff --git a/core/modules/tracker/tests/src/Functional/TrackerTest.php b/core/modules/tracker/tests/src/Functional/TrackerTest.php
index 652ce1bcec9a5b847c142a2232699bb6d0f5b3e2..1cb6cd8a79130ab080a947818e4be40e5b17e16f 100644
--- a/core/modules/tracker/tests/src/Functional/TrackerTest.php
+++ b/core/modules/tracker/tests/src/Functional/TrackerTest.php
@@ -487,8 +487,8 @@ public function testTrackerAdminUnpublish() {
public function assertHistoryMetadata(int $node_id, int $node_timestamp, int $node_last_comment_timestamp, bool $library_is_present = TRUE): void {
$settings = $this->getDrupalSettings();
$this->assertSame($library_is_present, isset($settings['ajaxPageState']) && in_array('tracker/history', explode(',', $settings['ajaxPageState']['libraries'])), 'drupal.tracker-history library is present.');
- $this->assertCount(1, $this->xpath('//table/tbody/tr/td[@data-history-node-id="' . $node_id . '" and @data-history-node-timestamp="' . $node_timestamp . '"]'), 'Tracker table cell contains the data-history-node-id and data-history-node-timestamp attributes for the node.');
- $this->assertCount(1, $this->xpath('//table/tbody/tr/td[@data-history-node-last-comment-timestamp="' . $node_last_comment_timestamp . '"]'), 'Tracker table cell contains the data-history-node-last-comment-timestamp attribute for the node.');
+ $this->assertSession()->elementsCount('xpath', '//table/tbody/tr/td[@data-history-node-id="' . $node_id . '" and @data-history-node-timestamp="' . $node_timestamp . '"]', 1);
+ $this->assertSession()->elementsCount('xpath', '//table/tbody/tr/td[@data-history-node-last-comment-timestamp="' . $node_last_comment_timestamp . '"]', 1);
}
}
diff --git a/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php b/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php
index beeb2fba7a42fe935a05a4a12cb22a2cabd1d8f5..d96e945217cff3f7f15235ba55bc228c4a829f62 100644
--- a/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php
+++ b/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php
@@ -70,15 +70,13 @@ public function testUserNameLink() {
// No access, so no link.
$this->drupalGet('test_user_fields_access');
$this->assertSession()->pageTextContains($test_user->getAccountName());
- $result = $this->xpath($xpath);
- $this->assertCount(0, $result, 'User is not a link');
+ $this->assertSession()->elementNotExists('xpath', $xpath);
// Assign sub-admin role to grant extra access.
$user = $this->drupalCreateUser(['sub-admin']);
$this->drupalLogin($user);
$this->drupalGet('test_user_fields_access');
- $result = $this->xpath($xpath);
- $this->assertCount(1, $result, 'User is a link');
+ $this->assertSession()->elementsCount('xpath', $xpath, 1);
}
}
diff --git a/core/modules/views/tests/src/Functional/Handler/AreaTest.php b/core/modules/views/tests/src/Functional/Handler/AreaTest.php
index 4f4f85b81256dde942441688ba9d8831c1b34d1a..38aadfbc1ff135805e117446af27a9c693573792 100644
--- a/core/modules/views/tests/src/Functional/Handler/AreaTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/AreaTest.php
@@ -178,8 +178,7 @@ public function testRenderAreaToken() {
$this->drupalGet('admin/structure/views/nojs/handler/test_example_area/default/empty/test_example');
// Test that the list is token present.
- $element = $this->xpath('//ul[@class="global-tokens"]');
- $this->assertNotEmpty($element, 'Token list found on the options form.');
+ $this->assertSession()->elementExists('xpath', '//ul[@class="global-tokens"]');
$empty_handler = &$view->empty['test_example'];
diff --git a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
index e93c895765a3aa173ae288c30709dcba6ea0c309..fc92ce624cc53873a977429ac9b894f3e043aa2c 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
@@ -164,11 +164,10 @@ public function testArgumentDefaultNode() {
// the nodes we expect appear in the respective pages.
$id = 'view-block-id';
$this->drupalPlaceBlock("views_block:test_argument_default_node-block_1", ['id' => $id]);
- $xpath = '//*[@id="block-' . $id . '"]';
$this->drupalGet('node/' . $node1->id());
- $this->assertStringContainsString($node1->getTitle(), $this->xpath($xpath)[0]->getText());
+ $this->assertSession()->elementTextContains('xpath', '//*[@id="block-' . $id . '"]', $node1->getTitle());
$this->drupalGet('node/' . $node2->id());
- $this->assertStringContainsString($node2->getTitle(), $this->xpath($xpath)[0]->getText());
+ $this->assertSession()->elementTextContains('xpath', '//*[@id="block-' . $id . '"]', $node2->getTitle());
}
/**
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php b/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
index 48471c1e1150300d4d97d39d8a33b4b886d34fc0..54548cb95625c99db5129a7425d98c159d82174b 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
@@ -67,8 +67,7 @@ public function testDisabledDisplays() {
// Enabled page display should return content.
$this->drupalGet('test-disabled-display');
- $result = $this->xpath('//h1[@class="page-title"]');
- $this->assertEquals('test_disabled_display', $result[0]->getText(), 'The enabled page_1 display is accessible.');
+ $this->assertSession()->elementTextEquals('xpath', '//h1[@class="page-title"]', 'test_disabled_display');
// Disabled page view should 404.
$this->drupalGet('test-disabled-display-2');
@@ -86,8 +85,7 @@ public function testDisabledDisplays() {
// Check that the originally disabled page_2 display is now enabled.
$this->drupalGet('test-disabled-display-2');
- $result = $this->xpath('//h1[@class="page-title"]');
- $this->assertEquals('test_disabled_display', $result[0]->getText(), 'The enabled page_2 display is accessible.');
+ $this->assertSession()->elementTextEquals('xpath', '//h1[@class="page-title"]', 'test_disabled_display');
// Disable each disabled display and save the view.
foreach ($display_ids as $display_id) {
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
index 4677f1bc9b8daa846fd349e23c0cfc32a08bf0fe..f2510c690bf870d5c3f30119c0aa5d1427f59df7 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
@@ -168,9 +168,8 @@ public function testDisabledFeed() {
// Check that the rss header is output on the page display.
$this->drupalGet('/test-attached-disabled');
- $feed_header = $this->xpath('//link[@rel="alternate"]');
- $this->assertEquals('application/rss+xml', $feed_header[0]->getAttribute('type'), 'The feed link has the type application/rss+xml.');
- $this->assertStringContainsString('test-attached-disabled.xml', $feed_header[0]->getAttribute('href'), 'Page display contains the correct feed URL.');
+ $this->assertSession()->elementAttributeContains('xpath', '//link[@rel="alternate"]', 'type', 'application/rss+xml');
+ $this->assertSession()->elementAttributeContains('xpath', '//link[@rel="alternate"]', 'href', 'test-attached-disabled.xml');
// Disable the feed display.
$view->displayHandlers->get('feed_1')->setOption('enabled', FALSE);
@@ -178,8 +177,7 @@ public function testDisabledFeed() {
// Ensure there is no link rel present on the page.
$this->drupalGet('/test-attached-disabled');
- $result = $this->xpath('//link[@rel="alternate"]');
- $this->assertEmpty($result, 'Page display does not contain a feed header.');
+ $this->assertSession()->elementNotExists('xpath', '//link[@rel="alternate"]');
// Ensure the feed attachment returns 'Not found'.
$this->drupalGet('/test-attached-disabled.xml');
diff --git a/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php b/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
index 74803d4cf6bbfe6f7f895135832b8f1c7bbe25fa..4a875a3e3a1072354e307bf8bc03924e2a1c82d3 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
@@ -250,9 +250,7 @@ public function testExposedBlock($display) {
$this->assertSession()->pageTextMatchesCount(1, '/' . $view->getTitle() . '/');
// Test there is an exposed form in a block.
- $xpath = $this->assertSession()->buildXPathQuery('//div[@id=:id]/form/@id', [':id' => Html::getUniqueId('block-' . $block->id())]);
- $result = $this->xpath($xpath);
- $this->assertCount(1, $result);
+ $this->assertSession()->elementsCount('xpath', '//div[@id="' . Html::getUniqueId('block-' . $block->id()) . '"]/form/@id', 1);
// Test there is not an exposed form in the view page content area.
$xpath = $this->assertSession()->buildXPathQuery('//div[@class="view-content"]/form/@id', [
@@ -261,8 +259,9 @@ public function testExposedBlock($display) {
$this->assertSession()->elementNotExists('xpath', $xpath);
// Test there is only one views exposed form on the page.
- $elements = $this->xpath('//form[@id=:id]', [':id' => $this->getExpectedExposedFormId($view)]);
- $this->assertCount(1, $elements, 'One exposed form block found.');
+ $xpath = '//form[@id="' . $this->getExpectedExposedFormId($view) . '"]';
+ $this->assertSession()->elementsCount('xpath', $xpath, 1);
+ $element = $this->assertSession()->elementExists('xpath', $xpath);
// Test that the correct option is selected after form submission.
$this->assertCacheContext('url');
@@ -273,13 +272,13 @@ public function testExposedBlock($display) {
'page' => ['page'],
];
foreach ($arguments as $argument => $bundles) {
- $elements[0]->find('css', 'select')->selectOption($argument);
- $elements[0]->findButton('Apply')->click();
+ $element->find('css', 'select')->selectOption($argument);
+ $element->findButton('Apply')->click();
$this->assertCacheContext('url');
$this->assertTrue($this->assertSession()->optionExists('Content: Type', $argument)->isSelected());
$this->assertNodesExist($bundles);
}
- $elements[0]->findButton('Reset')->click();
+ $element->findButton('Reset')->click();
$this->assertNodesExist($arguments['All']);
}
diff --git a/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php b/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
index 08a60a87c3370393ff6eb71acbd4b3e1c8c539b6..08755487ce12175ea18bafaeb458b515468946c2 100644
--- a/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
@@ -41,21 +41,17 @@ protected function setUp($import_test_views = TRUE, $modules = ['views_test_conf
public function testAccessibilitySettings() {
$this->drupalGet('test-table');
- $result = $this->xpath('//caption/child::text()');
- $this->assertNotEmpty($result, 'The caption appears on the table.');
- $this->assertEquals('caption-text', trim($result[0]->getText()));
+ $this->assertSession()->elementExists('xpath', '//caption/child::text()');
+ $this->assertSession()->elementTextEquals('xpath', '//caption/child::text()', 'caption-text');
- $result = $this->xpath('//summary/child::text()');
- $this->assertNotEmpty($result, 'The summary appears on the table.');
- $this->assertEquals('summary-text', trim($result[0]->getText()));
+ $this->assertSession()->elementExists('xpath', '//summary/child::text()');
+ $this->assertSession()->elementTextEquals('xpath', '//summary/child::text()', 'summary-text');
// Check that the summary has the right accessibility settings.
- $summary = $this->xpath('//summary')[0];
- $this->assertTrue($summary->hasAttribute('role'));
- $this->assertTrue($summary->hasAttribute('aria-expanded'));
+ $this->assertSession()->elementAttributeExists('xpath', '//summary', 'role');
+ $this->assertSession()->elementAttributeExists('xpath', '//summary', 'aria-expanded');
- $result = $this->xpath('//caption/details/child::text()[normalize-space()]');
- $this->assertNotEmpty($result, 'The table description appears on the table.');
- $this->assertEquals('description-text', trim($result[0]->getText()));
+ $this->assertSession()->elementExists('xpath', '//caption/details/child::text()[normalize-space()]');
+ $this->assertSession()->elementTextEquals('xpath', '//caption/details/child::text()[normalize-space()]', 'description-text');
// Remove the caption and ensure the caption is not displayed anymore.
$view = View::load('test_table');
@@ -64,8 +60,7 @@ public function testAccessibilitySettings() {
$view->save();
$this->drupalGet('test-table');
- $result = $this->xpath('//caption/child::text()');
- $this->assertEmpty(trim($result[0]->getText()), 'Ensure that the caption disappears.');
+ $this->assertSession()->elementTextEquals('xpath', '//caption/child::text()', '');
// Remove the table summary.
$display = &$view->getDisplay('default');
@@ -73,8 +68,7 @@ public function testAccessibilitySettings() {
$view->save();
$this->drupalGet('test-table');
- $result = $this->xpath('//summary/child::text()');
- $this->assertEmpty($result, 'Ensure that the summary disappears.');
+ $this->assertSession()->elementNotExists('xpath', '//summary/child::text()');
// Remove the table description.
$display = &$view->getDisplay('default');
@@ -82,8 +76,7 @@ public function testAccessibilitySettings() {
$view->save();
$this->drupalGet('test-table');
- $result = $this->xpath('//caption/details/child::text()[normalize-space()]');
- $this->assertEmpty($result, 'Ensure that the description disappears.');
+ $this->assertSession()->elementNotExists('xpath', '//caption/details/child::text()[normalize-space()]');
}
/**
@@ -96,10 +89,8 @@ public function testFieldInColumns() {
// Check for class " views-field-job ", because just "views-field-job" won't
// do: "views-field-job-1" would also contain "views-field-job".
// @see Drupal\system\Tests\Form\ElementTest::testButtonClasses().
- $result = $this->xpath('//tbody/tr/td[contains(concat(" ", @class, " "), " views-field-job ")]');
- $this->assertGreaterThan(0, count($result), 'Ensure there is a td with the class views-field-job');
- $result = $this->xpath('//tbody/tr/td[contains(concat(" ", @class, " "), " views-field-job-1 ")]');
- $this->assertGreaterThan(0, count($result), 'Ensure there is a td with the class views-field-job-1');
+ $this->assertSession()->elementExists('xpath', '//tbody/tr/td[contains(concat(" ", @class, " "), " views-field-job ")]');
+ $this->assertSession()->elementExists('xpath', '//tbody/tr/td[contains(concat(" ", @class, " "), " views-field-job-1 ")]');
// Combine the second job-column with the first one, with ', ' as separator.
$view = View::load('test_table');
@@ -110,12 +101,8 @@ public function testFieldInColumns() {
// Ensure that both columns are properly combined.
$this->drupalGet('test-table');
-
- $result = $this->xpath('//tbody/tr/td[contains(concat(" ", @class, " "), " views-field-job views-field-job-1 ")]');
- $this->assertGreaterThan(0, count($result), 'Ensure that the job column class names are joined into a single column');
-
- $result = $this->xpath('//tbody/tr/td[contains(., "Drummer, Drummer")]');
- $this->assertGreaterThan(0, count($result), 'Ensure the job column values are joined into a single column');
+ $this->assertSession()->elementExists('xpath', '//tbody/tr/td[contains(concat(" ", @class, " "), " views-field-job views-field-job-1 ")]');
+ $this->assertSession()->elementExists('xpath', '//tbody/tr/td[contains(., "Drummer, Drummer")]');
}
/**
@@ -138,11 +125,8 @@ public function testNumericFieldVisible() {
$this->drupalGet('test-table');
- $result = $this->xpath('//tbody/tr/td[contains(., "Baby")]');
- $this->assertGreaterThan(0, count($result), 'Ensure that the baby is found.');
-
- $result = $this->xpath('//tbody/tr/td[text()=0]');
- $this->assertGreaterThan(0, count($result), 'Ensure that the baby\'s age is shown');
+ $this->assertSession()->elementExists('xpath', '//tbody/tr/td[contains(., "Baby")]');
+ $this->assertSession()->elementExists('xpath', '//tbody/tr/td[text()=0]');
}
/**
@@ -159,9 +143,7 @@ public function testEmptyColumn() {
// Test that only one of the job columns still shows.
// Ensure that empty column header is hidden.
$this->assertSession()->elementsCount('xpath', '//thead/tr/th/a[text()="Job"]', 1);
-
- $result = $this->xpath('//tbody/tr/td[contains(concat(" ", @class, " "), " views-field-job-1 ")]');
- $this->assertCount(0, $result, 'Ensure the empty table cells are hidden.');
+ $this->assertSession()->elementNotExists('xpath', '//tbody/tr/td[contains(concat(" ", @class, " "), " views-field-job-1 ")]');
}
/**
@@ -212,7 +194,7 @@ public function testGrouping() {
// Ensure that we don't find the caption containing unsafe markup.
$this->assertSession()->responseNotContains($unsafe_markup);
// Ensure that the summary isn't shown.
- $this->assertEmpty($this->xpath('//caption/details'));
+ $this->assertSession()->elementNotExists('xpath', '//caption/details');
// Ensure that all expected captions are found.
foreach ($expected_captions as $raw_caption) {
diff --git a/core/modules/views/tests/src/Functional/Wizard/PagerTest.php b/core/modules/views/tests/src/Functional/Wizard/PagerTest.php
index fa8355a7d060ec91577d0d8c0c17efc259aae54c..fb99faa53a8f06d7828d3c1f010f5e63ded1e0e9 100644
--- a/core/modules/views/tests/src/Functional/Wizard/PagerTest.php
+++ b/core/modules/views/tests/src/Functional/Wizard/PagerTest.php
@@ -32,15 +32,13 @@ public function testPager() {
// This technique for finding the existence of a pager
// matches that used in Drupal\views_ui\Tests\PreviewTest.php.
- $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
- $this->assertNotEmpty($elements, 'Full pager found.');
+ $this->assertSession()->elementExists('xpath', '//ul[contains(@class, "pager__items")]/li');
// Make a View that does not have a pager.
$path_with_no_pager = 'test-view-without-pager';
$this->createViewAtPath($path_with_no_pager, FALSE);
$this->drupalGet($path_with_no_pager);
- $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
- $this->assertEmpty($elements, 'Full pager not found.');
+ $this->assertSession()->elementNotExists('xpath', '//ul[contains(@class, "pager__items")]/li');
}
/**
diff --git a/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php b/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
index 2bb2d3069ce4aef1010032fbd1e2fd1dc04e4bf1..ffcdf1f49f0e9bd68e920674de2177941080fadb 100644
--- a/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
+++ b/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
@@ -272,10 +272,10 @@ public function testTaggedWithByViewReference() {
$view['show[type]'] = $this->nodeTypeWithTags->id();
$this->drupalGet('admin/structure/views/add');
$this->submitForm($view, 'Update "of type" choice');
- $this->assertNotEmpty($this->xpath($tags_xpath));
+ $this->assertSession()->elementExists('xpath', $tags_xpath);
$view['show[type]'] = $this->nodeTypeWithoutTags->id();
$this->submitForm($view, 'Update "of type" choice (2)');
- $this->assertNotEmpty($this->xpath($tags_xpath));
+ $this->assertSession()->elementExists('xpath', $tags_xpath);
$this->submitForm(['show[tagged_with]' => 'term1'], 'Save and edit');
$this->assertSession()->statusCodeEquals(200);
$this->getSession()->getPage()->hasContent('Has taxonomy term (= term1)');
diff --git a/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php b/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
index 5841fc39a8985fdd6712eb91fc61f63d0a0ad8cb..7d13dbbc83e601ec530f7ddcc6d80044821f9f8a 100644
--- a/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
@@ -172,32 +172,14 @@ public function testDefaultViews() {
* Tests that enabling views moves them to the correct table.
*/
public function testSplitListing() {
- // Build a re-usable xpath query.
- $xpath = '//div[@id="views-entity-list"]/div[@class = :status]/table//td/text()[contains(., :title)]';
-
- $arguments = [
- ':status' => 'views-list-section enabled',
- ':title' => 'test_view_status',
- ];
-
$this->drupalGet('admin/structure/views');
-
- $elements = $this->xpath($xpath, $arguments);
- $this->assertCount(0, $elements, 'A disabled view is not found in the enabled views table.');
-
- $arguments[':status'] = 'views-list-section disabled';
- $elements = $this->xpath($xpath, $arguments);
- $this->assertCount(1, $elements, 'A disabled view is found in the disabled views table.');
+ $this->assertSession()->elementNotExists('xpath', '//div[@id="views-entity-list"]/div[@class = "views-list-section enabled"]/table//td/text()[contains(., "test_view_status")]');
+ $this->assertSession()->elementsCount('xpath', '//div[@id="views-entity-list"]/div[@class = "views-list-section disabled"]/table//td/text()[contains(., "test_view_status")]', 1);
// Enable the view.
$this->clickViewsOperationLink('Enable', '/test_view_status/');
-
- $elements = $this->xpath($xpath, $arguments);
- $this->assertCount(0, $elements, 'After enabling a view, it is not found in the disabled views table.');
-
- $arguments[':status'] = 'views-list-section enabled';
- $elements = $this->xpath($xpath, $arguments);
- $this->assertCount(1, $elements, 'After enabling a view, it is found in the enabled views table.');
+ $this->assertSession()->elementNotExists('xpath', '//div[@id="views-entity-list"]/div[@class = "views-list-section disabled"]/table//td/text()[contains(., "test_view_status")]');
+ $this->assertSession()->elementsCount('xpath', '//div[@id="views-entity-list"]/div[@class = "views-list-section enabled"]/table//td/text()[contains(., "test_view_status")]', 1);
// Attempt to disable the view by path directly, with no token.
$this->drupalGet('admin/structure/views/view/test_view_status/disable');
diff --git a/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php b/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php
index 6bdd1440503a2c7cdcd294e2fb301aea95f8ca98..579308baf5892d47ee9a9e1211636deea03f3457 100644
--- a/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DisplayCRUDTest.php
@@ -106,8 +106,7 @@ public function testRemoveDisplay() {
*/
public function testDefaultDisplay() {
$this->drupalGet('admin/structure/views/view/test_display');
- $elements = $this->xpath('//*[@id="views-page-1-display-title"]');
- $this->assertCount(1, $elements, 'The page display is loaded as the default display.');
+ $this->assertSession()->elementsCount('xpath', '//*[@id="views-page-1-display-title"]', 1);
}
/**
diff --git a/core/modules/views_ui/tests/src/Functional/DisplayTest.php b/core/modules/views_ui/tests/src/Functional/DisplayTest.php
index 8289f8ee5652824c002352bdd8c5952699fc2df5..5467baf0366d90ce2dd0c2f625ec607e01d26e9a 100644
--- a/core/modules/views_ui/tests/src/Functional/DisplayTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DisplayTest.php
@@ -56,9 +56,9 @@ public function testReorderDisplay() {
$view = $this->randomView($view);
$this->clickLink('Reorder displays');
- $this->assertNotEmpty($this->xpath('//tr[@id="display-row-default"]'), 'Make sure the default display appears on the reorder listing');
- $this->assertNotEmpty($this->xpath('//tr[@id="display-row-page_1"]'), 'Make sure the page display appears on the reorder listing');
- $this->assertNotEmpty($this->xpath('//tr[@id="display-row-block_1"]'), 'Make sure the block display appears on the reorder listing');
+ $this->assertSession()->elementExists('xpath', '//tr[@id="display-row-default"]');
+ $this->assertSession()->elementExists('xpath', '//tr[@id="display-row-page_1"]');
+ $this->assertSession()->elementExists('xpath', '//tr[@id="display-row-block_1"]');
// Ensure the view displays are in the expected order in configuration.
$expected_display_order = ['default', 'block_1', 'page_1'];
diff --git a/core/modules/views_ui/tests/src/Functional/FieldUITest.php b/core/modules/views_ui/tests/src/Functional/FieldUITest.php
index 0e0c1e6fa31f1253b25b131eef7dfb2f7aa435e0..02a309048d4402d3feb234453892abf3ff9fc062 100644
--- a/core/modules/views_ui/tests/src/Functional/FieldUITest.php
+++ b/core/modules/views_ui/tests/src/Functional/FieldUITest.php
@@ -58,8 +58,7 @@ public function testFieldUI() {
$this->assertSession()->elementTextEquals('xpath', "{$xpath}[2]", '{{ id }} == ID');
$this->assertSession()->elementTextEquals('xpath', "{$xpath}[3]", '{{ name }} == Name');
- $result = $this->xpath('//details[@id="edit-options-more"]');
- $this->assertEmpty($result, "Container 'more' is empty and should not be displayed.");
+ $this->assertSession()->elementNotExists('xpath', '//details[@id="edit-options-more"]');
// Ensure that dialog titles are not escaped.
$edit_groupby_url = 'admin/structure/views/nojs/handler/test_view/default/field/name';
diff --git a/core/modules/views_ui/tests/src/Functional/FilterNumericWebTest.php b/core/modules/views_ui/tests/src/Functional/FilterNumericWebTest.php
index 0952c5e1cd3b7cf0aaf4d13295ee9266f0ee075b..62803428f9b2495ff715566a6cbaac4a0a8f7a9b 100644
--- a/core/modules/views_ui/tests/src/Functional/FilterNumericWebTest.php
+++ b/core/modules/views_ui/tests/src/Functional/FilterNumericWebTest.php
@@ -144,8 +144,7 @@ public function testFilterNumericUI() {
// Make sure the label is visible and that there's no fieldset wrapper.
$this->assertSession()->elementsCount('xpath', '//label[contains(@for, "edit-age") and contains(text(), "Age greater than")]', 1);
- $fieldset = $this->xpath('//fieldset[contains(@id, "edit-age-wrapper")]');
- $this->assertEmpty($fieldset);
+ $this->assertSession()->elementNotExists('xpath', '//fieldset[contains(@id, "edit-age-wrapper")]');
}
}
diff --git a/core/modules/views_ui/tests/src/Functional/HandlerTest.php b/core/modules/views_ui/tests/src/Functional/HandlerTest.php
index 6462e57d3e5d5afea70a4bc8d895ae061fff7621..3f6fef8d92dc9a37a2e76bc48deae63dfe00672e 100644
--- a/core/modules/views_ui/tests/src/Functional/HandlerTest.php
+++ b/core/modules/views_ui/tests/src/Functional/HandlerTest.php
@@ -298,8 +298,7 @@ public function testErrorMissingHelp() {
* @internal
*/
public function assertNoDuplicateField(string $field_name, string $entity_type): void {
- $elements = $this->xpath('//td[.=:entity_type]/preceding-sibling::td[@class="title" and .=:title]', [':title' => $field_name, ':entity_type' => $entity_type]);
- $this->assertCount(1, $elements, $field_name . ' appears just once in ' . $entity_type . '.');
+ $this->assertSession()->elementsCount('xpath', '//td[.="' . $entity_type . '"]/preceding-sibling::td[@class="title" and .="' . $field_name . '"]', 1);
}
}
diff --git a/core/modules/views_ui/tests/src/Functional/ViewsListTest.php b/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
index 93f80b3e15df2e2fe05597d3e5c0c627cd8aa8cc..2bbfbdd8b927810a084d5b1261e4c1445b03070d 100644
--- a/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
+++ b/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
@@ -74,7 +74,7 @@ public function testViewsListLimit() {
$this->drupalGet('admin/structure/views');
// Check that all the rows are listed.
- $this->assertCount($limit, $this->xpath('//tbody/tr[contains(@class,"views-ui-list-enabled")]'));
+ $this->assertSession()->elementsCount('xpath', '//tbody/tr[contains(@class,"views-ui-list-enabled")]', $limit);
}
}
diff --git a/core/modules/views_ui/tests/src/FunctionalJavascript/PreviewTest.php b/core/modules/views_ui/tests/src/FunctionalJavascript/PreviewTest.php
index da1d865ac015049947084d6615d0d39c6cefb630..4184efd769b6d4bc57ae51830567180c64d7366b 100644
--- a/core/modules/views_ui/tests/src/FunctionalJavascript/PreviewTest.php
+++ b/core/modules/views_ui/tests/src/FunctionalJavascript/PreviewTest.php
@@ -133,8 +133,8 @@ public function testPreviewWithPagersUI() {
$this->getPreviewAJAX('test_pager_full_ajax', 'default', 5);
// Test that the pager is present and rendered.
- $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
- $this->assertNotEmpty($elements, 'Full pager found.');
+ $elements = $this->xpath('//ul[contains(@class, "pager__items")]/li');
+ $this->assertNotEmpty($elements);
// Verify elements and links to pages.
// We expect to find 5 elements: current page == 1, links to pages 2 and
@@ -159,8 +159,8 @@ public function testPreviewWithPagersUI() {
$this->clickPreviewLinkAJAX($element, 5);
// Test that the pager is present and rendered.
- $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
- $this->assertNotEmpty($elements, 'Full pager found.');
+ $elements = $this->xpath('//ul[contains(@class, "pager__items")]/li');
+ $this->assertNotEmpty($elements);
// Verify elements and links to pages.
// We expect to find 7 elements: links to '<< first' and '< previous'
@@ -191,8 +191,8 @@ public function testPreviewWithPagersUI() {
$this->getPreviewAJAX('test_mini_pager_ajax', 'default', 3);
// Test that the pager is present and rendered.
- $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
- $this->assertNotEmpty($elements, 'Mini pager found.');
+ $elements = $this->xpath('//ul[contains(@class, "pager__items")]/li');
+ $this->assertNotEmpty($elements);
// Verify elements and links to pages.
// We expect to find current pages element with no link, next page element
@@ -207,8 +207,8 @@ public function testPreviewWithPagersUI() {
$this->clickPreviewLinkAJAX($next_page_link, 3);
// Test that the pager is present and rendered.
- $elements = $this->xpath('//ul[contains(@class, :class)]/li', [':class' => 'pager__items']);
- $this->assertNotEmpty($elements, 'Mini pager found.');
+ $elements = $this->xpath('//ul[contains(@class, "pager__items")]/li');
+ $this->assertNotEmpty($elements);
// Verify elements and links to pages.
// We expect to find 3 elements: previous page with a link, current
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
index df89dca4dec5e87cce5b43597b51ae80dd573d44..0a843954b36054599f1811ace14532ae37cf78d6 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
@@ -172,8 +172,7 @@ public function testDialog() {
$this->drupalGet('admin/structure/contact/add');
// Check we get a chunk of the code, we can't test the whole form as form
// build id and token with be different.
- $contact_form = $this->xpath("//form[@id='contact-form-add-form']");
- $this->assertNotEmpty($contact_form, 'Non-JS entity form page present.');
+ $this->assertSession()->elementExists('xpath', "//form[@id='contact-form-add-form']");
// Reset: Return to the dialog links page.
$this->drupalGet('ajax-test/dialog');
diff --git a/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php b/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
index abf93bd65e84a585c6dd241269c0a6e3b1d0f4e5..7cd986461c26314b635258237b274c566dbe8f3b 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
@@ -84,8 +84,7 @@ protected function setUpSettings() {
$this->translations['Save and continue'] = 'Save and continue de';
// Check the language direction.
- $direction = current($this->xpath('/@dir'))->getText();
- $this->assertEquals('ltr', $direction);
+ $this->assertSession()->elementTextEquals('xpath', '/@dir', 'ltr');
// Verify that the distribution name appears.
$this->assertSession()->pageTextContains($this->info['distribution']['name']);
diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php
index 4fbf2451c10525179161fda90c0da4b9f392e1aa..044506b6c45064493a404e111a91e6f772b3fba9 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerLanguageDirectionTest.php
@@ -36,8 +36,7 @@ protected function setUpLanguage() {
$this->translations['Save and continue'] = 'Save and continue Arabic';
// Verify that language direction is right-to-left.
- $direction = current($this->xpath('/@dir'))->getText();
- $this->assertEquals('rtl', $direction);
+ $this->assertSession()->elementTextEquals('xpath', '/@dir', 'rtl');
}
/**
diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php
index fe9da09502595ee5400d9b3fa09c2d2df5ab76a1..3293b1d3ad5e5438ead91ef7d10830202fb33f6e 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationQueryTest.php
@@ -41,8 +41,7 @@ protected function visitInstaller() {
$this->translations['Save and continue'] = 'Save and continue de';
// Check the language direction.
- $direction = current($this->xpath('/@dir'))->getText();
- $this->assertEquals('ltr', $direction);
+ $this->assertSession()->elementTextEquals('xpath', '/@dir', 'ltr');
}
/**
diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
index a46adc575e78a1ce2286247907ee36e2e1538c00..c48d53ad04fe69076d6ac26e4420bcc8c85bdd20 100644
--- a/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
+++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
@@ -40,8 +40,7 @@ protected function setUpLanguage() {
$this->translations['Save and continue'] = 'Save and continue de';
// Check the language direction.
- $direction = current($this->xpath('/@dir'))->getText();
- $this->assertEquals('ltr', $direction);
+ $this->assertSession()->elementTextEquals('xpath', '/@dir', 'ltr');
}
/**