diff --git a/core/modules/book/tests/src/Functional/BookTestTrait.php b/core/modules/book/tests/src/Functional/BookTestTrait.php
index f2d78b511200630c1e660855c017549ef9f9bf38..b52a4c6f0e33cfb620443aa6b315330998227d21 100644
--- a/core/modules/book/tests/src/Functional/BookTestTrait.php
+++ b/core/modules/book/tests/src/Functional/BookTestTrait.php
@@ -95,7 +95,7 @@ public function checkBookNode(EntityInterface $node, $nodes, $previous, $up, $ne
// Check outline structure.
if ($nodes !== NULL) {
- $this->assertPattern($this->generateOutlinePattern($nodes));
+ $this->assertSession()->responseMatches($this->generateOutlinePattern($nodes));
}
// Check previous, up, and next links.
diff --git a/core/modules/color/tests/src/Functional/ColorTest.php b/core/modules/color/tests/src/Functional/ColorTest.php
index 66199d533de3af6b0b165fdab60effd4243c8369..ca47ff98503205b5be0f5645d9db870b0cf50aed 100644
--- a/core/modules/color/tests/src/Functional/ColorTest.php
+++ b/core/modules/color/tests/src/Functional/ColorTest.php
@@ -122,7 +122,7 @@ public function _testColor($theme, $test_values) {
$stylesheets = $this->config('color.theme.' . $theme)->get('stylesheets');
// Make sure the color stylesheet is included in the content.
foreach ($stylesheets as $stylesheet) {
- $this->assertPattern('|' . file_url_transform_relative(file_create_url($stylesheet)) . '|');
+ $this->assertSession()->responseMatches('|' . file_url_transform_relative(file_create_url($stylesheet)) . '|');
$stylesheet_content = implode("\n", file($stylesheet));
$this->assertStringContainsString('color: #123456', $stylesheet_content, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')');
}
diff --git a/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php b/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
index 6366ce6d1519dd1f7f08a767748bc7ee492b33bf..15132da9c0771420c1bcac6acd581fd2eb467b88 100644
--- a/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
@@ -189,7 +189,7 @@ public function testAnonymous() {
]);
$this->drupalGet('node/' . $this->node->id());
// Verify that the comment field title is displayed.
- $this->assertPattern('@<h2[^>]*>Comments</h2>@');
+ $this->assertSession()->responseMatches('@<h2[^>]*>Comments</h2>@');
$this->assertSession()->linkExists('Log in', 1, 'Link to login was found.');
$this->assertSession()->linkExists('register', 1, 'Link to register was found.');
diff --git a/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
index 8835066f65fe8e52ec111d286527f3d2edea799c..cdf3e5cbc2b6bc22d016fc8fe32142efac5bdbd0 100644
--- a/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
@@ -55,7 +55,7 @@ public function testCommentInterface() {
// Test the comment field title is displayed when there's comments.
$this->drupalGet($this->node->toUrl());
- $this->assertPattern('@<h2[^>]*>Comments</h2>@');
+ $this->assertSession()->responseMatches('@<h2[^>]*>Comments</h2>@');
// Set comments to have subject and preview to required.
$this->drupalLogout();
diff --git a/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php b/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
index 93cd155d3675766706122832f8160355ece85c5a..84c3a6a889b8a0d05e8792963ed18f1899cb0db6 100644
--- a/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
@@ -371,7 +371,7 @@ public function testCommentFunctionality() {
]);
$this->drupalGet('entity_test/' . $this->entity->id());
// Verify that the comment field title is displayed.
- $this->assertPattern('@<h2[^>]*>Comments</h2>@');
+ $this->assertSession()->responseMatches('@<h2[^>]*>Comments</h2>@');
$this->assertSession()->linkExists('Log in', 0, 'Link to login was found.');
$this->assertSession()->linkExists('register', 0, 'Link to register was found.');
$this->assertNoFieldByName('subject[0][value]', '', 'Subject field not found.');
diff --git a/core/modules/comment/tests/src/Functional/CommentTitleTest.php b/core/modules/comment/tests/src/Functional/CommentTitleTest.php
index 7897acbaa2c64ee177df7e4ac2896afa83ce946f..3ac9d27c7b18da0098fc9e24e893f8cc92b5c051 100644
--- a/core/modules/comment/tests/src/Functional/CommentTitleTest.php
+++ b/core/modules/comment/tests/src/Functional/CommentTitleTest.php
@@ -46,7 +46,7 @@ public function testCommentEmptyTitles() {
$regex .= $comment->comment_body->value . '(.*?)';
$regex .= '/s';
// Verify that the comment is created successfully.
- $this->assertPattern($regex);
+ $this->assertSession()->responseMatches($regex);
// Tests that markup is not generated for the comment without header.
$this->assertSession()->responseNotMatches('|<h3[^>]*></h3>|', 'Comment title H3 element not found when title is an empty string.');
}
@@ -77,7 +77,7 @@ public function testCommentPopulatedTitles() {
// Confirm that the comment was created.
$this->assertTrue($this->commentExists($comment1), 'Comment #1. Comment found.');
// Tests that markup is created for comment with heading.
- $this->assertPattern('|<h3[^>]*><a[^>]*>' . $subject_text . '</a></h3>|');
+ $this->assertSession()->responseMatches('|<h3[^>]*><a[^>]*>' . $subject_text . '</a></h3>|');
// Tests that the comment's title link is the permalink of the comment.
$comment_permalink = $this->cssSelect('.permalink');
$comment_permalink = $comment_permalink[0]->getAttribute('href');
diff --git a/core/modules/field/tests/src/Functional/FormTest.php b/core/modules/field/tests/src/Functional/FormTest.php
index dcea41e0f80a1d1dec0d5ef014391119344cb033..37aa822ed47220b72f3992beeed99d0631f9ab49 100644
--- a/core/modules/field/tests/src/Functional/FormTest.php
+++ b/core/modules/field/tests/src/Functional/FormTest.php
@@ -316,7 +316,7 @@ public function testFieldFormUnlimited() {
ksort($pattern);
$pattern = implode('.*', array_values($pattern));
// Verify that the widgets are displayed in the correct order.
- $this->assertPattern("|$pattern|s");
+ $this->assertSession()->responseMatches("|$pattern|s");
$this->assertFieldByName("{$field_name}[$delta][value]", '', "New widget is displayed");
$this->assertFieldByName("{$field_name}[$delta][_weight]", $delta, "New widget has the right weight");
// Verify that no extraneous widget is displayed.
diff --git a/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php b/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
index 175360180a31ab57852ccd9cabdbfb7687eea016..e08b4734ae326a9ed31d56e5f97283cebd855501 100644
--- a/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
@@ -78,12 +78,12 @@ public function testMenuNodeFormWidget() {
// Verify that the menu link title has the correct maxlength.
$title_max_length = \Drupal::service('entity_field.manager')->getBaseFieldDefinitions('menu_link_content')['title']->getSetting('max_length');
$this->drupalGet('node/add/page');
- $this->assertPattern('/<input .* id="edit-menu-title" .* maxlength="' . $title_max_length . '" .* \/>/');
+ $this->assertSession()->responseMatches('/<input .* id="edit-menu-title" .* maxlength="' . $title_max_length . '" .* \/>/');
// Verify that the menu link description has the correct maxlength.
$description_max_length = \Drupal::service('entity_field.manager')->getBaseFieldDefinitions('menu_link_content')['description']->getSetting('max_length');
$this->drupalGet('node/add/page');
- $this->assertPattern('/<input .* id="edit-menu-description" .* maxlength="' . $description_max_length . '" .* \/>/');
+ $this->assertSession()->responseMatches('/<input .* id="edit-menu-description" .* maxlength="' . $description_max_length . '" .* \/>/');
// Disable the default main menu, so that no menus are enabled.
$edit = [
@@ -195,10 +195,10 @@ public function testMenuNodeFormWidget() {
$this->assertFieldById('edit-menu-weight', 17, 'Menu weight correct in edit form');
// Verify that the menu link title field has correct maxlength in node edit
// form.
- $this->assertPattern('/<input .* id="edit-menu-title" .* maxlength="' . $title_max_length . '" .* \/>/');
+ $this->assertSession()->responseMatches('/<input .* id="edit-menu-title" .* maxlength="' . $title_max_length . '" .* \/>/');
// Verify that the menu link description field has correct maxlength in
// node add form.
- $this->assertPattern('/<input .* id="edit-menu-description" .* maxlength="' . $description_max_length . '" .* \/>/');
+ $this->assertSession()->responseMatches('/<input .* id="edit-menu-description" .* maxlength="' . $description_max_length . '" .* \/>/');
// Disable the menu link, then edit the node--the link should stay disabled.
$link_id = menu_ui_get_menu_link_defaults($node)['entity_id'];
diff --git a/core/modules/node/tests/src/Functional/Views/FrontPageTest.php b/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
index 8d5b0f048758729bba213032254dfb790f6340d4..09ea800ec8cdac0c43e54b340d633c8e038f9ebf 100644
--- a/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
+++ b/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
@@ -187,7 +187,7 @@ public function testAdminFrontPage() {
$this->drupalGet('node');
$this->assertSession()->statusCodeEquals(200);
// Check that the frontpage view was rendered.
- $this->assertPattern('/class=".+view-frontpage/');
+ $this->assertSession()->responseMatches('/class=".+view-frontpage/');
}
/**
diff --git a/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
index 214e5b111aa2bf82ec753e5b34fa9bcee719f412..f12fb86f870f8b9e52491a1974ebce9527a463c7 100644
--- a/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
@@ -259,7 +259,7 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
- $this->assertPattern('/<a(.*?)href="' . preg_quote(file_url_transform_relative(file_create_url($image_uri)), '/') . '"(.*?)>\s*<picture/');
+ $this->assertSession()->responseMatches('/<a(.*?)href="' . preg_quote(file_url_transform_relative(file_create_url($image_uri)), '/') . '"(.*?)>\s*<picture/');
// Verify that the image can be downloaded.
$this->assertEqual(file_get_contents($test_image->uri), $this->drupalGet(file_create_url($image_uri)), 'File was downloaded successfully.');
if ($scheme == 'private') {
@@ -304,7 +304,7 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
$this->assertRaw('media="(min-width: 560px)"');
// Assert the output of the 'sizes' attribute.
$this->assertRaw('sizes="(min-width: 700px) 700px, 100vw"');
- $this->assertPattern('/media="\(min-width: 560px\)".+?sizes="\(min-width: 700px\) 700px, 100vw"/');
+ $this->assertSession()->responseMatches('/media="\(min-width: 560px\)".+?sizes="\(min-width: 700px\) 700px, 100vw"/');
// Assert the output of the 'srcset' attribute (small images first).
$medium_style = ImageStyle::load('medium');
$this->assertRaw(file_url_transform_relative($medium_style->buildUrl($image_uri)) . ' 220w, ' . file_url_transform_relative($large_style->buildUrl($image_uri)) . ' 360w');
@@ -406,7 +406,7 @@ public function testResponsiveImageFieldFormattersEmptyMediaQuery() {
$thumbnail_style = ImageStyle::load('thumbnail');
$node = $node_storage->load($nid);
$image_uri = File::load($node->{$field_name}->target_id)->getFileUri();
- $this->assertPattern('/srcset="' . preg_quote(file_url_transform_relative($thumbnail_style->buildUrl($image_uri)), '/') . ' 1x".+?media="\(min-width: 0px\)"/');
+ $this->assertSession()->responseMatches('/srcset="' . preg_quote(file_url_transform_relative($thumbnail_style->buildUrl($image_uri)), '/') . ' 1x".+?media="\(min-width: 0px\)"/');
}
/**
@@ -487,7 +487,7 @@ private function assertResponsiveImageFieldFormattersLink($link_type) {
$this->previewNodeImage($test_image, $field_name, 'article');
// Look for a picture tag in the preview output
- $this->assertPattern('/picture/');
+ $this->assertSession()->responseMatches('/picture/');
$nid = $this->uploadNodeImage($test_image, $field_name, 'article');
$this->container->get('entity_type.manager')->getStorage('node')->resetCache([$nid]);
@@ -515,12 +515,12 @@ private function assertResponsiveImageFieldFormattersLink($link_type) {
switch ($link_type) {
case 'file':
// Make sure the link to the file is present.
- $this->assertPattern('/<a(.*?)href="' . preg_quote(file_url_transform_relative(file_create_url($image_uri)), '/') . '"(.*?)>\s*<picture/');
+ $this->assertSession()->responseMatches('/<a(.*?)href="' . preg_quote(file_url_transform_relative(file_create_url($image_uri)), '/') . '"(.*?)>\s*<picture/');
break;
case 'content':
// Make sure the link to the node is present.
- $this->assertPattern('/<a(.*?)href="' . preg_quote($node->toUrl()->toString(), '/') . '"(.*?)>\s*<picture/');
+ $this->assertSession()->responseMatches('/<a(.*?)href="' . preg_quote($node->toUrl()->toString(), '/') . '"(.*?)>\s*<picture/');
break;
}
}
diff --git a/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
index 23b810d080e7acaa975c2a710553ddbbe958838a..f6083c89156a2cade9bcdd8a9ddc60387b71847f 100644
--- a/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
+++ b/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
@@ -117,13 +117,13 @@ public function testLogging() {
// Verify that logging scripts are found on a valid node page.
$this->drupalGet($path);
$settings = $this->getDrupalSettings();
- $this->assertPattern($expected_library);
+ $this->assertSession()->responseMatches($expected_library);
$this->assertIdentical($this->node->id(), $settings['statistics']['data']['nid'], 'Found statistics settings on node page.');
// Verify the same when loading the site in a non-default language.
$this->drupalGet($this->language['langcode'] . '/' . $path);
$settings = $this->getDrupalSettings();
- $this->assertPattern($expected_library);
+ $this->assertSession()->responseMatches($expected_library);
$this->assertIdentical($this->node->id(), $settings['statistics']['data']['nid'], 'Found statistics settings on valid node page in a non-default language.');
// Manually call statistics.php to simulate ajax data collection behavior.
diff --git a/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php b/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
index 83d6317f1854d2f8f7694d6007c765b38a847456..841886e906f645b45aa3f16d49fd21a2e62a409c 100644
--- a/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
+++ b/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
@@ -221,7 +221,7 @@ public function testBatchLargePercentage() {
*/
public function assertBatchMessages($texts, $message) {
$pattern = '|' . implode('.*', $texts) . '|s';
- return $this->assertPattern($pattern);
+ return $this->assertSession()->responseMatches($pattern);
}
/**
diff --git a/core/modules/system/tests/src/Functional/Form/StorageTest.php b/core/modules/system/tests/src/Functional/Form/StorageTest.php
index 2d660d31c421428b25813b3cf74b8539b554e8ba..cb6c469f343c61543135b6fe1b969fe6be24141a 100644
--- a/core/modules/system/tests/src/Functional/Form/StorageTest.php
+++ b/core/modules/system/tests/src/Functional/Form/StorageTest.php
@@ -102,7 +102,7 @@ public function testFormCached() {
public function testValidation() {
$this->drupalPostForm('form_test/form-storage', ['title' => '', 'value' => 'value_is_set'], 'Continue submit');
// Ensure that the input values have been kept.
- $this->assertPattern('/value_is_set/');
+ $this->assertSession()->responseMatches('/value_is_set/');
}
/**
diff --git a/core/modules/system/tests/src/Functional/Menu/LocalActionTest.php b/core/modules/system/tests/src/Functional/Menu/LocalActionTest.php
index 42b622ce2c2518f807957cd79da1b6d0533f1d81..176fec87c60f4f2584acf54e501afe1b3a83eac9 100644
--- a/core/modules/system/tests/src/Functional/Menu/LocalActionTest.php
+++ b/core/modules/system/tests/src/Functional/Menu/LocalActionTest.php
@@ -84,7 +84,7 @@ protected function assertLocalAction(array $actions) {
// so use a pattern instead to check the raw content.
// This behavior is a bug in libxml, see
// https://bugs.php.net/bug.php?id=49437.
- $this->assertPattern('@<a [^>]*class="[^"]*button-action[^"]*"[^>]*>' . preg_quote($title, '@') . '</@');
+ $this->assertSession()->responseMatches('@<a [^>]*class="[^"]*button-action[^"]*"[^>]*>' . preg_quote($title, '@') . '</@');
$this->assertEqual($elements[$index]->getAttribute('href'), $url->toString());
$index++;
}
diff --git a/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php b/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
index 509fa990a2197df98c0f2ec0c3917ce548e9a594..cd218a745187bdd7a0127ea0ceb394c9c978e050 100644
--- a/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
+++ b/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
@@ -78,7 +78,7 @@ protected function assertLocalTaskAppears($title) {
// so use a pattern instead to check the raw content.
// This behavior is a bug in libxml, see
// https://bugs.php.net/bug.php?id=49437.
- return $this->assertPattern('@<a [^>]*>' . preg_quote($title, '@') . '</a>@');
+ return $this->assertSession()->responseMatches('@<a [^>]*>' . preg_quote($title, '@') . '</a>@');
}
/**
diff --git a/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
index bca9c825a56afa9e0c54e11e79416a5cb53f4df8..281c26f8d1a7d9226643c484420ae469e174ea1c 100644
--- a/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
@@ -68,7 +68,7 @@ public function testTermIndentation() {
];
// Submit the edited form and check for HTML indentation element presence.
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertPattern('|<div class="js-indentation indentation"> </div>|');
+ $this->assertSession()->responseMatches('|<div class="js-indentation indentation"> </div>|');
// Check explicitly that term 2's parent is term 1.
$parents = $taxonomy_storage->loadParents($term2->id());
diff --git a/core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php
index 27db54e98537c227e9f20da0b614c14475b85d53..5d380d1f12e6d94ee3491dbcd8d6d89197516900 100644
--- a/core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermPagerTest.php
@@ -65,11 +65,11 @@ public function testTaxonomyTermOverviewPager() {
// Ensure that pager is visible on page 1.
$this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview');
- $this->assertPattern('|<nav class="pager" [^>]*>|');
+ $this->assertSession()->responseMatches('|<nav class="pager" [^>]*>|');
// Ensure that pager is visible on page 2.
$this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview', ['query' => ['page' => 1]]);
- $this->assertPattern('|<nav class="pager" [^>]*>|');
+ $this->assertSession()->responseMatches('|<nav class="pager" [^>]*>|');
}
}
diff --git a/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php b/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
index fbc635292a4e3df411bf2edbe60995479188f296..c43762c2498c2a6d238fc1af540eaec1bcd90d6d 100644
--- a/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
@@ -142,7 +142,7 @@ public function testTermTranslatedOnOverviewPage() {
// Overview page in the other language shows the translated term
$this->drupalGet('bb/admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview');
- $this->assertPattern('|<a[^>]*>' . $translated_title . '</a>|');
+ $this->assertSession()->responseMatches('|<a[^>]*>' . $translated_title . '</a>|');
}
}
diff --git a/core/modules/tracker/tests/src/Functional/TrackerTest.php b/core/modules/tracker/tests/src/Functional/TrackerTest.php
index 07748f541b1d889f0a08dd90920f20d949493661..a503263e7ec2fc51b9774ea78baa68cdaca9dec5 100644
--- a/core/modules/tracker/tests/src/Functional/TrackerTest.php
+++ b/core/modules/tracker/tests/src/Functional/TrackerTest.php
@@ -355,7 +355,7 @@ public function testTrackerOrderingNewComments() {
$this->verbose($pattern);
// Verify that the most recent comment on node appears at the top of
// tracker.
- $this->assertPattern($pattern);
+ $this->assertSession()->responseMatches($pattern);
}
/**
diff --git a/core/modules/update/tests/src/Functional/UpdateUploadTest.php b/core/modules/update/tests/src/Functional/UpdateUploadTest.php
index 74762ad2598a81d36c5c86146f5e95986aceb99c..b01b82ef7160acff5adfec021921f15fe83a5177 100644
--- a/core/modules/update/tests/src/Functional/UpdateUploadTest.php
+++ b/core/modules/update/tests/src/Functional/UpdateUploadTest.php
@@ -147,9 +147,9 @@ public function testUploadModule() {
public function testFileNameExtensionMerging() {
$this->drupalGet('admin/modules/install');
// Make sure the bogus extension supported by update_test.module is there.
- $this->assertPattern('/file extensions are supported:.*update-test-extension/');
+ $this->assertSession()->responseMatches('/file extensions are supported:.*update-test-extension/');
// Make sure it didn't clobber the first option from core.
- $this->assertPattern('/file extensions are supported:.*tar/');
+ $this->assertSession()->responseMatches('/file extensions are supported:.*tar/');
}
/**
diff --git a/core/modules/user/tests/src/Functional/UserBlocksTest.php b/core/modules/user/tests/src/Functional/UserBlocksTest.php
index fc0079235c48f1df83079d0d65c007b03cf7d8d0..1dd8761bc61ca8129384c1fb0ddb6d81f79cba97 100644
--- a/core/modules/user/tests/src/Functional/UserBlocksTest.php
+++ b/core/modules/user/tests/src/Functional/UserBlocksTest.php
@@ -89,7 +89,7 @@ public function testUserLoginBlock() {
$this->drupalPostForm(NULL, $edit, t('Log in'));
$this->assertNoText(t('User login'), 'Logged in.');
// Verify that we are still on the same page after login for allowed page.
- $this->assertPattern('!<title.*?Compose tips.*?</title>!');
+ $this->assertSession()->responseMatches('!<title.*?Compose tips.*?</title>!');
// Log out again and repeat with a non-403 page including query arguments.
$this->drupalLogout();
@@ -98,7 +98,7 @@ public function testUserLoginBlock() {
$this->drupalPostForm(NULL, $edit, t('Log in'));
$this->assertNoText(t('User login'), 'Logged in.');
// Verify that we are still on the same page after login for allowed page.
- $this->assertPattern('!<title.*?Compose tips.*?</title>!');
+ $this->assertSession()->responseMatches('!<title.*?Compose tips.*?</title>!');
$this->assertStringContainsString('/filter/tips?foo=bar', $this->getUrl(), 'Correct query arguments are displayed after login');
// Repeat with different query arguments.
@@ -108,7 +108,7 @@ public function testUserLoginBlock() {
$this->drupalPostForm(NULL, $edit, t('Log in'));
$this->assertNoText(t('User login'), 'Logged in.');
// Verify that we are still on the same page after login for allowed page.
- $this->assertPattern('!<title.*?Compose tips.*?</title>!');
+ $this->assertSession()->responseMatches('!<title.*?Compose tips.*?</title>!');
$this->assertStringContainsString('/filter/tips?foo=baz', $this->getUrl(), 'Correct query arguments are displayed after login');
// Check that the user login block is not vulnerable to information
diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index d6dcfa2e16c394ba2aaaa53cffa81736aebf6d62..d606296aed6075aa42a0d8ba0bfd99e54fe4a9d7 100644
--- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -285,6 +285,17 @@ public function testTextAsserts() {
$this->assertText($sanitized);
}
+ /**
+ * Tests legacy assertPattern().
+ *
+ * @group legacy
+ * @expectedDeprecation AssertLegacyTrait::assertPattern() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseMatches() instead. See https://www.drupal.org/node/3129738
+ */
+ public function testAssertPattern() {
+ $this->drupalGet('test-escaped-characters');
+ $this->assertPattern('/div class.*escaped/');
+ }
+
/**
* Tests legacy getRawContent().
*
diff --git a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
index 6103d36aa8a2c853257de00f7774c01d55e7bb75..5fd472f5e6b90f12e821107712b926998a7b687a 100644
--- a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
+++ b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
@@ -142,7 +142,6 @@ public static function getSkippedDeprecations() {
'AssertLegacyTrait::assertFieldByXPath() is deprecated in drupal:8.3.0 and is removed from drupal:10.0.0. Use $this->xpath() instead and check the values directly in the test. See https://www.drupal.org/node/3129738',
'AssertLegacyTrait::assertNoFieldByXPath() is deprecated in drupal:8.3.0 and is removed from drupal:10.0.0. Use $this->xpath() instead and assert that the result is empty. See https://www.drupal.org/node/3129738',
'AssertLegacyTrait::assertFieldsByValue() is deprecated in drupal:8.3.0 and is removed from drupal:10.0.0. Use iteration over the fields yourself instead and directly check the values in the test. See https://www.drupal.org/node/3129738',
- 'AssertLegacyTrait::assertPattern() is deprecated in drupal:8.2.0 and is removed from drupal:10.0.0. Use $this->assertSession()->responseMatches() instead. See https://www.drupal.org/node/3129738',
'AssertLegacyTrait::constructFieldXpath() is deprecated in drupal:8.5.0 and is removed from drupal:10.0.0. Use $this->getSession()->getPage()->findField() instead. See https://www.drupal.org/node/3129738',
];
}