generate();
$edit['import'] .= "\nuuid: " . $second_uuid;
$this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
- $this->assertRaw(t('Are you sure you want to create a new %name @type?', ['%name' => 'second', '@type' => 'test configuration']));
+ $this->assertSession()->responseContains(t('Are you sure you want to create a new %name @type?', ['%name' => 'second', '@type' => 'test configuration']));
$this->drupalPostForm(NULL, [], t('Confirm'));
$entity = $storage->load('second');
- $this->assertRaw(t('The configuration was imported successfully.'));
+ $this->assertSession()->responseContains(t('The configuration was imported successfully.'));
$this->assertIdentical($entity->label(), 'Second');
$this->assertIdentical($entity->id(), 'second');
$this->assertFalse($entity->status());
@@ -136,10 +136,10 @@ public function testImport() {
'import' => $import,
];
$this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
- $this->assertRaw(t('Are you sure you want to update the %name @type?', ['%name' => 'second', '@type' => 'test configuration']));
+ $this->assertSession()->responseContains(t('Are you sure you want to update the %name @type?', ['%name' => 'second', '@type' => 'test configuration']));
$this->drupalPostForm(NULL, [], t('Confirm'));
$entity = $storage->load('second');
- $this->assertRaw(t('The configuration was imported successfully.'));
+ $this->assertSession()->responseContains(t('The configuration was imported successfully.'));
$this->assertIdentical($entity->label(), 'Second updated');
// Try to perform an update which adds missing dependencies.
@@ -159,7 +159,7 @@ public function testImport() {
'import' => $import,
];
$this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
- $this->assertRaw(t('Configuration %name depends on the %owner module that will not be installed after import.', ['%name' => 'config_test.dynamic.second', '%owner' => 'does_not_exist']));
+ $this->assertSession()->responseContains(t('Configuration %name depends on the %owner module that will not be installed after import.', ['%name' => 'config_test.dynamic.second', '%owner' => 'does_not_exist']));
// Try to preform an update which would create a PHP object if Yaml parsing
// not securely set up.
@@ -180,13 +180,13 @@ public function testImport() {
if (extension_loaded('yaml')) {
// If the yaml extension is loaded it will work but not create the PHP
// object.
- $this->assertRaw(t('Are you sure you want to update the %name @type?', [
+ $this->assertSession()->responseContains(t('Are you sure you want to update the %name @type?', [
'%name' => 'second',
'@type' => 'test configuration',
]));
$this->drupalPostForm(NULL, [], t('Confirm'));
$entity = $storage->load('second');
- $this->assertRaw(t('The configuration was imported successfully.'));
+ $this->assertSession()->responseContains(t('The configuration was imported successfully.'));
$this->assertIsString($entity->label());
$this->assertStringContainsString('ObjectSerialization', $entity->label(), 'Label contains serialized object');
}
@@ -213,7 +213,7 @@ public function testImportSimpleConfiguration() {
'import' => Yaml::encode($config->get()),
];
$this->drupalPostForm('admin/config/development/configuration/single/import', $edit, t('Import'));
- $this->assertRaw(t('Are you sure you want to update the %name @type?', ['%name' => $config->getName(), '@type' => 'simple configuration']));
+ $this->assertSession()->responseContains(t('Are you sure you want to update the %name @type?', ['%name' => $config->getName(), '@type' => 'simple configuration']));
$this->drupalPostForm(NULL, [], t('Confirm'));
$this->drupalGet('');
$this->assertText('Test simple import');
diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
index 8de59f805a..9f95e236dc 100644
--- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
@@ -110,7 +110,7 @@ protected function doBlockListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -157,7 +157,7 @@ protected function doMenuListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -182,7 +182,7 @@ protected function doVocabularyListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -207,7 +207,7 @@ public function doCustomContentTypeListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -231,7 +231,7 @@ public function doContactFormsListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -254,7 +254,7 @@ public function doContentTypeListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -278,7 +278,7 @@ public function doFormatsListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -302,7 +302,7 @@ public function doShortcutListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -323,7 +323,7 @@ public function doUserRoleListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -343,7 +343,7 @@ public function doLanguageListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -359,7 +359,7 @@ public function doImageStyleListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -372,7 +372,7 @@ public function doResponsiveImageListTest() {
$edit['fallback_image_style'] = 'thumbnail';
$this->drupalPostForm('admin/config/media/responsive-image-style/add', $edit, t('Save'));
- $this->assertRaw(t('Responsive image style %label saved.', ['%label' => $edit['label']]));
+ $this->assertSession()->responseContains(t('Responsive image style %label saved.', ['%label' => $edit['label']]));
// Get the responsive image style listing.
$this->drupalGet('admin/config/media/responsive-image-style');
@@ -383,7 +383,7 @@ public function doResponsiveImageListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -435,7 +435,7 @@ public function doFieldListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
}
@@ -452,7 +452,7 @@ public function doDateFormatListTest() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
@@ -471,7 +471,7 @@ public function doSettingsPageTest($link) {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
}
/**
diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
index 5fe5916ad9..d5b1c18214 100644
--- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
@@ -122,8 +122,8 @@ public function testMapperListPage() {
$title = $test_entity->label() . ' ' . $entity_type->getSingularLabel();
$title = 'Translations for ' . Html::escape($title) . ' ';
- $this->assertRaw($title);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains($title);
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
$this->drupalGet($base_url);
$this->assertLink(t('Translate @title', ['@title' => $entity_type->getSingularLabel()]));
diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
index 85ee670e56..80760d31f6 100644
--- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
@@ -161,8 +161,8 @@ public function testSiteInformationTranslationUi() {
$this->clickLink(t('Add'));
// Make sure original text is present on this page.
- $this->assertRaw($site_name);
- $this->assertRaw($site_slogan);
+ $this->assertSession()->responseContains($site_name);
+ $this->assertSession()->responseContains($site_slogan);
// Update site name and slogan for French.
$edit = [
@@ -171,7 +171,7 @@ public function testSiteInformationTranslationUi() {
];
$this->drupalPostForm("$translation_base_url/fr/add", $edit, t('Save translation'));
- $this->assertRaw(t('Successfully saved @language translation.', ['@language' => 'French']));
+ $this->assertSession()->responseContains(t('Successfully saved @language translation.', ['@language' => 'French']));
// Check for edit, delete links (and no 'add' link) for French language.
$this->assertNoLinkByHref("$translation_base_url/fr/add");
@@ -188,8 +188,8 @@ public function testSiteInformationTranslationUi() {
// Check French translation of site name and slogan are in place.
$this->drupalGet('fr');
- $this->assertRaw($fr_site_name);
- $this->assertRaw($fr_site_slogan);
+ $this->assertSession()->responseContains($fr_site_name);
+ $this->assertSession()->responseContains($fr_site_slogan);
// Visit French site to ensure base language string present as source.
$this->drupalGet("fr/$translation_base_url/fr/edit");
@@ -270,7 +270,7 @@ public function testSourceValueDuplicateSave() {
'translation[config_names][system.site][slogan]' => 'FR ' . $site_slogan,
];
$this->drupalPostForm(NULL, $edit, t('Save translation'));
- $this->assertRaw(t('Successfully updated @language translation.', ['@language' => 'French']));
+ $this->assertSession()->responseContains(t('Successfully updated @language translation.', ['@language' => 'French']));
$override = \Drupal::languageManager()->getLanguageConfigOverride('fr', 'system.site');
// Expect only slogan in language specific file.
@@ -411,12 +411,12 @@ public function testContactConfigEntityTranslation() {
$replacements = ['%label' => t('@label @entity_type', ['@label' => $label, '@entity_type' => mb_strtolower(t('Contact form'))]), '@language' => \Drupal::languageManager()->getLanguage($langcode)->getName()];
$this->drupalGet("$translation_base_url/$langcode/delete");
- $this->assertRaw(t('Are you sure you want to delete the @language translation of %label?', $replacements));
+ $this->assertSession()->responseContains(t('Are you sure you want to delete the @language translation of %label?', $replacements));
// Assert link back to list page to cancel delete is present.
$this->assertLinkByHref($translation_base_url);
$this->drupalPostForm(NULL, [], t('Delete'));
- $this->assertRaw(t('@language translation of %label was deleted', $replacements));
+ $this->assertSession()->responseContains(t('@language translation of %label was deleted', $replacements));
$this->assertLinkByHref("$translation_base_url/$langcode/add");
$this->assertNoLinkByHref("translation_base_url/$langcode/edit");
$this->assertNoLinkByHref("$translation_base_url/$langcode/delete");
@@ -479,7 +479,7 @@ public function testDateFormatTranslation() {
$this->assertText($label);
// Make sure that the date library is added.
- $this->assertRaw('core/modules/system/js/system.date.js');
+ $this->assertSession()->responseContains('core/modules/system/js/system.date.js');
// Update translatable fields.
$edit = [
@@ -608,8 +608,8 @@ public function testViewsTranslationUI() {
$this->clickLink(t('Add'));
// Make sure original text is present on this page.
- $this->assertRaw($description);
- $this->assertRaw($human_readable_name);
+ $this->assertSession()->responseContains($description);
+ $this->assertSession()->responseContains($human_readable_name);
// Update Views Fields for French.
$edit = [
@@ -619,7 +619,7 @@ public function testViewsTranslationUI() {
'translation[config_names][views.view.frontpage][display][default][display_options][title]' => $display_options_master . " FR",
];
$this->drupalPostForm("$translation_base_url/fr/add", $edit, t('Save translation'));
- $this->assertRaw(t('Successfully saved @language translation.', ['@language' => 'French']));
+ $this->assertSession()->responseContains(t('Successfully saved @language translation.', ['@language' => 'French']));
// Check for edit, delete links (and no 'add' link) for French language.
$this->assertNoLinkByHref("$translation_base_url/fr/add");
@@ -668,7 +668,7 @@ public function testPluralConfigStringsSourceElements() {
// Check if the expected number of source elements are present.
foreach ($data['expected'] as $index => $expected) {
if ($expected) {
- $this->assertRaw('edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-' . $index);
+ $this->assertSession()->responseContains('edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-' . $index);
}
else {
$this->assertNoRaw('edit-source-config-names-viewsviewfiles-display-default-display-options-fields-count-format-plural-string-' . $index);
@@ -701,7 +701,7 @@ public function testPluralConfigStrings() {
// Make sure original text is present on this page, in addition to 2 new
// empty fields.
- $this->assertRaw($description);
+ $this->assertSession()->responseContains($description);
$this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][0]', $field_value);
$this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][1]', $field_value_plural);
$this->assertFieldByName('translation[config_names][views.view.files][display][default][display_options][fields][count][format_plural_string][2]', '');
@@ -861,18 +861,18 @@ public function testSingleLanguageUI() {
// Delete French language
$this->drupalPostForm('admin/config/regional/language/delete/fr', [], t('Delete'));
- $this->assertRaw(t('The %language (%langcode) language has been removed.', ['%language' => 'French', '%langcode' => 'fr']));
+ $this->assertSession()->responseContains(t('The %language (%langcode) language has been removed.', ['%language' => 'French', '%langcode' => 'fr']));
// Change default language to Tamil.
$edit = [
'site_default_language' => 'ta',
];
$this->drupalPostForm('admin/config/regional/language', $edit, t('Save configuration'));
- $this->assertRaw(t('Configuration saved.'));
+ $this->assertSession()->responseContains(t('Configuration saved.'));
// Delete English language
$this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
- $this->assertRaw(t('The %language (%langcode) language has been removed.', ['%language' => 'English', '%langcode' => 'en']));
+ $this->assertSession()->responseContains(t('The %language (%langcode) language has been removed.', ['%language' => 'English', '%langcode' => 'en']));
// Visit account setting translation page, this should not
// throw any notices.
@@ -1071,7 +1071,7 @@ public function testNodeFieldTranslation() {
// Check that the translations are saved.
$this->clickLink('Add');
- $this->assertRaw('FR label');
+ $this->assertSession()->responseContains('FR label');
}
/**
@@ -1120,7 +1120,7 @@ protected function setSiteInformation($site_name, $site_slogan) {
'site_slogan' => $site_slogan,
];
$this->drupalPostForm('admin/config/system/site-information', $edit, t('Save configuration'));
- $this->assertRaw(t('The configuration options have been saved.'));
+ $this->assertSession()->responseContains(t('The configuration options have been saved.'));
}
/**
diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
index 50e169f09f..0d61a44f2a 100644
--- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
@@ -54,7 +54,7 @@ public function testTranslateOperationInViewListUi() {
// Test if the link to translate actually goes to the translate page.
$this->drupalGet($translate_link);
- $this->assertRaw('' . t('Language') . ' ');
+ $this->assertSession()->responseContains('' . t('Language') . ' ');
// Test that the 'Edit' tab appears.
$this->assertLinkByHref('admin/structure/views/view/test_view');
diff --git a/core/modules/contact/tests/src/Functional/ContactPersonalTest.php b/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
index d74dec9376..7e8467d7d0 100644
--- a/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
@@ -105,7 +105,7 @@ public function testSendPersonalContactMessage() {
'@sender_email' => $this->webUser->getEmail(),
'@recipient_name' => $this->contactUser->getAccountName(),
];
- $this->assertRaw(new FormattableMarkup('@sender_name (@sender_email) sent @recipient_name an email.', $placeholders));
+ $this->assertSession()->responseContains(new FormattableMarkup('@sender_name (@sender_email) sent @recipient_name an email.', $placeholders));
// Ensure an unescaped version of the email does not exist anywhere.
$this->assertNoRaw($this->webUser->getEmail());
}
@@ -119,7 +119,7 @@ public function testPersonalContactAccess() {
$this->drupalGet('user/' . $this->adminUser->id() . '/contact');
$this->assertSession()->statusCodeEquals(200);
// Check the page title is properly displayed.
- $this->assertRaw(t('Contact @username', ['@username' => $this->adminUser->getDisplayName()]));
+ $this->assertSession()->responseContains(t('Contact @username', ['@username' => $this->adminUser->getDisplayName()]));
// Test denied access to admin user's own contact form.
$this->drupalLogout();
@@ -247,7 +247,7 @@ public function testPersonalContactFlood() {
// Submit contact form one over limit.
$this->submitPersonalContact($this->contactUser);
- $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', ['%number' => $flood_limit, '@interval' => \Drupal::service('date.formatter')->formatInterval($this->config('contact.settings')->get('flood.interval'))]), 'Normal user denied access to flooded contact form.');
+ $this->assertSession()->responseContains(t('You cannot send more than %number messages in @interval. Try again later.', ['%number' => $flood_limit, '@interval' => \Drupal::service('date.formatter')->formatInterval($this->config('contact.settings')->get('flood.interval'))]), 'Normal user denied access to flooded contact form.');
// Test that the admin user can still access the contact form even though
// the flood limit was reached.
diff --git a/core/modules/contact/tests/src/Functional/ContactSitewideTest.php b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
index 3fb719e062..e4bda13a4e 100644
--- a/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
+++ b/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
@@ -150,7 +150,7 @@ public function testSiteWideContact() {
$invalid_recipients = ['invalid', 'invalid@', 'invalid@site.', '@site.', '@site.com'];
foreach ($invalid_recipients as $invalid_recipient) {
$this->addContactForm($this->randomMachineName(16), $this->randomMachineName(16), $invalid_recipient, '', FALSE);
- $this->assertRaw(t('%recipient is an invalid email address.', ['%recipient' => $invalid_recipient]));
+ $this->assertSession()->responseContains(t('%recipient is an invalid email address.', ['%recipient' => $invalid_recipient]));
}
// Test validation of empty form and recipients fields.
@@ -225,7 +225,7 @@ public function testSiteWideContact() {
// Try adding a form that already exists.
$this->addContactForm($name, $label, '', '', FALSE);
$this->assertNoText(t('Contact form @label has been added.', ['@label' => $label]));
- $this->assertRaw(t('The machine-readable name is already in use. It must be unique.'));
+ $this->assertSession()->responseContains(t('The machine-readable name is already in use. It must be unique.'));
$this->drupalLogout();
@@ -247,7 +247,7 @@ public function testSiteWideContact() {
$this->assertText(t('Your email address field is required.'));
$this->submitContact($this->randomMachineName(16), $invalid_recipients[0], $this->randomMachineName(16), $id, $this->randomMachineName(64));
- $this->assertRaw(t('The email address %mail is not valid.', ['%mail' => 'invalid']));
+ $this->assertSession()->responseContains(t('The email address %mail is not valid.', ['%mail' => 'invalid']));
$this->submitContact($this->randomMachineName(16), $recipients[0], '', $id, $this->randomMachineName(64));
$this->assertText(t('Subject field is required.'));
@@ -275,7 +275,7 @@ public function testSiteWideContact() {
}
// Submit contact form one over limit.
$this->submitContact($this->randomMachineName(16), $recipients[0], $this->randomMachineName(16), $id, $this->randomMachineName(64));
- $this->assertRaw(t('You cannot send more than %number messages in 10 min. Try again later.', ['%number' => $this->config('contact.settings')->get('flood.limit')]));
+ $this->assertSession()->responseContains(t('You cannot send more than %number messages in 10 min. Try again later.', ['%number' => $this->config('contact.settings')->get('flood.limit')]));
// Test listing controller.
$this->drupalLogin($admin_user);
@@ -473,7 +473,7 @@ public function testAutoReply() {
$this->assertCount(0, $captured_emails);
$this->drupalLogin($admin_user);
$this->drupalGet('admin/reports/dblog');
- $this->assertRaw('Error sending auto-reply, missing sender e-mail address in foo');
+ $this->assertSession()->responseContains('Error sending auto-reply, missing sender e-mail address in foo');
}
/**
@@ -580,7 +580,7 @@ public function deleteContactForms() {
}
else {
$this->drupalPostForm("admin/structure/contact/manage/$id/delete", [], t('Delete'));
- $this->assertRaw(t('The contact form %label has been deleted.', ['%label' => $contact_form->label()]));
+ $this->assertSession()->responseContains(t('The contact form %label has been deleted.', ['%label' => $contact_form->label()]));
$this->assertNull(ContactForm::load($id), new FormattableMarkup('Form %contact_form not found', ['%contact_form' => $contact_form->label()]));
}
}
diff --git a/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
index 8999dae122..9bf89bd1e7 100644
--- a/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ModerationStateNodeTypeTest.php
@@ -26,7 +26,7 @@ public function testNotModerated() {
$this->assertText('The content type Not moderated has been added.');
$this->grantUserPermissionToCreateContentOfType($this->adminUser, 'not_moderated');
$this->drupalGet('node/add/not_moderated');
- $this->assertRaw('Save');
+ $this->assertSession()->responseContains('Save');
$this->drupalPostForm(NULL, [
'title[0][value]' => 'Test',
], t('Save'));
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php
index b958fa1af6..a8ae62aca4 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php
@@ -127,7 +127,7 @@ public function testContentTranslationContextualLinks() {
$this->drupalLogin($this->translator);
$translate_link = 'node/' . $node->id() . '/translations';
$this->drupalGet($translate_link);
- $this->assertRaw(t('Translations of %label', ['%label' => $node->label()]), 'The contextual link leads to the translate page.');
+ $this->assertSession()->responseContains(t('Translations of %label', ['%label' => $node->label()]), 'The contextual link leads to the translate page.');
}
}
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationEnableTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationEnableTest.php
index bf9c41b939..b389577fd4 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationEnableTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationEnableTest.php
@@ -70,7 +70,7 @@ public function testEnable() {
];
$this->drupalPostForm('admin/structure/types/add', $edit, t('Save content type'));
$this->drupalGet('admin/config/regional/content-language');
- $this->assertRaw('entity_types[node]');
+ $this->assertSession()->responseContains('entity_types[node]');
}
}
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php
index a68b99d53a..bc556b8269 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationLanguageChangeTest.php
@@ -140,7 +140,7 @@ public function testTitleDoesNotChangesOnChangingLanguageWidgetAndTriggeringAjax
$node = $this->getNodeByTitle('english_title');
$this->drupalGet('node/' . $node->id() . '/edit');
// Test the expected title when loading the form.
- $this->assertRaw('Edit Article english_title | Drupal ');
+ $this->assertSession()->responseContains('Edit Article english_title | Drupal ');
// Upload and image after changing the node language.
$images = $this->drupalGetTestFiles('image')[1];
$edit = [
@@ -150,7 +150,7 @@ public function testTitleDoesNotChangesOnChangingLanguageWidgetAndTriggeringAjax
$this->drupalPostForm(NULL, $edit, t('Upload'));
// Test the expected title after triggering an ajax call with a new
// language selected.
- $this->assertRaw('Edit Article english_title | Drupal ');
+ $this->assertSession()->responseContains('Edit Article english_title | Drupal ');
$edit = [
'langcode[0][value]' => 'en',
'field_image_field[0][alt]' => 'alternative_text',
diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
index 162c5d1f81..d32df087b2 100644
--- a/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
+++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
@@ -116,7 +116,7 @@ protected function doTestBasicTranslation() {
// Assert that HTML is not escaped unexpectedly.
if ($this->testHTMLEscapeForAllLanguages) {
$this->assertNoRaw('<span class="translation-entity-all-languages">(all languages)</span>');
- $this->assertRaw('(all languages) ');
+ $this->assertSession()->responseContains('(all languages) ');
}
// Ensure that the content language cache context is not yet added to the
@@ -511,7 +511,7 @@ protected function doTestTranslationEdit() {
$url = $entity->toUrl('edit-form', $options);
$this->drupalGet($url);
- $this->assertRaw($entity->getTranslation($langcode)->label());
+ $this->assertSession()->responseContains($entity->getTranslation($langcode)->label());
}
}
}
diff --git a/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php b/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
index 0df0336349..2ce3d2d4d8 100644
--- a/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
+++ b/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
@@ -150,7 +150,7 @@ public function testDifferentPermissions() {
// Get a page where contextual links are directly rendered.
$this->drupalGet(Url::fromRoute('menu_test.contextual_test'));
$this->assertEscaped("");
- $this->assertRaw('');
+ $this->assertSession()->responseContains('');
}
/**
diff --git a/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
index 2c5ed0b3db..dc0a3afca3 100644
--- a/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
+++ b/core/modules/datetime/tests/src/Functional/DateTimeFieldTest.php
@@ -77,7 +77,7 @@ public function testDateField() {
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
- $this->assertRaw($date->format($date_format));
+ $this->assertSession()->responseContains($date->format($date_format));
$this->assertNoRaw($date->format($time_format));
// Verify the date doesn't change if using a timezone that is UTC+12 when
@@ -272,8 +272,8 @@ public function testDatetimeField() {
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
- $this->assertRaw($date->format($date_format));
- $this->assertRaw($date->format($time_format));
+ $this->assertSession()->responseContains($date->format($date_format));
+ $this->assertSession()->responseContains($date->format($time_format));
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
$display_repository = \Drupal::service('entity_display.repository');
diff --git a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
index 10e48dbdbd..d95898e529 100644
--- a/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
+++ b/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
@@ -93,9 +93,9 @@ public function testDateRangeField() {
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
- $this->assertRaw($start_date->format($date_format));
+ $this->assertSession()->responseContains($start_date->format($date_format));
$this->assertNoRaw($start_date->format($time_format));
- $this->assertRaw($end_date->format($date_format));
+ $this->assertSession()->responseContains($end_date->format($date_format));
$this->assertNoRaw($end_date->format($time_format));
// Verify the date doesn't change when entity is edited through the form.
@@ -326,10 +326,10 @@ public function testDatetimeRangeField() {
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
- $this->assertRaw($start_date->format($date_format));
- $this->assertRaw($start_date->format($time_format));
- $this->assertRaw($end_date->format($date_format));
- $this->assertRaw($end_date->format($time_format));
+ $this->assertSession()->responseContains($start_date->format($date_format));
+ $this->assertSession()->responseContains($start_date->format($time_format));
+ $this->assertSession()->responseContains($end_date->format($date_format));
+ $this->assertSession()->responseContains($end_date->format($time_format));
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
$display_repository = \Drupal::service('entity_display.repository');
@@ -499,9 +499,9 @@ public function testAlldayRangeField() {
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
- $this->assertRaw($start_date->format($date_format));
+ $this->assertSession()->responseContains($start_date->format($date_format));
$this->assertNoRaw($start_date->format($time_format));
- $this->assertRaw($end_date->format($date_format));
+ $this->assertSession()->responseContains($end_date->format($date_format));
$this->assertNoRaw($end_date->format($time_format));
/** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
diff --git a/core/modules/dblog/tests/src/Functional/DbLogTest.php b/core/modules/dblog/tests/src/Functional/DbLogTest.php
index c8ebd31f59..07add9933f 100644
--- a/core/modules/dblog/tests/src/Functional/DbLogTest.php
+++ b/core/modules/dblog/tests/src/Functional/DbLogTest.php
@@ -126,10 +126,10 @@ public function testLogEventPage() {
$this->assertLinkByHref($context['referer']);
// Verify hostname.
- $this->assertRaw($context['ip'], 'Found hostname on the detail page.');
+ $this->assertSession()->responseContains($context['ip'], 'Found hostname on the detail page.');
// Verify location.
- $this->assertRaw($context['request_uri'], 'Found location on the detail page.');
+ $this->assertSession()->responseContains($context['request_uri'], 'Found location on the detail page.');
// Verify severity.
$this->assertText('Notice', 'The severity was properly displayed on the detail page.');
@@ -383,7 +383,7 @@ private function verifyLinkEscaping() {
$this->drupalGet('admin/reports/dblog/event/' . $result->fetchField());
// Check if the link exists (unescaped).
- $this->assertRaw($link);
+ $this->assertSession()->responseContains($link);
}
/**
@@ -453,7 +453,7 @@ private function doUser() {
$link = mb_substr($value, strpos($value, 'admin/reports/dblog/event/'));
$this->drupalGet($link);
// Check for full message text on the details page.
- $this->assertRaw($message, 'DBLog event details was found: [delete user]');
+ $this->assertSession()->responseContains($message, 'DBLog event details was found: [delete user]');
}
$this->assertNotEmpty($link, 'DBLog event was recorded: [delete user]');
// Visit random URL (to generate page not found event).
@@ -823,7 +823,7 @@ public function testOverviewLinks() {
$this->drupalGet('admin/reports/dblog');
$this->assertSession()->statusCodeEquals(200);
// Make sure HTML tags are filtered out.
- $this->assertRaw('title="alert('foo');Lorem');
+ $this->assertSession()->responseContains('title="alert('foo');Lorem');
$this->assertNoRaw("");
// Make sure HTML tags are filtered out in admin/reports/dblog/event/ too.
@@ -831,7 +831,7 @@ public function testOverviewLinks() {
$wid = Database::getConnection()->query('SELECT MAX(wid) FROM {watchdog}')->fetchField();
$this->drupalGet('admin/reports/dblog/event/' . $wid);
$this->assertNoRaw("");
- $this->assertRaw("alert('foo'); Lorem ipsum ");
+ $this->assertSession()->responseContains("alert('foo'); Lorem ipsum ");
}
/**
@@ -872,8 +872,8 @@ public function testBacktrace() {
// Check if the full message displays on the details page and backtrace is a
// pre-formatted text.
$message = new FormattableMarkup('%type: @message in %function (line', $error_user_notice);
- $this->assertRaw($message);
- $this->assertRaw('');
+ $this->assertSession()->responseContains($message);
+ $this->assertSession()->responseContains('');
}
}
diff --git a/core/modules/dynamic_page_cache/tests/src/Functional/DynamicPageCacheIntegrationTest.php b/core/modules/dynamic_page_cache/tests/src/Functional/DynamicPageCacheIntegrationTest.php
index 5d2ee6547c..c1fb401780 100644
--- a/core/modules/dynamic_page_cache/tests/src/Functional/DynamicPageCacheIntegrationTest.php
+++ b/core/modules/dynamic_page_cache/tests/src/Functional/DynamicPageCacheIntegrationTest.php
@@ -81,10 +81,10 @@ public function testDynamicPageCache() {
foreach (['llama', 'piggy', 'unicorn', 'kitten'] as $animal) {
$url = Url::fromUri('route:dynamic_page_cache_test.html.with_cache_contexts', ['query' => ['animal' => $animal]]);
$this->drupalGet($url);
- $this->assertRaw($animal);
+ $this->assertSession()->responseContains($animal);
$this->assertEqual('MISS', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER), 'Render array returned, rendered as HTML response: Dynamic Page Cache is active, Dynamic Page Cache MISS.');
$this->drupalGet($url);
- $this->assertRaw($animal);
+ $this->assertSession()->responseContains($animal);
$this->assertEqual('HIT', $this->drupalGetHeader(DynamicPageCacheSubscriber::HEADER), 'Render array returned, rendered as HTML response: Dynamic Page Cache is active, Dynamic Page Cache HIT.');
// Finally, let's also verify that the 'dynamic_page_cache_test.html'
diff --git a/core/modules/editor/tests/src/Functional/EditorAdminTest.php b/core/modules/editor/tests/src/Functional/EditorAdminTest.php
index e2ffd5ecfb..1a54cd8a27 100644
--- a/core/modules/editor/tests/src/Functional/EditorAdminTest.php
+++ b/core/modules/editor/tests/src/Functional/EditorAdminTest.php
@@ -72,7 +72,7 @@ public function testNoEditorAvailable() {
$this->assertCount(1, $select_is_disabled, 'The Text Editor select is disabled.');
$this->assertCount(1, $options, 'The Text Editor select has only one option.');
$this->assertTrue(($options[0]->getText()) === 'None', 'Option 1 in the Text Editor select is "None".');
- $this->assertRaw('This option is disabled because no modules that provide a text editor are currently enabled.', 'Description for select present that tells users to install a text editor module.');
+ $this->assertSession()->responseContains('This option is disabled because no modules that provide a text editor are currently enabled.', 'Description for select present that tells users to install a text editor module.');
}
/**
@@ -145,14 +145,14 @@ public function testDisableFormatWithEditor() {
// Go to node edit form.
$this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertRaw($text);
+ $this->assertSession()->responseContains($text);
// Disable the format assigned to the 'body' field of the node.
FilterFormat::load('monoceros')->disable()->save();
// Edit again the node.
$this->drupalGet('node/' . $node->id() . '/edit');
- $this->assertRaw($text);
+ $this->assertSession()->responseContains($text);
}
/**
diff --git a/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php b/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
index e054ae743d..e651ff7ce6 100644
--- a/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
+++ b/core/modules/editor/tests/src/Functional/EditorUploadImageScaleTest.php
@@ -99,7 +99,7 @@ public function testEditorUploadImageScale() {
list($uploaded_image_file_width, $uploaded_image_file_height) = $this->uploadImage($test_image->uri);
$this->assertEqual($uploaded_image_file_width, $max_width);
$this->assertEqual($uploaded_image_file_height, $uploaded_image_file_height * ($uploaded_image_file_width / $max_width));
- $this->assertRaw((string) new FormattableMarkup('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', ['%dimensions' => $max_width . 'x' . $max_height]));
+ $this->assertSession()->responseContains((string) new FormattableMarkup('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', ['%dimensions' => $max_width . 'x' . $max_height]));
// Case 3: max height smaller than uploaded image: image scaled down.
$test_image = $testing_image_list[2];
@@ -111,7 +111,7 @@ public function testEditorUploadImageScale() {
list($uploaded_image_file_width, $uploaded_image_file_height) = $this->uploadImage($test_image->uri);
$this->assertEqual($uploaded_image_file_width, $uploaded_image_file_width * ($uploaded_image_file_height / $max_height));
$this->assertEqual($uploaded_image_file_height, $max_height);
- $this->assertRaw((string) new FormattableMarkup('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', ['%dimensions' => $max_width . 'x' . $max_height]));
+ $this->assertSession()->responseContains((string) new FormattableMarkup('The image was resized to fit within the maximum allowed dimensions of %dimensions pixels.', ['%dimensions' => $max_width . 'x' . $max_height]));
// Case 4: max dimensions greater than uploaded image: image not scaled.
$test_image = $testing_image_list[3];
@@ -136,7 +136,7 @@ public function testEditorUploadImageScale() {
list($uploaded_image_file_width, $uploaded_image_file_height) = $this->uploadImage($test_image->uri);
$this->assertEqual($uploaded_image_file_width, $max_width);
$this->assertEqual($uploaded_image_file_height, $uploaded_image_file_height * ($uploaded_image_file_width / $max_width));
- $this->assertRaw((string) new FormattableMarkup('The image was resized to fit within the maximum allowed width of %width pixels.', ['%width' => $max_width]));
+ $this->assertSession()->responseContains((string) new FormattableMarkup('The image was resized to fit within the maximum allowed width of %width pixels.', ['%width' => $max_width]));
// Case 6: only max height dimension was provided and it was smaller than
// uploaded image: image scaled down.
@@ -149,7 +149,7 @@ public function testEditorUploadImageScale() {
list($uploaded_image_file_width, $uploaded_image_file_height) = $this->uploadImage($test_image->uri);
$this->assertEqual($uploaded_image_file_width, $uploaded_image_file_width * ($uploaded_image_file_height / $max_height));
$this->assertEqual($uploaded_image_file_height, $max_height);
- $this->assertRaw((string) new FormattableMarkup('The image was resized to fit within the maximum allowed height of %height pixels.', ['%height' => $max_height]));
+ $this->assertSession()->responseContains((string) new FormattableMarkup('The image was resized to fit within the maximum allowed height of %height pixels.', ['%height' => $max_height]));
}
/**
diff --git a/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php b/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php
index 076d4ac8d5..0ff75a5eeb 100644
--- a/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php
+++ b/core/modules/editor/tests/src/Functional/QuickEditIntegrationLoadingTest.php
@@ -87,7 +87,7 @@ public function testUsersWithoutPermission() {
$this->drupalGet('node/1');
// Ensure the text is transformed.
- $this->assertRaw('Do you also love Drupal?
Druplicon Do you also love Drupal?
Druplicon Do you also love Drupal?
Druplicon Do you also love Drupal?
Druplicon ' . $on . '
');
+ $this->assertSession()->responseContains('' . $on . '
');
// Test with "On" label option.
$display_repository->getFormDisplay('entity_test', 'entity_test')
@@ -136,7 +136,7 @@ public function testBooleanField() {
$this->drupalGet('entity_test/add');
$this->assertFieldByName("{$field_name}[value]", '', 'Widget found.');
- $this->assertRaw($on);
+ $this->assertSession()->responseContains($on);
$this->assertNoText($this->field->label());
// Test if we can change the on label.
@@ -147,7 +147,7 @@ public function testBooleanField() {
$this->drupalPostForm('entity_test/structure/entity_test/fields/entity_test.entity_test.' . $field_name, $edit, t('Save settings'));
// Check if we see the updated labels in the creation form.
$this->drupalGet('entity_test/add');
- $this->assertRaw($on);
+ $this->assertSession()->responseContains($on);
// Go to the form display page and check if the default settings works as
// expected.
diff --git a/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php b/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
index 11b6342633..c60c7116cb 100644
--- a/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
+++ b/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
@@ -90,7 +90,7 @@ public function testEmailField() {
// Display creation form.
$this->drupalGet('entity_test/add');
$this->assertFieldByName("{$field_name}[0][value]", '', 'Widget found.');
- $this->assertRaw('placeholder="example@example.com"');
+ $this->assertSession()->responseContains('placeholder="example@example.com"');
// Submit a valid email address and ensure it is accepted.
$value = 'test@example.com';
@@ -101,7 +101,7 @@ public function testEmailField() {
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
- $this->assertRaw($value);
+ $this->assertSession()->responseContains($value);
// Verify that a mailto link is displayed.
$entity = EntityTest::load($id);
diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
index 124fe9d7b6..89c85663d7 100644
--- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
+++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
@@ -151,8 +151,8 @@ public function testFieldAdminHandler() {
$result = $this->xpath('//input[@name="field_test_entity_ref_field[0][target_id]" and contains(@data-autocomplete-path, "/entity_reference_autocomplete/node/views/")]');
$target_url = $this->getAbsoluteUrl($result[0]->getAttribute('data-autocomplete-path'));
$this->drupalGet($target_url, ['query' => ['q' => 'Foo']]);
- $this->assertRaw($node1->getTitle() . ' (' . $node1->id() . ')');
- $this->assertRaw($node2->getTitle() . ' (' . $node2->id() . ')');
+ $this->assertSession()->responseContains($node1->getTitle() . ' (' . $node1->id() . ')');
+ $this->assertSession()->responseContains($node2->getTitle() . ' (' . $node2->id() . ')');
// Try to add a new node, fill the entity reference field and submit the
// form.
diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
index cc200dfd98..429a9ffb2c 100644
--- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
+++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
@@ -84,7 +84,7 @@ public function testEntityReferenceDefaultValue() {
// Check that default value is selected in default value form.
$this->drupalGet('admin/structure/types/manage/reference_content/fields/node.reference_content.' . $field_name);
- $this->assertRaw('name="default_value_input[' . $field_name . '][0][target_id]" value="' . $referenced_node->getTitle() . ' (' . $referenced_node->id() . ')', 'The default value is selected in instance settings page');
+ $this->assertSession()->responseContains('name="default_value_input[' . $field_name . '][0][target_id]" value="' . $referenced_node->getTitle() . ' (' . $referenced_node->id() . ')', 'The default value is selected in instance settings page');
// Check if the ID has been converted to UUID in config entity.
$config_entity = $this->config('field.field.node.reference_content.' . $field_name)->get();
diff --git a/core/modules/field/tests/src/Functional/FormTest.php b/core/modules/field/tests/src/Functional/FormTest.php
index dba8c35a69..14ab949640 100644
--- a/core/modules/field/tests/src/Functional/FormTest.php
+++ b/core/modules/field/tests/src/Functional/FormTest.php
@@ -134,7 +134,7 @@ public function testFieldFormSingle() {
"{$field_name}[0][value]" => -1,
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('%name does not accept the value -1.', ['%name' => $this->field['label']]), 'Field validation fails with invalid input.');
+ $this->assertSession()->responseContains(t('%name does not accept the value -1.', ['%name' => $this->field['label']]), 'Field validation fails with invalid input.');
// TODO : check that the correct field is flagged for error.
// Create an entity
@@ -225,7 +225,7 @@ public function testFieldFormSingleRequired() {
// Submit with missing required value.
$edit = [];
$this->drupalPostForm('entity_test/add', $edit, t('Save'));
- $this->assertRaw(t('@name field is required.', ['@name' => $this->field['label']]), 'Required field with no value fails validation');
+ $this->assertSession()->responseContains(t('@name field is required.', ['@name' => $this->field['label']]), 'Required field with no value fails validation');
// Create an entity
$value = mt_rand(1, 127);
@@ -245,7 +245,7 @@ public function testFieldFormSingleRequired() {
"{$field_name}[0][value]" => $value,
];
$this->drupalPostForm('entity_test/manage/' . $id . '/edit', $edit, t('Save'));
- $this->assertRaw(t('@name field is required.', ['@name' => $this->field['label']]), 'Required field with no value fails validation');
+ $this->assertSession()->responseContains(t('@name field is required.', ['@name' => $this->field['label']]), 'Required field with no value fails validation');
}
public function testFieldFormUnlimited() {
@@ -452,7 +452,7 @@ public function testFieldFormMultipleWidget() {
// Submit the form with more values than the field accepts.
$edit = [$field_name => '1, 2, 3, 4, 5'];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw('this field cannot hold more than 4 values', 'Form validation failed.');
+ $this->assertSession()->responseContains('this field cannot hold more than 4 values', 'Form validation failed.');
// Check that the field values were not submitted.
$this->assertFieldValues($entity_init, $field_name, [1, 2, 3]);
diff --git a/core/modules/field/tests/src/Functional/NestedFormTest.php b/core/modules/field/tests/src/Functional/NestedFormTest.php
index 8cf509ece9..c6379b7203 100644
--- a/core/modules/field/tests/src/Functional/NestedFormTest.php
+++ b/core/modules/field/tests/src/Functional/NestedFormTest.php
@@ -125,14 +125,14 @@ public function testNestedFieldForm() {
'field_unlimited[1][value]' => -1,
];
$this->drupalPostForm('test-entity/nested/1/2', $edit, t('Save'));
- $this->assertRaw(t('%label does not accept the value -1', ['%label' => 'Unlimited field']), 'Entity 1: the field validation error was reported.');
+ $this->assertSession()->responseContains(t('%label does not accept the value -1', ['%label' => 'Unlimited field']), 'Entity 1: the field validation error was reported.');
$error_field = $this->xpath('//input[@id=:id and contains(@class, "error")]', [':id' => 'edit-field-unlimited-1-value']);
$this->assertCount(1, $error_field, 'Entity 1: the error was flagged on the correct element.');
$edit = [
'entity_2[field_unlimited][1][value]' => -1,
];
$this->drupalPostForm('test-entity/nested/1/2', $edit, t('Save'));
- $this->assertRaw(t('%label does not accept the value -1', ['%label' => 'Unlimited field']), 'Entity 2: the field validation error was reported.');
+ $this->assertSession()->responseContains(t('%label does not accept the value -1', ['%label' => 'Unlimited field']), 'Entity 2: the field validation error was reported.');
$error_field = $this->xpath('//input[@id=:id and contains(@class, "error")]', [':id' => 'edit-entity-2-field-unlimited-1-value']);
$this->assertCount(1, $error_field, 'Entity 2: the error was flagged on the correct element.');
diff --git a/core/modules/field/tests/src/Functional/Number/NumberFieldTest.php b/core/modules/field/tests/src/Functional/Number/NumberFieldTest.php
index e4e9358c71..e4fb808216 100644
--- a/core/modules/field/tests/src/Functional/Number/NumberFieldTest.php
+++ b/core/modules/field/tests/src/Functional/Number/NumberFieldTest.php
@@ -76,7 +76,7 @@ public function testNumberDecimalField() {
// Display creation form.
$this->drupalGet('entity_test/add');
$this->assertFieldByName("{$field_name}[0][value]", '', 'Widget is displayed');
- $this->assertRaw('placeholder="0.00"');
+ $this->assertSession()->responseContains('placeholder="0.00"');
// Submit a signed decimal value within the allowed precision and scale.
$value = '-1234.5678';
@@ -87,7 +87,7 @@ public function testNumberDecimalField() {
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
- $this->assertRaw($value, 'Value is displayed.');
+ $this->assertSession()->responseContains($value, 'Value is displayed.');
// Try to create entries with more than one decimal separator; assert fail.
$wrong_entries = [
@@ -104,7 +104,7 @@ public function testNumberDecimalField() {
"{$field_name}[0][value]" => $wrong_entry,
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save decimal value with more than one decimal point.');
+ $this->assertSession()->responseContains(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save decimal value with more than one decimal point.');
}
// Try to create entries with minus sign not in the first position.
@@ -122,7 +122,7 @@ public function testNumberDecimalField() {
"{$field_name}[0][value]" => $wrong_entry,
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save decimal value with minus sign in the wrong position.');
+ $this->assertSession()->responseContains(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save decimal value with minus sign in the wrong position.');
}
}
@@ -191,7 +191,7 @@ public function testNumberIntegerField() {
// Display creation form.
$this->drupalGet('entity_test/add');
$this->assertFieldByName("{$field_name}[0][value]", '', 'Widget is displayed');
- $this->assertRaw('placeholder="4"');
+ $this->assertSession()->responseContains('placeholder="4"');
// Submit a valid integer
$value = rand($minimum, $maximum);
@@ -209,7 +209,7 @@ public function testNumberIntegerField() {
"{$field_name}[0][value]" => $minimum - 1,
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('%name must be higher than or equal to %minimum.', ['%name' => $field_name, '%minimum' => $minimum]), 'Correctly failed to save integer value less than minimum allowed value.');
+ $this->assertSession()->responseContains(t('%name must be higher than or equal to %minimum.', ['%name' => $field_name, '%minimum' => $minimum]), 'Correctly failed to save integer value less than minimum allowed value.');
// Try to set a decimal value
$this->drupalGet('entity_test/add');
@@ -217,7 +217,7 @@ public function testNumberIntegerField() {
"{$field_name}[0][value]" => 1.5,
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('%name is not a valid number.', ['%name' => $field_name]), 'Correctly failed to save decimal value to integer field.');
+ $this->assertSession()->responseContains(t('%name is not a valid number.', ['%name' => $field_name]), 'Correctly failed to save decimal value to integer field.');
// Try to set a value above the maximum value
$this->drupalGet('entity_test/add');
@@ -225,7 +225,7 @@ public function testNumberIntegerField() {
"{$field_name}[0][value]" => $maximum + 1,
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('%name must be lower than or equal to %maximum.', ['%name' => $field_name, '%maximum' => $maximum]), 'Correctly failed to save integer value greater than maximum allowed value.');
+ $this->assertSession()->responseContains(t('%name must be lower than or equal to %maximum.', ['%name' => $field_name, '%maximum' => $maximum]), 'Correctly failed to save integer value greater than maximum allowed value.');
// Try to set a wrong integer value.
$this->drupalGet('entity_test/add');
@@ -233,7 +233,7 @@ public function testNumberIntegerField() {
"{$field_name}[0][value]" => '20-40',
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save wrong integer value.');
+ $this->assertSession()->responseContains(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save wrong integer value.');
// Test with valid entries.
$valid_entries = [
@@ -251,7 +251,7 @@ public function testNumberIntegerField() {
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]), 'Entity was created');
- $this->assertRaw($valid_entry, 'Value is displayed.');
+ $this->assertSession()->responseContains($valid_entry, 'Value is displayed.');
$this->assertNoFieldByXpath('//div[@content="' . $valid_entry . '"]', NULL, 'The "content" attribute is not present since the Prefix is not being displayed');
}
@@ -316,7 +316,7 @@ public function testNumberFloatField() {
// Display creation form.
$this->drupalGet('entity_test/add');
$this->assertFieldByName("{$field_name}[0][value]", '', 'Widget is displayed');
- $this->assertRaw('placeholder="0.00"');
+ $this->assertSession()->responseContains('placeholder="0.00"');
// Submit a signed decimal value within the allowed precision and scale.
$value = '-1234.5678';
@@ -331,7 +331,7 @@ public function testNumberFloatField() {
// Ensure that the 'number_decimal' formatter displays the number with the
// expected rounding.
$this->drupalGet('entity_test/' . $id);
- $this->assertRaw(round($value, 2));
+ $this->assertSession()->responseContains(round($value, 2));
// Try to create entries with more than one decimal separator; assert fail.
$wrong_entries = [
@@ -348,7 +348,7 @@ public function testNumberFloatField() {
"{$field_name}[0][value]" => $wrong_entry,
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save float value with more than one decimal point.');
+ $this->assertSession()->responseContains(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save float value with more than one decimal point.');
}
// Try to create entries with minus sign not in the first position.
@@ -366,7 +366,7 @@ public function testNumberFloatField() {
"{$field_name}[0][value]" => $wrong_entry,
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save float value with minus sign in the wrong position.');
+ $this->assertSession()->responseContains(t('%name must be a number.', ['%name' => $field_name]), 'Correctly failed to save float value with minus sign in the wrong position.');
}
}
@@ -434,7 +434,7 @@ public function assertSetMinimumValue($field, $minimum_value) {
// Check if an error message is shown.
$this->assertNoRaw(t('%name is not a valid number.', ['%name' => t('Minimum')]), 'Saved ' . gettype($minimum_value) . ' value as minimal value on a ' . $field->getType() . ' field');
// Check if a success message is shown.
- $this->assertRaw(t('Saved %label configuration.', ['%label' => $field->getLabel()]));
+ $this->assertSession()->responseContains(t('Saved %label configuration.', ['%label' => $field->getLabel()]));
// Check if the minimum value was actually set.
$this->drupalGet($field_configuration_url);
$this->assertFieldById('edit-settings-min', $minimum_value, 'Minimal ' . gettype($minimum_value) . ' value was set on a ' . $field->getType() . ' field.');
diff --git a/core/modules/field/tests/src/Functional/String/StringFieldTest.php b/core/modules/field/tests/src/Functional/String/StringFieldTest.php
index 15c0f43644..83fb65ad15 100644
--- a/core/modules/field/tests/src/Functional/String/StringFieldTest.php
+++ b/core/modules/field/tests/src/Functional/String/StringFieldTest.php
@@ -88,7 +88,7 @@ public function _testTextfieldWidgets($field_type, $widget_type) {
$this->drupalGet('entity_test/add');
$this->assertFieldByName("{$field_name}[0][value]", '', 'Widget is displayed');
$this->assertNoFieldByName("{$field_name}[0][format]", '1', 'Format selector is not displayed');
- $this->assertRaw(new FormattableMarkup('placeholder="A placeholder on @widget_type"', ['@widget_type' => $widget_type]));
+ $this->assertSession()->responseContains(new FormattableMarkup('placeholder="A placeholder on @widget_type"', ['@widget_type' => $widget_type]));
// Submit with some value.
$value = $this->randomMachineName();
diff --git a/core/modules/field/tests/src/FunctionalJavascript/Number/NumberFieldTest.php b/core/modules/field/tests/src/FunctionalJavascript/Number/NumberFieldTest.php
index 00ada09373..afae96d130 100644
--- a/core/modules/field/tests/src/FunctionalJavascript/Number/NumberFieldTest.php
+++ b/core/modules/field/tests/src/FunctionalJavascript/Number/NumberFieldTest.php
@@ -151,8 +151,8 @@ public function testNumberFormatter() {
// Check number_decimal and number_unformatted formatters behavior.
$this->drupalGet('node/' . $node->id());
$float_formatted = number_format($random_float, $scale, $decimal_separator, $thousand_separator);
- $this->assertRaw("$prefix$float_formatted$suffix", 'Prefix and suffix added');
- $this->assertRaw((string) $random_integer);
+ $this->assertSession()->responseContains("$prefix$float_formatted$suffix", 'Prefix and suffix added');
+ $this->assertSession()->responseContains((string) $random_integer);
// Configure the number_decimal formatter.
\Drupal::service('entity_display.repository')->getViewDisplay('node', $type)
@@ -182,7 +182,7 @@ public function testNumberFormatter() {
$this->drupalGet('node/' . $node->id());
$integer_formatted = number_format($random_integer, 0, '', $thousand_separator);
- $this->assertRaw($integer_formatted, 'Random integer formatted');
+ $this->assertSession()->responseContains($integer_formatted, 'Random integer formatted');
}
}
diff --git a/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php b/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
index 9b37084ed4..52e9169c47 100644
--- a/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
+++ b/core/modules/field_ui/tests/src/Functional/EntityDisplayModeTest.php
@@ -69,7 +69,7 @@ public function testEntityViewModeUI() {
'label' => $this->randomString(),
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw('The machine-readable name must contain only lowercase letters, numbers, and underscores.');
+ $this->assertSession()->responseContains('The machine-readable name must contain only lowercase letters, numbers, and underscores.');
// Test adding a view mode.
$edit = [
@@ -77,7 +77,7 @@ public function testEntityViewModeUI() {
'label' => $this->randomString(),
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('Saved the %label view mode.', ['%label' => $edit['label']]));
+ $this->assertSession()->responseContains(t('Saved the %label view mode.', ['%label' => $edit['label']]));
// Test editing the view mode.
$this->drupalGet('admin/structure/display-modes/view/manage/entity_test.' . $edit['id']);
@@ -92,9 +92,9 @@ public function testEntityViewModeUI() {
// Test deleting the view mode.
$this->clickLink(t('Delete'));
- $this->assertRaw(t('Are you sure you want to delete the view mode %label?', ['%label' => $edit['label']]));
+ $this->assertSession()->responseContains(t('Are you sure you want to delete the view mode %label?', ['%label' => $edit['label']]));
$this->drupalPostForm(NULL, NULL, t('Delete'));
- $this->assertRaw(t('The view mode %label has been deleted.', ['%label' => $edit['label']]));
+ $this->assertSession()->responseContains(t('The view mode %label has been deleted.', ['%label' => $edit['label']]));
}
/**
@@ -123,7 +123,7 @@ public function testEntityFormModeUI() {
'label' => $this->randomString(),
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw('The machine-readable name must contain only lowercase letters, numbers, and underscores.');
+ $this->assertSession()->responseContains('The machine-readable name must contain only lowercase letters, numbers, and underscores.');
// Test adding a form mode.
$edit = [
@@ -131,7 +131,7 @@ public function testEntityFormModeUI() {
'label' => $this->randomString(),
];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('Saved the %label form mode.', ['%label' => $edit['label']]));
+ $this->assertSession()->responseContains(t('Saved the %label form mode.', ['%label' => $edit['label']]));
// Test editing the form mode.
$this->drupalGet('admin/structure/display-modes/form/manage/entity_test.' . $edit['id']);
@@ -146,9 +146,9 @@ public function testEntityFormModeUI() {
// Test deleting the form mode.
$this->clickLink(t('Delete'));
- $this->assertRaw(t('Are you sure you want to delete the form mode %label?', ['%label' => $edit['label']]));
+ $this->assertSession()->responseContains(t('Are you sure you want to delete the form mode %label?', ['%label' => $edit['label']]));
$this->drupalPostForm(NULL, NULL, t('Delete'));
- $this->assertRaw(t('The form mode %label has been deleted.', ['%label' => $edit['label']]));
+ $this->assertSession()->responseContains(t('The form mode %label has been deleted.', ['%label' => $edit['label']]));
}
/**
diff --git a/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php b/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
index a3cb5e6164..222434f90e 100644
--- a/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
+++ b/core/modules/field_ui/tests/src/Functional/FieldUIIndentationTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void {
public function testIndentation() {
$this->drupalGet('admin/structure/types/manage/page/display');
- $this->assertRaw('js-indentation indentation');
+ $this->assertSession()->responseContains('js-indentation indentation');
}
}
diff --git a/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
index de9a910f8c..458b0c67f7 100644
--- a/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
+++ b/core/modules/field_ui/tests/src/Functional/ManageDisplayTest.php
@@ -192,7 +192,7 @@ public function testNoFieldsDisplayOverview() {
])->save();
$this->drupalGet('admin/structure/types/manage/no_fields/display');
- $this->assertRaw(t('There are no fields yet added. You can add new fields on the Manage fields page.', [':link' => Url::fromRoute('entity.node.field_ui_fields', ['node_type' => 'no_fields'])->toString()]));
+ $this->assertSession()->responseContains(t('There are no fields yet added. You can add new fields on the Manage fields page.', [':link' => Url::fromRoute('entity.node.field_ui_fields', ['node_type' => 'no_fields'])->toString()]));
}
/**
diff --git a/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php b/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php
index 730599008b..cb77b1450f 100644
--- a/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php
+++ b/core/modules/field_ui/tests/src/Functional/ManageFieldsFunctionalTest.php
@@ -154,7 +154,7 @@ public function manageFieldsPage($type = '') {
];
foreach ($table_headers as $table_header) {
// We check that the label appear in the table headings.
- $this->assertRaw($table_header . '', new FormattableMarkup('%table_header table header was found.', ['%table_header' => $table_header]));
+ $this->assertSession()->responseContains($table_header . '', new FormattableMarkup('%table_header table header was found.', ['%table_header' => $table_header]));
}
// Test the "Add field" action link.
@@ -236,7 +236,7 @@ public function updateField() {
public function addExistingField() {
// Check "Re-use existing field" appears.
$this->drupalGet('admin/structure/types/manage/page/fields/add-field');
- $this->assertRaw(t('Re-use an existing field'), '"Re-use existing field" was found.');
+ $this->assertSession()->responseContains(t('Re-use an existing field'), '"Re-use existing field" was found.');
// Check that fields of other entity types (here, the 'comment_body' field)
// do not show up in the "Re-use existing field" list.
@@ -294,7 +294,7 @@ public function cardinalitySettings() {
'cardinality_number' => 1,
];
$this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
- $this->assertRaw(t('There is @count entity with @delta or more values in this field.', ['@count' => 1, '@delta' => 2]), 'Correctly failed to set cardinality lower than highest delta.');
+ $this->assertSession()->responseContains(t('There is @count entity with @delta or more values in this field.', ['@count' => 1, '@delta' => 2]), 'Correctly failed to set cardinality lower than highest delta.');
// Create a second entity with three values.
$edit = ['title[0][value]' => 'Cardinality 3', 'body[0][value]' => 'Body 1', 'body[1][value]' => 'Body 2', 'body[2][value]' => 'Body 3'];
@@ -317,14 +317,14 @@ public function cardinalitySettings() {
'cardinality_number' => 1,
];
$this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
- $this->assertRaw(t('There are @count entities with @delta or more values in this field.', ['@count' => 2, '@delta' => 2]), 'Correctly failed to set cardinality lower than highest delta.');
+ $this->assertSession()->responseContains(t('There are @count entities with @delta or more values in this field.', ['@count' => 2, '@delta' => 2]), 'Correctly failed to set cardinality lower than highest delta.');
$edit = [
'cardinality' => 'number',
'cardinality_number' => 2,
];
$this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
- $this->assertRaw(t('There is @count entity with @delta or more values in this field.', ['@count' => 1, '@delta' => 3]), 'Correctly failed to set cardinality lower than highest delta.');
+ $this->assertSession()->responseContains(t('There is @count entity with @delta or more values in this field.', ['@count' => 1, '@delta' => 3]), 'Correctly failed to set cardinality lower than highest delta.');
$edit = [
'cardinality' => 'number',
@@ -360,7 +360,7 @@ protected function addPersistentFieldStorage() {
}
// Check "Re-use existing field" appears.
$this->drupalGet('admin/structure/types/manage/page/fields/add-field');
- $this->assertRaw(t('Re-use an existing field'), '"Re-use existing field" was found.');
+ $this->assertSession()->responseContains(t('Re-use an existing field'), '"Re-use existing field" was found.');
// Ensure that we test with a label that contains HTML.
$label = $this->randomString(4) . 'Body failed: The internal path component 'http://example.com' is external. You are not allowed to specify an external URL together with internal:/. .');
+ $this->assertSession()->responseContains('Attempt to update field Body failed: The internal path component 'http://example.com' is external. You are not allowed to specify an external URL together with internal:/. .');
}
/**
@@ -731,8 +731,8 @@ public function testHelpDescriptions() {
$this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.field_tags', $edit, t('Save settings'));
$this->drupalGet('node/add/article');
- $this->assertRaw('Test with an upload field. ');
- $this->assertRaw('Test with a non upload field. ');
+ $this->assertSession()->responseContains('Test with an upload field. ');
+ $this->assertSession()->responseContains('Test with a non upload field. ');
}
/**
diff --git a/core/modules/field_ui/tests/src/Traits/FieldUiTestTrait.php b/core/modules/field_ui/tests/src/Traits/FieldUiTestTrait.php
index de125d1854..bce5775e52 100644
--- a/core/modules/field_ui/tests/src/Traits/FieldUiTestTrait.php
+++ b/core/modules/field_ui/tests/src/Traits/FieldUiTestTrait.php
@@ -45,17 +45,17 @@ public function fieldUIAddNewField($bundle_path, $field_name, $label = NULL, $fi
// First step: 'Add field' page.
$this->drupalPostForm($bundle_path, $initial_edit, t('Save and continue'));
- $this->assertRaw(t('These settings apply to the %label field everywhere it is used.', ['%label' => $label]), 'Storage settings page was displayed.');
+ $this->assertSession()->responseContains(t('These settings apply to the %label field everywhere it is used.', ['%label' => $label]), 'Storage settings page was displayed.');
// Test Breadcrumbs.
$this->assertLink($label, 0, 'Field label is correct in the breadcrumb of the storage settings page.');
// Second step: 'Storage settings' form.
$this->drupalPostForm(NULL, $storage_edit, t('Save field settings'));
- $this->assertRaw(t('Updated field %label field settings.', ['%label' => $label]), 'Redirected to field settings page.');
+ $this->assertSession()->responseContains(t('Updated field %label field settings.', ['%label' => $label]), 'Redirected to field settings page.');
// Third step: 'Field settings' form.
$this->drupalPostForm(NULL, $field_edit, t('Save settings'));
- $this->assertRaw(t('Saved %label configuration.', ['%label' => $label]), 'Redirected to "Manage fields" page.');
+ $this->assertSession()->responseContains(t('Saved %label configuration.', ['%label' => $label]), 'Redirected to "Manage fields" page.');
// Check that the field appears in the overview form.
$this->assertFieldByXPath('//table[@id="field-overview"]//tr/td[1]', $label, 'Field was created and appears in the overview page.');
@@ -86,12 +86,12 @@ public function fieldUIAddExistingField($bundle_path, $existing_storage_name, $l
$this->drupalPostForm("$bundle_path/fields/add-field", $initial_edit, t('Save and continue'));
// Set the main content to only the content region because the label can
// contain HTML which will be auto-escaped by Twig.
- $this->assertRaw('field-config-edit-form', 'The field config edit form is present.');
+ $this->assertSession()->responseContains('field-config-edit-form', 'The field config edit form is present.');
$this->assertNoRaw('<', 'The page does not have double escaped HTML tags.');
// Second step: 'Field settings' form.
$this->drupalPostForm(NULL, $field_edit, t('Save settings'));
- $this->assertRaw(t('Saved %label configuration.', ['%label' => $label]), 'Redirected to "Manage fields" page.');
+ $this->assertSession()->responseContains(t('Saved %label configuration.', ['%label' => $label]), 'Redirected to "Manage fields" page.');
// Check that the field appears in the overview form.
$this->assertFieldByXPath('//table[@id="field-overview"]//tr/td[1]', $label, 'Field was created and appears in the overview page.');
@@ -112,14 +112,14 @@ public function fieldUIAddExistingField($bundle_path, $existing_storage_name, $l
public function fieldUIDeleteField($bundle_path, $field_name, $label, $bundle_label) {
// Display confirmation form.
$this->drupalGet("$bundle_path/fields/$field_name/delete");
- $this->assertRaw(t('Are you sure you want to delete the field %label', ['%label' => $label]), 'Delete confirmation was found.');
+ $this->assertSession()->responseContains(t('Are you sure you want to delete the field %label', ['%label' => $label]), 'Delete confirmation was found.');
// Test Breadcrumbs.
$this->assertLink($label, 0, 'Field label is correct in the breadcrumb of the field delete page.');
// Submit confirmation form.
$this->drupalPostForm(NULL, [], t('Delete'));
- $this->assertRaw(t('The field %label has been deleted from the %type content type.', ['%label' => $label, '%type' => $bundle_label]), 'Delete message was found.');
+ $this->assertSession()->responseContains(t('The field %label has been deleted from the %type content type.', ['%label' => $label, '%type' => $bundle_label]), 'Delete message was found.');
// Check that the field does not appear in the overview form.
$this->assertNoFieldByXPath('//table[@id="field-overview"]//span[@class="label-field"]', $label, 'Field does not appear in the overview page.');
diff --git a/core/modules/file/tests/src/Functional/DownloadTest.php b/core/modules/file/tests/src/Functional/DownloadTest.php
index 35d2589323..cd8f18bb76 100644
--- a/core/modules/file/tests/src/Functional/DownloadTest.php
+++ b/core/modules/file/tests/src/Functional/DownloadTest.php
@@ -175,7 +175,7 @@ private function checkUrl($scheme, $directory, $filename, $expected_url) {
$this->drupalGet($url);
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(file_get_contents($file->getFileUri()));
+ $this->assertSession()->responseContains(file_get_contents($file->getFileUri()));
$file->delete();
}
diff --git a/core/modules/file/tests/src/Functional/FileFieldDisplayTest.php b/core/modules/file/tests/src/Functional/FileFieldDisplayTest.php
index 922985cb4e..14133e5da5 100644
--- a/core/modules/file/tests/src/Functional/FileFieldDisplayTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldDisplayTest.php
@@ -79,7 +79,7 @@ public function testNodeDisplay() {
'#file' => $node_file,
];
$default_output = \Drupal::service('renderer')->renderRoot($file_link);
- $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
+ $this->assertSession()->responseContains($default_output, 'Default formatter displaying correctly on full node view.');
// Turn the "display" option off and check that the file is no longer displayed.
$edit = [$field_name . '[0][display]' => FALSE];
@@ -97,7 +97,7 @@ public function testNodeDisplay() {
$this->assertText($description);
// Ensure the filename in the link's title attribute is escaped.
- $this->assertRaw('title="escaped-&-text.txt"');
+ $this->assertSession()->responseContains('title="escaped-&-text.txt"');
// Test that fields appear as expected after during the preview.
// Add a second file.
@@ -110,8 +110,8 @@ public function testNodeDisplay() {
$edit[$field_name . '[1][display]'] = FALSE;
$this->drupalPostForm(NULL, $edit, t('Preview'));
$this->clickLink(t('Back to content editing'));
- $this->assertRaw($field_name . '[0][display]', 'First file appears as expected.');
- $this->assertRaw($field_name . '[1][display]', 'Second file appears as expected.');
+ $this->assertSession()->responseContains($field_name . '[0][display]', 'First file appears as expected.');
+ $this->assertSession()->responseContains($field_name . '[1][display]', 'Second file appears as expected.');
$this->assertSession()->responseContains($field_name . '[1][description]', 'Description of second file appears as expected.');
// Check that the file fields don't contain duplicate HTML IDs.
diff --git a/core/modules/file/tests/src/Functional/FileFieldValidateTest.php b/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
index 51698a6257..373ae3d713 100644
--- a/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
@@ -36,7 +36,7 @@ public function testRequired() {
$edit = [];
$edit['title[0][value]'] = $this->randomMachineName();
$this->drupalPostForm('node/add/' . $type_name, $edit, t('Save'));
- $this->assertRaw(t('@title field is required.', ['@title' => $field->getLabel()]), 'Node save failed when required file field was empty.');
+ $this->assertSession()->responseContains(t('@title field is required.', ['@title' => $field->getLabel()]), 'Node save failed when required file field was empty.');
// Create a new node with the uploaded file.
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
@@ -57,7 +57,7 @@ public function testRequired() {
$edit = [];
$edit['title[0][value]'] = $this->randomMachineName();
$this->drupalPostForm('node/add/' . $type_name, $edit, t('Save'));
- $this->assertRaw(t('@title field is required.', ['@title' => $field->getLabel()]), 'Node save failed when required multiple value file field was empty.');
+ $this->assertSession()->responseContains(t('@title field is required.', ['@title' => $field->getLabel()]), 'Node save failed when required multiple value file field was empty.');
// Create a new node with the uploaded file into the multivalue field.
$nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
@@ -104,7 +104,7 @@ public function testFileMaxSize() {
// Check that uploading the large file fails (1M limit).
$this->uploadNodeFile($large_file, $field_name, $type_name);
$error_message = t('The file is %filesize exceeding the maximum file size of %maxsize.', ['%filesize' => format_size($large_file->getSize()), '%maxsize' => format_size($file_limit)]);
- $this->assertRaw($error_message, new FormattableMarkup('Node save failed when file (%filesize) exceeded the max upload size (%maxsize).', ['%filesize' => format_size($large_file->getSize()), '%maxsize' => $max_filesize]));
+ $this->assertSession()->responseContains($error_message, new FormattableMarkup('Node save failed when file (%filesize) exceeded the max upload size (%maxsize).', ['%filesize' => format_size($large_file->getSize()), '%maxsize' => $max_filesize]));
}
// Turn off the max filesize.
@@ -148,7 +148,7 @@ public function testFileExtension() {
// Check that the file with the wrong extension cannot be uploaded.
$this->uploadNodeFile($test_file, $field_name, $type_name);
$error_message = t('Only files with the following extensions are allowed: %files-allowed.', ['%files-allowed' => 'txt']);
- $this->assertRaw($error_message, 'Node save failed when file uploaded with the wrong extension.');
+ $this->assertSession()->responseContains($error_message, 'Node save failed when file uploaded with the wrong extension.');
// Enable extension checking for text and image files.
$this->updateFileField($field_name, $type_name, ['file_extensions' => "txt $test_file_extension"]);
diff --git a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
index e558a4b601..41f5a81e12 100644
--- a/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
+++ b/core/modules/file/tests/src/Functional/FileFieldWidgetTest.php
@@ -376,7 +376,7 @@ public function testWidgetValidation() {
$this->drupalPostForm(NULL, $edit, t('Upload'));
$error_message = t('Only files with the following extensions are allowed: %files-allowed.', ['%files-allowed' => 'txt']);
- $this->assertRaw($error_message, t('Validation error when file with wrong extension uploaded (JSMode=%type).', ['%type' => $type]));
+ $this->assertSession()->responseContains($error_message, t('Validation error when file with wrong extension uploaded (JSMode=%type).', ['%type' => $type]));
// Upload file with correct extension, check that error message is removed.
$edit[$name] = \Drupal::service('file_system')->realpath($test_file_text->getFileUri());
diff --git a/core/modules/file/tests/src/Functional/FileListingTest.php b/core/modules/file/tests/src/Functional/FileListingTest.php
index 390348e0c2..7e012a3565 100644
--- a/core/modules/file/tests/src/Functional/FileListingTest.php
+++ b/core/modules/file/tests/src/Functional/FileListingTest.php
@@ -128,11 +128,11 @@ public function testFileListingPages() {
$this->drupalGet('admin/content/files');
$file = File::load($orphaned_file);
$usage = $this->sumUsages($file_usage->listUsage($file));
- $this->assertRaw('admin/content/files/usage/' . $file->id() . '">' . $usage);
+ $this->assertSession()->responseContains('admin/content/files/usage/' . $file->id() . '">' . $usage);
$file = File::load($used_file);
$usage = $this->sumUsages($file_usage->listUsage($file));
- $this->assertRaw('admin/content/files/usage/' . $file->id() . '">' . $usage);
+ $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.');
diff --git a/core/modules/file/tests/src/Functional/FileManagedFileElementTest.php b/core/modules/file/tests/src/Functional/FileManagedFileElementTest.php
index 348cee7d3a..5b82283121 100644
--- a/core/modules/file/tests/src/Functional/FileManagedFileElementTest.php
+++ b/core/modules/file/tests/src/Functional/FileManagedFileElementTest.php
@@ -38,7 +38,7 @@ public function testManagedFile() {
// Submit without a file.
$this->drupalPostForm($path, [], t('Save'));
- $this->assertRaw(t('The file ids are %fids.', ['%fids' => implode(',', [])]), 'Submitted without a file.');
+ $this->assertSession()->responseContains(t('The file ids are %fids.', ['%fids' => implode(',', [])]), 'Submitted without a file.');
// Submit with a file, but with an invalid form token. Ensure the file
// was not saved.
@@ -60,11 +60,11 @@ public function testManagedFile() {
$this->drupalPostForm($path, $edit, t('Save'));
$last_fid = $this->getLastFileId();
$this->assertTrue($last_fid > $last_fid_prior, 'New file got saved.');
- $this->assertRaw(t('The file ids are %fids.', ['%fids' => implode(',', [$last_fid])]), 'Submit handler has correct file info.');
+ $this->assertSession()->responseContains(t('The file ids are %fids.', ['%fids' => implode(',', [$last_fid])]), 'Submit handler has correct file info.');
// Submit no new input, but with a default file.
$this->drupalPostForm($path . '/' . $last_fid, [], t('Save'));
- $this->assertRaw(t('The file ids are %fids.', ['%fids' => implode(',', [$last_fid])]), 'Empty submission did not change an existing file.');
+ $this->assertSession()->responseContains(t('The file ids are %fids.', ['%fids' => implode(',', [$last_fid])]), 'Empty submission did not change an existing file.');
// Upload, then Submit.
$last_fid_prior = $this->getLastFileId();
@@ -74,7 +74,7 @@ public function testManagedFile() {
$last_fid = $this->getLastFileId();
$this->assertTrue($last_fid > $last_fid_prior, 'New file got uploaded.');
$this->drupalPostForm(NULL, [], t('Save'));
- $this->assertRaw(t('The file ids are %fids.', ['%fids' => implode(',', [$last_fid])]), 'Submit handler has correct file info.');
+ $this->assertSession()->responseContains(t('The file ids are %fids.', ['%fids' => implode(',', [$last_fid])]), 'Submit handler has correct file info.');
// Remove, then Submit.
$remove_button_title = $multiple ? t('Remove selected') : t('Remove');
@@ -86,7 +86,7 @@ public function testManagedFile() {
$this->drupalGet($path . '/' . $last_fid);
$this->drupalPostForm(NULL, $remove_edit, $remove_button_title);
$this->drupalPostForm(NULL, [], t('Save'));
- $this->assertRaw(t('The file ids are %fids.', ['%fids' => '']), 'Submission after file removal was successful.');
+ $this->assertSession()->responseContains(t('The file ids are %fids.', ['%fids' => '']), 'Submission after file removal was successful.');
// Upload, then Remove, then Submit.
$this->drupalGet($path);
@@ -100,7 +100,7 @@ public function testManagedFile() {
$this->drupalPostForm(NULL, $remove_edit, $remove_button_title);
$this->drupalPostForm(NULL, [], t('Save'));
- $this->assertRaw(t('The file ids are %fids.', ['%fids' => '']), 'Submission after file upload and removal was successful.');
+ $this->assertSession()->responseContains(t('The file ids are %fids.', ['%fids' => '']), 'Submission after file upload and removal was successful.');
}
}
}
@@ -124,7 +124,7 @@ public function testManagedFile() {
// Save the entire form.
$this->drupalPostForm(NULL, [], t('Save'));
- $this->assertRaw(t('The file ids are %fids.', ['%fids' => implode(',', $fid_list)]), 'Two files saved into a single multiple file element.');
+ $this->assertSession()->responseContains(t('The file ids are %fids.', ['%fids' => implode(',', $fid_list)]), 'Two files saved into a single multiple file element.');
// Delete only the first file.
$edit = [
@@ -155,7 +155,7 @@ public function testManagedFileRemoved() {
$this->drupalPostForm(NULL, $edit, t('Upload'));
// We expect the title 'Managed file & butter ' which got escaped
// via a t() call before.
- $this->assertRaw('The file referenced by the Managed file & butter field does not exist.');
+ $this->assertSession()->responseContains('The file referenced by the Managed file & butter field does not exist.');
}
/**
diff --git a/core/modules/file/tests/src/Functional/FileOnTranslatedEntityTest.php b/core/modules/file/tests/src/Functional/FileOnTranslatedEntityTest.php
index b36fe78683..a0c39d0147 100644
--- a/core/modules/file/tests/src/Functional/FileOnTranslatedEntityTest.php
+++ b/core/modules/file/tests/src/Functional/FileOnTranslatedEntityTest.php
@@ -110,7 +110,7 @@ public function testSyncedFiles() {
$this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
// This inspects the HTML after the post of the translation, the file
// should be displayed on the original node.
- $this->assertRaw('file--mime-text-plain');
+ $this->assertSession()->responseContains('file--mime-text-plain');
$second_fid = $this->getLastFileId();
\Drupal::entityTypeManager()->getStorage('file')->resetCache();
@@ -143,7 +143,7 @@ public function testSyncedFiles() {
$this->assertTrue($file->isPermanent(), 'First file still exists and is permanent.');
// This inspects the HTML after the post of the translation, the file
// should be displayed on the original node.
- $this->assertRaw('file--mime-text-plain');
+ $this->assertSession()->responseContains('file--mime-text-plain');
// Ensure the file status of the second file is permanent.
$file = File::load($second_fid);
diff --git a/core/modules/file/tests/src/Functional/FilePrivateTest.php b/core/modules/file/tests/src/Functional/FilePrivateTest.php
index 72393c4d1f..d962f4e8de 100644
--- a/core/modules/file/tests/src/Functional/FilePrivateTest.php
+++ b/core/modules/file/tests/src/Functional/FilePrivateTest.php
@@ -57,7 +57,7 @@ public function testPrivateFile() {
$node_file = File::load($node->{$field_name}->target_id);
// Ensure the file can be viewed.
$this->drupalGet('node/' . $node->id());
- $this->assertRaw($node_file->getFilename(), 'File reference is displayed after attaching it');
+ $this->assertSession()->responseContains($node_file->getFilename(), 'File reference is displayed after attaching it');
// Ensure the file can be downloaded.
$this->drupalGet(file_create_url($node_file->getFileUri()));
$this->assertSession()->statusCodeEquals(200);
@@ -96,7 +96,7 @@ public function testPrivateFile() {
$this->assertUrl('node/' . $new_node->id() . '/edit');
// Check that we got the expected constraint form error.
$constraint = new ReferenceAccessConstraint();
- $this->assertRaw(new FormattableMarkup($constraint->message, ['%type' => 'file', '%id' => $node_file->id()]));
+ $this->assertSession()->responseContains(new FormattableMarkup($constraint->message, ['%type' => 'file', '%id' => $node_file->id()]));
// Attempt to reuse the existing file when creating a new node, and confirm
// that access is still denied.
$edit = [];
@@ -109,7 +109,7 @@ public function testPrivateFile() {
$new_node = $this->drupalGetNodeByTitle($edit['title[0][value]']);
$this->assertTrue(empty($new_node), 'Node was not created.');
$this->assertUrl('node/add/' . $type_name);
- $this->assertRaw(new FormattableMarkup($constraint->message, ['%type' => 'file', '%id' => $node_file->id()]));
+ $this->assertSession()->responseContains(new FormattableMarkup($constraint->message, ['%type' => 'file', '%id' => $node_file->id()]));
// Now make file_test_file_download() return everything.
\Drupal::state()->set('file_test.allow_all', TRUE);
diff --git a/core/modules/file/tests/src/Functional/SaveUploadFormTest.php b/core/modules/file/tests/src/Functional/SaveUploadFormTest.php
index bd7891920b..dd77a2ecdd 100644
--- a/core/modules/file/tests/src/Functional/SaveUploadFormTest.php
+++ b/core/modules/file/tests/src/Functional/SaveUploadFormTest.php
@@ -87,7 +87,7 @@ protected function setUp(): void {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called then clean out the hook
// counters.
@@ -116,7 +116,7 @@ public function testNormal() {
$edit = ['files[file_test_upload][]' => $file_system->realpath($image2->uri)];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'));
+ $this->assertSession()->responseContains(t('You WIN!'));
$max_fid_after = (int) \Drupal::entityQueryAggregate('file')->aggregate('fid', 'max')->execute()[0]['fid_max'];
// Check that the correct hooks were called.
@@ -142,7 +142,7 @@ public function testNormal() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'));
+ $this->assertSession()->responseContains(t('You WIN!'));
$this->assertFileExists('temporary://' . $dir . '/' . trim(\Drupal::service('file_system')->basename($image3_realpath)));
}
@@ -166,8 +166,8 @@ public function testHandleExtension() {
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$message = t('Only files with the following extensions are allowed:') . ' ' . $extensions . ' ';
- $this->assertRaw($message, 'Cannot upload a disallowed extension');
- $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
+ $this->assertSession()->responseContains($message, 'Cannot upload a disallowed extension');
+ $this->assertSession()->responseContains(t('Epic upload FAIL!'), 'Found the failure message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate']);
@@ -186,7 +186,7 @@ public function testHandleExtension() {
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload an allowed extension.');
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'load', 'update']);
@@ -203,7 +203,7 @@ public function testHandleExtension() {
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload any extension.');
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'load', 'update']);
@@ -228,9 +228,9 @@ public function testHandleDangerousFile() {
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$message = t('For security reasons, your upload has been renamed to') . ' ' . $this->phpfile->filename . '.txt' . ' ';
- $this->assertRaw($message, 'Dangerous file was renamed.');
- $this->assertRaw(t('File MIME type is text/plain.'), "Dangerous file's MIME type was changed.");
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains($message, 'Dangerous file was renamed.');
+ $this->assertSession()->responseContains(t('File MIME type is text/plain.'), "Dangerous file's MIME type was changed.");
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'insert']);
@@ -244,8 +244,8 @@ public function testHandleDangerousFile() {
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
- $this->assertRaw(t('File name is @filename', ['@filename' => $this->phpfile->filename]), 'Dangerous file was not renamed when insecure uploads is TRUE.');
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('File name is @filename', ['@filename' => $this->phpfile->filename]), 'Dangerous file was not renamed when insecure uploads is TRUE.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'insert']);
@@ -279,9 +279,9 @@ public function testHandleFileMunge() {
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('For security reasons, your upload has been renamed'), 'Found security message.');
- $this->assertRaw(t('File name is @filename', ['@filename' => $munged_filename]), 'File was successfully munged.');
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('For security reasons, your upload has been renamed'), 'Found security message.');
+ $this->assertSession()->responseContains(t('File name is @filename', ['@filename' => $munged_filename]), 'File was successfully munged.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'insert']);
@@ -298,8 +298,8 @@ public function testHandleFileMunge() {
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
- $this->assertRaw(t('File name is @filename', ['@filename' => $this->image->getFilename()]), 'File was not munged when allowing any extension.');
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('File name is @filename', ['@filename' => $this->image->getFilename()]), 'File was not munged when allowing any extension.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'insert']);
@@ -317,7 +317,7 @@ public function testExistingRename() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'insert']);
@@ -335,7 +335,7 @@ public function testExistingReplace() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'load', 'update']);
@@ -353,7 +353,7 @@ public function testExistingError() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
+ $this->assertSession()->responseContains(t('Epic upload FAIL!'), 'Found the failure message.');
// Check that the no hooks were called while failing.
$this->assertFileHooksCalled([]);
@@ -386,13 +386,13 @@ public function testDrupalMovingUploadedFileError() {
\Drupal::state()->set('file_test.disable_error_collection', TRUE);
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('File upload error. Could not move uploaded file.'), 'Found the failure message.');
- $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
+ $this->assertSession()->responseContains(t('File upload error. Could not move uploaded file.'), 'Found the failure message.');
+ $this->assertSession()->responseContains(t('Epic upload FAIL!'), 'Found the failure message.');
// Uploading failed. Now check the log.
$this->drupalGet('admin/reports/dblog');
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('Upload error. Could not move uploaded file @file to destination @destination.', [
+ $this->assertSession()->responseContains(t('Upload error. Could not move uploaded file @file to destination @destination.', [
'@file' => $this->image->getFilename(),
'@destination' => 'temporary://' . $test_directory . '/' . $this->image->getFilename(),
]), 'Found upload error log entry.');
@@ -412,13 +412,13 @@ public function testErrorMessagesAreNotChanged() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Ensure the expected error message is present and the counts before and
// after calling _file_save_upload_from_form() are correct.
$this->assertText($error);
- $this->assertRaw('Number of error messages before _file_save_upload_from_form(): 1');
- $this->assertRaw('Number of error messages after _file_save_upload_from_form(): 1');
+ $this->assertSession()->responseContains('Number of error messages before _file_save_upload_from_form(): 1');
+ $this->assertSession()->responseContains('Number of error messages after _file_save_upload_from_form(): 1');
// Test that error messages are preserved when an error occurs.
$edit = [
@@ -428,13 +428,13 @@ public function testErrorMessagesAreNotChanged() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
+ $this->assertSession()->responseContains(t('Epic upload FAIL!'), 'Found the failure message.');
// Ensure the expected error message is present and the counts before and
// after calling _file_save_upload_from_form() are correct.
$this->assertText($error);
- $this->assertRaw('Number of error messages before _file_save_upload_from_form(): 1');
- $this->assertRaw('Number of error messages after _file_save_upload_from_form(): 1');
+ $this->assertSession()->responseContains('Number of error messages before _file_save_upload_from_form(): 1');
+ $this->assertSession()->responseContains('Number of error messages after _file_save_upload_from_form(): 1');
// Test a successful upload with no messages.
$edit = [
@@ -442,13 +442,13 @@ public function testErrorMessagesAreNotChanged() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Ensure the error message is not present and the counts before and after
// calling _file_save_upload_from_form() are correct.
$this->assertNoText($error);
- $this->assertRaw('Number of error messages before _file_save_upload_from_form(): 0');
- $this->assertRaw('Number of error messages after _file_save_upload_from_form(): 0');
+ $this->assertSession()->responseContains('Number of error messages before _file_save_upload_from_form(): 0');
+ $this->assertSession()->responseContains('Number of error messages after _file_save_upload_from_form(): 0');
}
/**
@@ -476,10 +476,10 @@ public function testCombinedErrorMessages() {
$files['files']['file_test_upload'][1] = $file_system->realpath($textfile->uri);
$client->request($form->getMethod(), $form->getUri(), $edit, $files);
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
+ $this->assertSession()->responseContains(t('Epic upload FAIL!'), 'Found the failure message.');
// Search for combined error message followed by a formatted list of messages.
- $this->assertRaw(t('One or more files could not be uploaded.') . '', 'Error message contains combined list of validation errors.');
+ $this->assertSession()->responseContains(t('One or more files could not be uploaded.') . '
', 'Error message contains combined list of validation errors.');
}
/**
@@ -496,7 +496,7 @@ public function testUploadFieldIsHighlighted() {
];
$this->drupalPostForm('file-test/save_upload_from_form_test', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
+ $this->assertSession()->responseContains(t('Epic upload FAIL!'), 'Found the failure message.');
$this->assertCount(1, $this->cssSelect('input[name="files[file_test_upload][]"].error'), 'File upload field has error.');
}
diff --git a/core/modules/file/tests/src/Functional/SaveUploadTest.php b/core/modules/file/tests/src/Functional/SaveUploadTest.php
index c4d9ee49f3..cfae3ba56c 100644
--- a/core/modules/file/tests/src/Functional/SaveUploadTest.php
+++ b/core/modules/file/tests/src/Functional/SaveUploadTest.php
@@ -82,7 +82,7 @@ protected function setUp(): void {
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called then clean out the hook
// counters.
@@ -109,7 +109,7 @@ public function testNormal() {
$edit = ['files[file_test_upload]' => \Drupal::service('file_system')->realpath($image2->uri)];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'));
+ $this->assertSession()->responseContains(t('You WIN!'));
$max_fid_after = (int) \Drupal::entityQueryAggregate('file')->aggregate('fid', 'max')->execute()[0]['fid_max'];
// Check that the correct hooks were called.
@@ -135,7 +135,7 @@ public function testNormal() {
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'));
+ $this->assertSession()->responseContains(t('You WIN!'));
$this->assertFileExists('temporary://' . $dir . '/' . trim(\Drupal::service('file_system')->basename($image3_realpath)));
}
@@ -162,7 +162,7 @@ public function testDuplicate() {
// Received a 200 response for posted test file.
$this->assertSession()->statusCodeEquals(200);
$message = t('The file %file already exists. Enter a unique file URI.', ['%file' => $file1->getFileUri()]);
- $this->assertRaw($message);
+ $this->assertSession()->responseContains($message);
$max_fid_before_duplicate = $max_fid_after;
$max_fid_after = (int) \Drupal::entityQueryAggregate('file')->aggregate('fid', 'max')->execute()[0]['fid_max'];
$this->assertEqual($max_fid_before_duplicate, $max_fid_after, 'A new managed file was not created.');
@@ -186,8 +186,8 @@ public function testHandleExtension() {
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$message = t('Only files with the following extensions are allowed:') . '
' . $extensions . ' ';
- $this->assertRaw($message, 'Cannot upload a disallowed extension');
- $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
+ $this->assertSession()->responseContains($message, 'Cannot upload a disallowed extension');
+ $this->assertSession()->responseContains(t('Epic upload FAIL!'), 'Found the failure message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate']);
@@ -206,7 +206,7 @@ public function testHandleExtension() {
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload an allowed extension.');
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'load', 'update']);
@@ -223,7 +223,7 @@ public function testHandleExtension() {
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('Only files with the following extensions are allowed:'), 'Can upload any extension.');
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'load', 'update']);
@@ -246,10 +246,10 @@ public function testHandleDangerousFile() {
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$message = t('For security reasons, your upload has been renamed to') . '
' . $this->phpfile->filename . '.txt' . ' ';
- $this->assertRaw($message, 'Dangerous file was renamed.');
+ $this->assertSession()->responseContains($message, 'Dangerous file was renamed.');
$this->assertSession()->pageTextContains('File name is php-2.php.txt.');
- $this->assertRaw(t('File MIME type is text/plain.'), "Dangerous file's MIME type was changed.");
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('File MIME type is text/plain.'), "Dangerous file's MIME type was changed.");
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'insert']);
@@ -264,7 +264,7 @@ public function testHandleDangerousFile() {
$this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
$this->assertSession()->pageTextContains('File name is php-2.php.');
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'insert']);
@@ -296,9 +296,9 @@ public function testHandleFileMunge() {
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('For security reasons, your upload has been renamed'), 'Found security message.');
- $this->assertRaw(t('File name is @filename', ['@filename' => $munged_filename]), 'File was successfully munged.');
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('For security reasons, your upload has been renamed'), 'Found security message.');
+ $this->assertSession()->responseContains(t('File name is @filename', ['@filename' => $munged_filename]), 'File was successfully munged.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'insert']);
@@ -315,8 +315,8 @@ public function testHandleFileMunge() {
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw(t('For security reasons, your upload has been renamed'), 'Found no security message.');
- $this->assertRaw(t('File name is @filename', ['@filename' => $this->image->getFilename()]), 'File was not munged when allowing any extension.');
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('File name is @filename', ['@filename' => $this->image->getFilename()]), 'File was not munged when allowing any extension.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
// Check that the correct hooks were called.
$this->assertFileHooksCalled(['validate', 'insert']);
@@ -332,7 +332,7 @@ public function testExistingRename() {
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
$this->assertSession()->pageTextContains('File name is image-test_0.png.');
// Check that the correct hooks were called.
@@ -349,7 +349,7 @@ public function testExistingReplace() {
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('You WIN!'), 'Found the success message.');
+ $this->assertSession()->responseContains(t('You WIN!'), 'Found the success message.');
$this->assertSession()->pageTextContains('File name is image-test.png.');
// Check that the correct hooks were called.
@@ -366,7 +366,7 @@ public function testExistingError() {
];
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
+ $this->assertSession()->responseContains(t('Epic upload FAIL!'), 'Found the failure message.');
// Check that the no hooks were called while failing.
$this->assertFileHooksCalled([]);
@@ -399,13 +399,13 @@ public function testDrupalMovingUploadedFileError() {
\Drupal::state()->set('file_test.disable_error_collection', TRUE);
$this->drupalPostForm('file-test/upload', $edit, t('Submit'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('File upload error. Could not move uploaded file.'), 'Found the failure message.');
- $this->assertRaw(t('Epic upload FAIL!'), 'Found the failure message.');
+ $this->assertSession()->responseContains(t('File upload error. Could not move uploaded file.'), 'Found the failure message.');
+ $this->assertSession()->responseContains(t('Epic upload FAIL!'), 'Found the failure message.');
// Uploading failed. Now check the log.
$this->drupalGet('admin/reports/dblog');
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('Upload error. Could not move uploaded file @file to destination @destination.', [
+ $this->assertSession()->responseContains(t('Upload error. Could not move uploaded file @file to destination @destination.', [
'@file' => $this->image->getFilename(),
'@destination' => 'temporary://' . $test_directory . '/' . $this->image->getFilename(),
]), 'Found upload error log entry.');
diff --git a/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php b/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
index f50049de85..7c49e07d2f 100644
--- a/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
+++ b/core/modules/file/tests/src/FunctionalJavascript/FileFieldWidgetTest.php
@@ -205,7 +205,7 @@ public function testUploadingMoreFilesThenAllowed() {
'@count' => 3,
'%list' => 'text-2.txt',
];
- $this->assertRaw(t('Field %field can only hold @max values but there were @count uploaded. The following files have been omitted as a result: %list.', $args));
+ $this->assertSession()->responseContains(t('Field %field can only hold @max values but there were @count uploaded. The following files have been omitted as a result: %list.', $args));
}
/**
diff --git a/core/modules/filter/tests/src/Functional/FilterAdminTest.php b/core/modules/filter/tests/src/Functional/FilterAdminTest.php
index 00e2c16f24..919665dfd6 100644
--- a/core/modules/filter/tests/src/Functional/FilterAdminTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterAdminTest.php
@@ -181,7 +181,7 @@ public function testFormatAdmin() {
'name' => $name,
];
$this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
- $this->assertRaw(t('Text format names must be unique. A format named %name already exists.', [
+ $this->assertSession()->responseContains(t('Text format names must be unique. A format named %name already exists.', [
'%name' => $name,
]));
}
@@ -258,7 +258,7 @@ public function testFilterAdmin() {
$edit['filters[' . $first_filter . '][status]'] = TRUE;
$this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
$this->assertUrl('admin/config/content/formats');
- $this->assertRaw(t('Added text format %format.', ['%format' => $edit['name']]), 'New filter created.');
+ $this->assertSession()->responseContains(t('Added text format %format.', ['%format' => $edit['name']]), 'New filter created.');
filter_formats_reset();
$format = FilterFormat::load($edit['format']);
@@ -271,7 +271,7 @@ public function testFilterAdmin() {
// Disable new filter.
$this->drupalPostForm('admin/config/content/formats/manage/' . $format->id() . '/disable', [], t('Disable'));
$this->assertUrl('admin/config/content/formats');
- $this->assertRaw(t('Disabled text format %format.', ['%format' => $edit['name']]), 'Format successfully disabled.');
+ $this->assertSession()->responseContains(t('Disabled text format %format.', ['%format' => $edit['name']]), 'Format successfully disabled.');
// Allow authenticated users on full HTML.
$format = FilterFormat::load($full);
@@ -280,13 +280,13 @@ public function testFilterAdmin() {
$edit['roles[' . RoleInterface::AUTHENTICATED_ID . ']'] = 1;
$this->drupalPostForm('admin/config/content/formats/manage/' . $full, $edit, t('Save configuration'));
$this->assertUrl('admin/config/content/formats/manage/' . $full);
- $this->assertRaw(t('The text format %format has been updated.', ['%format' => $format->label()]), 'Full HTML format successfully updated.');
+ $this->assertSession()->responseContains(t('The text format %format has been updated.', ['%format' => $format->label()]), 'Full HTML format successfully updated.');
// Switch user.
$this->drupalLogin($this->webUser);
$this->drupalGet('node/add/page');
- $this->assertRaw('
Full HTML ', 'Full HTML filter accessible.');
+ $this->assertSession()->responseContains('
Full HTML ', 'Full HTML filter accessible.');
// Use basic HTML and see if it removes tags that are not allowed.
$body = '
' . $this->randomMachineName() . ' ';
@@ -308,7 +308,7 @@ public function testFilterAdmin() {
$this->assertNotEmpty($node, 'Node found in database.');
$this->drupalGet('node/' . $node->id());
- $this->assertRaw($body . $extra_text, 'Filter removed invalid tag.');
+ $this->assertSession()->responseContains($body . $extra_text, 'Filter removed invalid tag.');
// Use plain text and see if it escapes all tags, whether allowed or not.
// In order to test plain text, we have to enable the hidden variable for
@@ -342,7 +342,7 @@ public function testFilterAdmin() {
$edit['roles[' . RoleInterface::AUTHENTICATED_ID . ']'] = FALSE;
$this->drupalPostForm('admin/config/content/formats/manage/' . $full, $edit, t('Save configuration'));
$this->assertUrl('admin/config/content/formats/manage/' . $full);
- $this->assertRaw(t('The text format %format has been updated.', ['%format' => $format->label()]), 'Full HTML format successfully reverted.');
+ $this->assertSession()->responseContains(t('The text format %format has been updated.', ['%format' => $format->label()]), 'Full HTML format successfully reverted.');
$this->drupalGet('admin/config/content/formats/manage/' . $full);
$this->assertFieldByName('roles[' . RoleInterface::AUTHENTICATED_ID . ']', $edit['roles[' . RoleInterface::AUTHENTICATED_ID . ']'], 'Changes reverted.');
@@ -388,10 +388,10 @@ public function testFilterTipHtmlEscape() {
$this->drupalGet('filter/tips');
- $this->assertRaw('
' . $link_as_code . ' ');
- $this->assertRaw('
' . $link . ' ');
- $this->assertRaw('
' . $ampersand_as_code . ' ');
- $this->assertRaw('
' . $ampersand . ' ');
+ $this->assertSession()->responseContains('
' . $link_as_code . ' ');
+ $this->assertSession()->responseContains('
' . $link . ' ');
+ $this->assertSession()->responseContains('
' . $ampersand_as_code . ' ');
+ $this->assertSession()->responseContains('
' . $ampersand . ' ');
}
/**
@@ -441,7 +441,7 @@ public function testDisabledFormat() {
$this->drupalLogin($this->adminUser);
$this->drupalGet('admin/reports/dblog');
// The correct message has been logged.
- $this->assertRaw(sprintf('Disabled text format: %s.', $format_id));
+ $this->assertSession()->responseContains(sprintf('Disabled text format: %s.', $format_id));
// Programmatically change the text format to something random so we trigger
// the missing text format message.
@@ -456,7 +456,7 @@ public function testDisabledFormat() {
// Visit the dblog report page.
$this->drupalGet('admin/reports/dblog');
// The missing text format message has been logged.
- $this->assertRaw(sprintf('Missing text format: %s.', $format_id));
+ $this->assertSession()->responseContains(sprintf('Missing text format: %s.', $format_id));
}
}
diff --git a/core/modules/filter/tests/src/Functional/FilterHooksTest.php b/core/modules/filter/tests/src/Functional/FilterHooksTest.php
index 8ed68af263..01b718cf85 100644
--- a/core/modules/filter/tests/src/Functional/FilterHooksTest.php
+++ b/core/modules/filter/tests/src/Functional/FilterHooksTest.php
@@ -46,7 +46,7 @@ public function testFilterHooks() {
$edit['name'] = $name;
$edit['roles[' . RoleInterface::ANONYMOUS_ID . ']'] = 1;
$this->drupalPostForm('admin/config/content/formats/add', $edit, t('Save configuration'));
- $this->assertRaw(t('Added text format %format.', ['%format' => $name]));
+ $this->assertSession()->responseContains(t('Added text format %format.', ['%format' => $name]));
$this->assertText('hook_filter_format_insert invoked.');
$format_id = $edit['format'];
@@ -55,7 +55,7 @@ public function testFilterHooks() {
$edit = [];
$edit['roles[' . RoleInterface::AUTHENTICATED_ID . ']'] = 1;
$this->drupalPostForm('admin/config/content/formats/manage/' . $format_id, $edit, t('Save configuration'));
- $this->assertRaw(t('The text format %format has been updated.', ['%format' => $name]));
+ $this->assertSession()->responseContains(t('The text format %format has been updated.', ['%format' => $name]));
$this->assertText('hook_filter_format_update invoked.');
// Use the format created.
@@ -69,7 +69,7 @@ public function testFilterHooks() {
// Disable the text format.
$this->drupalPostForm('admin/config/content/formats/manage/' . $format_id . '/disable', [], t('Disable'));
- $this->assertRaw(t('Disabled text format %format.', ['%format' => $name]));
+ $this->assertSession()->responseContains(t('Disabled text format %format.', ['%format' => $name]));
$this->assertText('hook_filter_format_disable invoked.');
}
diff --git a/core/modules/forum/tests/src/Functional/ForumTest.php b/core/modules/forum/tests/src/Functional/ForumTest.php
index 9345445ac9..3385759810 100644
--- a/core/modules/forum/tests/src/Functional/ForumTest.php
+++ b/core/modules/forum/tests/src/Functional/ForumTest.php
@@ -135,7 +135,7 @@ public function testForum() {
// Check that the basic forum install creates a default forum topic
$this->drupalGet('/forum');
// Look for the "General discussion" default forum
- $this->assertRaw(Link::createFromRoute(t('General discussion'), 'forum.page', ['taxonomy_term' => 1])->toString(), "Found the default forum at the /forum listing");
+ $this->assertSession()->responseContains(Link::createFromRoute(t('General discussion'), 'forum.page', ['taxonomy_term' => 1])->toString(), "Found the default forum at the /forum listing");
// Check the presence of expected cache tags.
$this->assertCacheTag('config:forum.settings');
@@ -322,20 +322,20 @@ private function doAdminTests($user) {
$this->assertLink('Add forum');
$this->assertLink('Add container');
$this->clickLink('edit container');
- $this->assertRaw('Edit container', 'Followed the link to edit the container');
+ $this->assertSession()->responseContains('Edit container', 'Followed the link to edit the container');
// Create forum inside the forum container.
$this->forum = $this->createForum('forum', $this->forumContainer['tid']);
// Verify the "edit forum" link exists and functions correctly.
$this->drupalGet('admin/structure/forum');
$this->clickLink('edit forum');
- $this->assertRaw('Edit forum', 'Followed the link to edit the forum');
+ $this->assertSession()->responseContains('Edit forum', 'Followed the link to edit the forum');
// Navigate back to forum structure page.
$this->drupalGet('admin/structure/forum');
// Create second forum in container, destined to be deleted below.
$delete_forum = $this->createForum('forum', $this->forumContainer['tid']);
// Save forum overview.
$this->drupalPostForm('admin/structure/forum/', [], t('Save'));
- $this->assertRaw(t('The configuration options have been saved.'));
+ $this->assertSession()->responseContains(t('The configuration options have been saved.'));
// Delete this second forum.
$this->deleteForum($delete_forum['tid']);
// Create forum at the top (root) level.
@@ -391,7 +391,7 @@ public function editForumVocabulary() {
// Edit the vocabulary.
$this->drupalPostForm('admin/structure/taxonomy/manage/' . $original_vocabulary->id(), $edit, t('Save'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('Updated vocabulary %name.', ['%name' => $edit['name']]), 'Vocabulary was edited');
+ $this->assertSession()->responseContains(t('Updated vocabulary %name.', ['%name' => $edit['name']]), 'Vocabulary was edited');
// Grab the newly edited vocabulary.
$current_vocabulary = Vocabulary::load($vid);
@@ -578,7 +578,7 @@ public function createForumTopic($forum, $container = FALSE) {
$type = t('Forum topic');
if ($container) {
$this->assertNoText(t('@type @title has been created.', ['@type' => $type, '@title' => $title]), 'Forum topic was not created');
- $this->assertRaw(t('The item %title is a forum container, not a forum.', ['%title' => $forum['name']]), 'Error message was shown');
+ $this->assertSession()->responseContains(t('The item %title is a forum container, not a forum.', ['%title' => $forum['name']]), 'Error message was shown');
return;
}
else {
@@ -597,8 +597,8 @@ public function createForumTopic($forum, $container = FALSE) {
// View forum topic.
$this->drupalGet('node/' . $node->id());
- $this->assertRaw($title, 'Subject was found');
- $this->assertRaw($body, 'Body was found');
+ $this->assertSession()->responseContains($title, 'Subject was found');
+ $this->assertSession()->responseContains($body, 'Body was found');
return $node;
}
@@ -645,7 +645,7 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
'#theme' => 'breadcrumb',
'#links' => $breadcrumb_build,
];
- $this->assertRaw(\Drupal::service('renderer')->renderRoot($breadcrumb), 'Breadcrumbs were displayed');
+ $this->assertSession()->responseContains(\Drupal::service('renderer')->renderRoot($breadcrumb), 'Breadcrumbs were displayed');
// View forum edit node.
$this->drupalGet('node/' . $node->id() . '/edit');
@@ -679,7 +679,7 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
// Delete forum node.
$this->drupalPostForm('node/' . $node->id() . '/delete', [], t('Delete'));
$this->assertSession()->statusCodeEquals($response);
- $this->assertRaw(t('Forum topic %title has been deleted.', ['%title' => $edit['title[0][value]']]), 'Forum node was deleted');
+ $this->assertSession()->responseContains(t('Forum topic %title has been deleted.', ['%title' => $edit['title[0][value]']]), 'Forum node was deleted');
}
}
@@ -709,7 +709,7 @@ private function verifyForumView($forum, $parent = NULL) {
'#theme' => 'breadcrumb',
'#links' => $breadcrumb_build,
];
- $this->assertRaw(\Drupal::service('renderer')->renderRoot($breadcrumb), 'Breadcrumbs were displayed');
+ $this->assertSession()->responseContains(\Drupal::service('renderer')->renderRoot($breadcrumb), 'Breadcrumbs were displayed');
}
/**
diff --git a/core/modules/help/tests/src/Functional/HelpTest.php b/core/modules/help/tests/src/Functional/HelpTest.php
index a8b3e0321d..1945d06604 100644
--- a/core/modules/help/tests/src/Functional/HelpTest.php
+++ b/core/modules/help/tests/src/Functional/HelpTest.php
@@ -69,15 +69,15 @@ public function testHelp() {
// Verify that introductory help text exists, goes for 100% module coverage.
$this->drupalLogin($this->adminUser);
$this->drupalGet('admin/help');
- $this->assertRaw(t('For more information, refer to the help listed on this page or to the
online documentation and
support pages at
drupal.org .', [':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org']));
+ $this->assertSession()->responseContains(t('For more information, refer to the help listed on this page or to the
online documentation and
support pages at
drupal.org .', [':docs' => 'https://www.drupal.org/documentation', ':support' => 'https://www.drupal.org/support', ':drupal' => 'https://www.drupal.org']));
// Verify that hook_help() section title and description appear.
- $this->assertRaw('
' . t('Module overviews') . ' ');
- $this->assertRaw('
' . t('Module overviews are provided by modules. Overviews available for your installed modules:'), '
');
+ $this->assertSession()->responseContains('
' . t('Module overviews') . ' ');
+ $this->assertSession()->responseContains('
' . t('Module overviews are provided by modules. Overviews available for your installed modules:'), '
');
// Verify that an empty section is handled correctly.
- $this->assertRaw('
' . t('Empty section') . ' ');
- $this->assertRaw('
' . t('This description should appear.'), '
');
+ $this->assertSession()->responseContains('
' . t('Empty section') . ' ');
+ $this->assertSession()->responseContains('
' . t('This description should appear.'), '
');
$this->assertText(t('There is currently nothing in this section.'));
// Make sure links are properly added for modules implementing hook_help().
@@ -88,7 +88,7 @@ public function testHelp() {
// Ensure that module which does not provide an module overview page is
// handled correctly.
$this->clickLink(\Drupal::moduleHandler()->getName('help_test'));
- $this->assertRaw(t('No help is available for module %module.', ['%module' => \Drupal::moduleHandler()->getName('help_test')]));
+ $this->assertSession()->responseContains(t('No help is available for module %module.', ['%module' => \Drupal::moduleHandler()->getName('help_test')]));
// Verify that the order of topics is alphabetical by displayed module
// name, by checking the order of some modules, including some that would
diff --git a/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php b/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
index 6b94ca575c..ec6a8cd935 100644
--- a/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
+++ b/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php
@@ -68,7 +68,7 @@ public function testNumericStyleName() {
'label' => $style_label,
];
$this->drupalPostForm('admin/config/media/image-styles/add', $edit, t('Create new style'));
- $this->assertRaw(t('Style %name was created.', ['%name' => $style_label]));
+ $this->assertSession()->responseContains(t('Style %name was created.', ['%name' => $style_label]));
$options = image_style_options();
$this->assertArrayHasKey($style_name, $options);
}
@@ -119,7 +119,7 @@ public function testStyle() {
'label' => $style_label,
];
$this->drupalPostForm($admin_path . '/add', $edit, t('Create new style'));
- $this->assertRaw(t('Style %name was created.', ['%name' => $style_label]));
+ $this->assertSession()->responseContains(t('Style %name was created.', ['%name' => $style_label]));
// Ensure that the expected entity operations are there.
$this->drupalGet($admin_path);
@@ -253,7 +253,7 @@ public function testStyle() {
// Confirm that the form submission was successful.
$this->assertSession()->statusCodeEquals(200);
$image_crop_effect = $style->getEffect($uuids['image_crop']);
- $this->assertRaw(t('The image effect %name has been deleted.', ['%name' => $image_crop_effect->label()]));
+ $this->assertSession()->responseContains(t('The image effect %name has been deleted.', ['%name' => $image_crop_effect->label()]));
// Confirm that there is no longer a link to the effect.
$this->assertNoLinkByHref($style_path . '/effects/' . $uuids['image_crop'] . '/delete');
// Refresh the image style information and verify that the effect was
@@ -299,7 +299,7 @@ public function testStyle() {
// Confirm that the empty text is correct on the image styles page.
$this->drupalGet($admin_path);
- $this->assertRaw(t('There are currently no styles.
Add a new one .', [
+ $this->assertSession()->responseContains(t('There are currently no styles.
Add a new one .', [
':url' => Url::fromRoute('image.style_add')->toString(),
]));
@@ -338,7 +338,7 @@ public function testStyleReplacement() {
// Test that image is displayed using newly created style.
$this->drupalGet('node/' . $nid);
- $this->assertRaw(file_url_transform_relative($style->buildUrl($original_uri)), new FormattableMarkup('Image displayed using style @style.', ['@style' => $style_name]));
+ $this->assertSession()->responseContains(file_url_transform_relative($style->buildUrl($original_uri)), new FormattableMarkup('Image displayed using style @style.', ['@style' => $style_name]));
// Rename the style and make sure the image field is updated.
$new_style_name = strtolower($this->randomMachineName(10));
@@ -353,7 +353,7 @@ public function testStyleReplacement() {
// Reload the image style using the new name.
$style = ImageStyle::load($new_style_name);
- $this->assertRaw(file_url_transform_relative($style->buildUrl($original_uri)), 'Image displayed using style replacement style.');
+ $this->assertSession()->responseContains(file_url_transform_relative($style->buildUrl($original_uri)), 'Image displayed using style replacement style.');
// Delete the style and choose a replacement style.
$edit = [
@@ -361,11 +361,11 @@ public function testStyleReplacement() {
];
$this->drupalPostForm($style_path . $new_style_name . '/delete', $edit, t('Delete'));
$message = t('The image style %name has been deleted.', ['%name' => $new_style_label]);
- $this->assertRaw($message);
+ $this->assertSession()->responseContains($message);
$replacement_style = ImageStyle::load('thumbnail');
$this->drupalGet('node/' . $nid);
- $this->assertRaw(file_url_transform_relative($replacement_style->buildUrl($original_uri)), 'Image displayed using style replacement style.');
+ $this->assertSession()->responseContains(file_url_transform_relative($replacement_style->buildUrl($original_uri)), 'Image displayed using style replacement style.');
}
/**
@@ -484,7 +484,7 @@ public function testConfigImport() {
// Test that image is displayed using newly created style.
$this->drupalGet('node/' . $nid);
- $this->assertRaw(file_url_transform_relative($style->buildUrl($original_uri)), new FormattableMarkup('Image displayed using style @style.', ['@style' => $style_name]));
+ $this->assertSession()->responseContains(file_url_transform_relative($style->buildUrl($original_uri)), new FormattableMarkup('Image displayed using style @style.', ['@style' => $style_name]));
// Copy config to sync, and delete the image style.
$sync = $this->container->get('config.storage.sync');
@@ -511,7 +511,7 @@ public function testImageStyleAccess() {
$this->drupalGet('admin/config/media/image-styles');
$this->clickLink(t('Edit'));
- $this->assertRaw(t('Select a new effect'));
+ $this->assertSession()->responseContains(t('Select a new effect'));
}
}
diff --git a/core/modules/image/tests/src/Functional/ImageFieldDefaultImagesTest.php b/core/modules/image/tests/src/Functional/ImageFieldDefaultImagesTest.php
index 3e2bce273a..de3ee271e2 100644
--- a/core/modules/image/tests/src/Functional/ImageFieldDefaultImagesTest.php
+++ b/core/modules/image/tests/src/Functional/ImageFieldDefaultImagesTest.php
@@ -284,7 +284,7 @@ public function testDefaultImages() {
// Confirm the default image is shown on the node form.
$file = File::load($default_images['field_new']->id());
$this->drupalGet('node/add/article');
- $this->assertRaw($file->getFilename());
+ $this->assertSession()->responseContains($file->getFilename());
// Remove the field default from articles.
$default_image_settings = $field->getSetting('default_image');
@@ -331,7 +331,7 @@ public function testDefaultImages() {
// Confirm the default image is shown on the node form.
$file = File::load($default_images['field_storage_new']->id());
$this->drupalGet('node/add/article');
- $this->assertRaw($file->getFilename());
+ $this->assertSession()->responseContains($file->getFilename());
// Change the default image for the field storage and also change the upload
// destination to the private filesystem at the same time.
diff --git a/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php b/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
index ccd8dd21ba..24a8f3f65e 100644
--- a/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
+++ b/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
@@ -117,7 +117,7 @@ public function _testImageFieldFormatters($scheme) {
'#alt' => $alt,
];
$default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
- $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
+ $this->assertSession()->responseContains($default_output, 'Default formatter displaying correctly on full node view.');
// Test the image linked to file formatter.
$display_options = [
@@ -143,7 +143,7 @@ public function _testImageFieldFormatters($scheme) {
$this->assertCacheContext('url.site');
$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->assertRaw($default_output, 'Image linked to file formatter displaying correctly on full node view.');
+ $this->assertSession()->responseContains($default_output, 'Image linked to file formatter displaying correctly on full node view.');
// 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') {
@@ -208,7 +208,7 @@ public function _testImageFieldFormatters($scheme) {
$this->drupalGet('node/' . $nid);
$image_style = ImageStyle::load('thumbnail');
$this->assertCacheTag($image_style->getCacheTags()[0]);
- $this->assertRaw($default_output, 'Image style thumbnail formatter displaying correctly on full node view.');
+ $this->assertSession()->responseContains($default_output, 'Image style thumbnail formatter displaying correctly on full node view.');
if ($scheme == 'private') {
// Log out and ensure the file cannot be accessed.
@@ -304,7 +304,7 @@ public function testImageFieldSettings() {
];
$this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save'));
$default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
- $this->assertRaw($default_output, 'Image displayed using user supplied alt and title attributes.');
+ $this->assertSession()->responseContains($default_output, 'Image displayed using user supplied alt and title attributes.');
// Verify that alt/title longer than allowed results in a validation error.
$test_size = 2000;
@@ -314,11 +314,11 @@ public function testImageFieldSettings() {
];
$this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save'));
$schema = $field->getFieldStorageDefinition()->getSchema();
- $this->assertRaw(t('Alternative text cannot be longer than %max characters but is currently %length characters long.', [
+ $this->assertSession()->responseContains(t('Alternative text cannot be longer than %max characters but is currently %length characters long.', [
'%max' => $schema['columns']['alt']['length'],
'%length' => $test_size,
]));
- $this->assertRaw(t('Title cannot be longer than %max characters but is currently %length characters long.', [
+ $this->assertSession()->responseContains(t('Title cannot be longer than %max characters but is currently %length characters long.', [
'%max' => $schema['columns']['title']['length'],
'%length' => $test_size,
]));
@@ -401,7 +401,7 @@ public function testImageFieldDefaultImage() {
$this->assertCacheTag($file->getCacheTags()[0]);
$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->assertRaw($default_output, 'Default image displayed when no user supplied image is present.');
+ $this->assertSession()->responseContains($default_output, 'Default image displayed when no user supplied image is present.');
// Create a node with an image attached and ensure that the default image
// is not displayed.
@@ -427,7 +427,7 @@ public function testImageFieldDefaultImage() {
$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->assertNoRaw($default_output, 'Default image is not displayed when user supplied image is present.');
- $this->assertRaw($image_output, 'User supplied image is displayed.');
+ $this->assertSession()->responseContains($image_output, 'User supplied image is displayed.');
// Remove default image from the field and make sure it is no longer used.
// Can't use fillField cause Mink can't fill hidden fields.
@@ -477,7 +477,7 @@ public function testImageFieldDefaultImage() {
$this->assertCacheTag($file->getCacheTags()[0]);
$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->assertRaw($default_output, 'Default private image displayed when no user supplied image is present.');
+ $this->assertSession()->responseContains($default_output, 'Default private image displayed when no user supplied image is present.');
}
}
diff --git a/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php b/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
index e02b0ed604..59f696c9c0 100644
--- a/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
+++ b/core/modules/image/tests/src/Functional/ImageFieldValidateTest.php
@@ -141,8 +141,8 @@ public function testResolution() {
}
}
$this->uploadNodeImage($image_that_is_too_small, $field_names[0], 'article');
- $this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
- $this->assertRaw(t('The image is too small. The minimum dimensions are %dimensions pixels and the image size is %widthx%height pixels.', [
+ $this->assertSession()->responseContains(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
+ $this->assertSession()->responseContains(t('The image is too small. The minimum dimensions are %dimensions pixels and the image size is %widthx%height pixels.', [
'%dimensions' => '50x50',
'%width' => $image_that_is_too_small_file->getWidth(),
'%height' => $image_that_is_too_small_file->getHeight(),
@@ -150,11 +150,11 @@ public function testResolution() {
$this->uploadNodeImage($image_that_is_too_big, $field_names[0], 'article');
$this->assertText(t('The image was resized to fit within the maximum allowed dimensions of 100x100 pixels.'));
$this->uploadNodeImage($image_that_is_too_small, $field_names[1], 'article');
- $this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
+ $this->assertSession()->responseContains(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
$this->uploadNodeImage($image_that_is_too_big, $field_names[1], 'article');
$this->assertText(t('The image was resized to fit within the maximum allowed width of 100 pixels.'));
$this->uploadNodeImage($image_that_is_too_small, $field_names[2], 'article');
- $this->assertRaw(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
+ $this->assertSession()->responseContains(t('The specified file %name could not be uploaded.', ['%name' => $image_that_is_too_small->filename]));
$this->uploadNodeImage($image_that_is_too_big, $field_names[2], 'article');
$this->assertText(t('The image was resized to fit within the maximum allowed height of 100 pixels.'));
}
diff --git a/core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php b/core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php
index 6667c9e5cf..bbeb783e12 100644
--- a/core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php
+++ b/core/modules/image/tests/src/Functional/ImageOnTranslatedEntityTest.php
@@ -125,12 +125,12 @@ public function testSyncedImages() {
$this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
// This inspects the HTML after the post of the translation, the image
// should be displayed on the original node.
- $this->assertRaw('alt="Lost in translation image"');
- $this->assertRaw('title="Lost in translation image title"');
+ $this->assertSession()->responseContains('alt="Lost in translation image"');
+ $this->assertSession()->responseContains('title="Lost in translation image title"');
$second_fid = $this->getLastFileId();
// View the translated node.
$this->drupalGet('fr/node/' . $default_language_node->id());
- $this->assertRaw('alt="Scarlett Johansson image"');
+ $this->assertSession()->responseContains('alt="Scarlett Johansson image"');
\Drupal::entityTypeManager()->getStorage('file')->resetCache();
@@ -164,12 +164,12 @@ public function testSyncedImages() {
$this->assertTrue($file->isPermanent(), 'First file still exists and is permanent.');
// This inspects the HTML after the post of the translation, the image
// should be displayed on the original node.
- $this->assertRaw('alt="Lost in translation image"');
- $this->assertRaw('title="Lost in translation image title"');
+ $this->assertSession()->responseContains('alt="Lost in translation image"');
+ $this->assertSession()->responseContains('title="Lost in translation image title"');
// View the translated node.
$this->drupalGet('nl/node/' . $default_language_node->id());
- $this->assertRaw('alt="Akiko Takeshita image"');
- $this->assertRaw('title="Akiko Takeshita image title"');
+ $this->assertSession()->responseContains('alt="Akiko Takeshita image"');
+ $this->assertSession()->responseContains('title="Akiko Takeshita image title"');
// Ensure the file status of the second file is permanent.
$file = File::load($second_fid);
diff --git a/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php b/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
index c6eb941ea1..78a7bb84c4 100644
--- a/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
+++ b/core/modules/image/tests/src/Functional/ImageStyleDeleteTest.php
@@ -35,7 +35,7 @@ public function testDelete() {
// Checks that the 'replacement' select element is displayed.
$this->assertFieldByName('replacement');
// Checks that UI messages are correct.
- $this->assertRaw(t('If this style is in use on the site, you may select another style to replace it. All images that have been generated for this style will be permanently deleted. If no replacement style is selected, the dependent configurations might need manual reconfiguration.'));
+ $this->assertSession()->responseContains(t('If this style is in use on the site, you may select another style to replace it. All images that have been generated for this style will be permanently deleted. If no replacement style is selected, the dependent configurations might need manual reconfiguration.'));
$this->assertNoRaw(t('All images that have been generated for this style will be permanently deleted. The dependent configurations might need manual reconfiguration.'));
// Delete 'medium' image style but replace it with 'thumbnail'. This style
@@ -58,7 +58,7 @@ public function testDelete() {
// Checks that the 'replacement' select element is displayed.
$this->assertFieldByName('replacement');
// Checks that UI messages are correct.
- $this->assertRaw(t('If this style is in use on the site, you may select another style to replace it. All images that have been generated for this style will be permanently deleted. If no replacement style is selected, the dependent configurations might need manual reconfiguration.'));
+ $this->assertSession()->responseContains(t('If this style is in use on the site, you may select another style to replace it. All images that have been generated for this style will be permanently deleted. If no replacement style is selected, the dependent configurations might need manual reconfiguration.'));
$this->assertNoRaw(t('All images that have been generated for this style will be permanently deleted. The dependent configurations might need manual reconfiguration.'));
// Delete 'thumbnail' image style. Provide no replacement.
@@ -79,7 +79,7 @@ public function testDelete() {
$this->assertNoFieldByName('replacement');
// Checks that UI messages are correct.
$this->assertNoRaw(t('If this style is in use on the site, you may select another style to replace it. All images that have been generated for this style will be permanently deleted. If no replacement style is selected, the dependent configurations might need manual reconfiguration.'));
- $this->assertRaw(t('All images that have been generated for this style will be permanently deleted. The dependent configurations might need manual reconfiguration.'));
+ $this->assertSession()->responseContains(t('All images that have been generated for this style will be permanently deleted. The dependent configurations might need manual reconfiguration.'));
}
}
diff --git a/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php b/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
index 621910a205..55f1724282 100644
--- a/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
+++ b/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
@@ -40,10 +40,10 @@ public function testConfigUsingCurrentLanguage() {
$this->drupalGet('es/admin/language_test/entity_using_current_language/es');
$this->assertNoRaw(t('Loaded %label.', ['%label' => 'Spanish']));
- $this->assertRaw(t('Loaded %label.', ['%label' => 'Español']));
+ $this->assertSession()->responseContains(t('Loaded %label.', ['%label' => 'Español']));
$this->drupalGet('es/admin/language_test/entity_using_original_language/es');
- $this->assertRaw(t('Loaded %label.', ['%label' => 'Spanish']));
+ $this->assertSession()->responseContains(t('Loaded %label.', ['%label' => 'Spanish']));
$this->assertNoRaw(t('Loaded %label.', ['%label' => 'Español']));
}
diff --git a/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php b/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
index 3d27415e1f..43197ffff1 100644
--- a/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
@@ -43,7 +43,7 @@ public function testUIBrowserLanguageMappings() {
$message = t('Are you sure you want to delete @browser_langcode?', [
'@browser_langcode' => $browser_langcode,
]);
- $this->assertRaw($message);
+ $this->assertSession()->responseContains($message);
// Confirm the delete.
$edit = [];
@@ -53,7 +53,7 @@ public function testUIBrowserLanguageMappings() {
$t_args = [
'%browser' => $browser_langcode,
];
- $this->assertRaw(t('The mapping for the %browser browser language code has been deleted.', $t_args), 'The test browser language code has been deleted.');
+ $this->assertSession()->responseContains(t('The mapping for the %browser browser language code has been deleted.', $t_args), 'The test browser language code has been deleted.');
// Check we went back to the browser negotiation mapping overview.
$this->assertUrl(Url::fromRoute('language.negotiation_browser', [], ['absolute' => TRUE])->toString());
diff --git a/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php b/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
index 91e892ebe7..7f0c498a25 100644
--- a/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
@@ -121,7 +121,7 @@ public function testLanguageConfiguration() {
// Language entity is 'en'.
$this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
$this->rebuildContainer();
- $this->assertRaw(t('The %language (%langcode) language has been removed.', ['%language' => 'English', '%langcode' => 'en']));
+ $this->assertSession()->responseContains(t('The %language (%langcode) language has been removed.', ['%language' => 'English', '%langcode' => 'en']));
// Ensure that French language has a weight of 1 after being created through
// the UI.
diff --git a/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php b/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php
index 03dad5c233..7431d47fa8 100644
--- a/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageCustomLanguageConfigurationTest.php
@@ -56,12 +56,12 @@ public function testLanguageConfiguration() {
];
$this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
- $this->assertRaw(t('%field must be a valid language tag as
defined by the W3C .', [
+ $this->assertSession()->responseContains(t('%field must be a valid language tag as
defined by the W3C .', [
'%field' => t('Language code'),
':url' => 'http://www.w3.org/International/articles/language-tags/',
]));
- $this->assertRaw(t('%field cannot contain any markup.', ['%field' => t('Language name')]));
+ $this->assertSession()->responseContains(t('%field cannot contain any markup.', ['%field' => t('Language name')]));
$this->assertUrl(Url::fromRoute('language.add', [], ['absolute' => TRUE])->toString(), [], 'Correct page redirection.');
// Test adding a custom language with a numeric region code.
@@ -73,7 +73,7 @@ public function testLanguageConfiguration() {
];
$this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
- $this->assertRaw(t(
+ $this->assertSession()->responseContains(t(
'The language %language has been created and can now be used.',
['%language' => $edit['label']]
));
@@ -89,7 +89,7 @@ public function testLanguageConfiguration() {
// Add the language the first time.
$this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
- $this->assertRaw(t(
+ $this->assertSession()->responseContains(t(
'The language %language has been created and can now be used.',
['%language' => $edit['label']]
));
@@ -97,7 +97,7 @@ public function testLanguageConfiguration() {
// Add the language a second time and confirm that this is not allowed.
$this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
- $this->assertRaw(t(
+ $this->assertSession()->responseContains(t(
'The language %language (%langcode) already exists.',
['%language' => $edit['label'], '%langcode' => $edit['langcode']]
));
diff --git a/core/modules/language/tests/src/Functional/LanguageListTest.php b/core/modules/language/tests/src/Functional/LanguageListTest.php
index 67bac87846..1e1f887de8 100644
--- a/core/modules/language/tests/src/Functional/LanguageListTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageListTest.php
@@ -67,7 +67,7 @@ public function testLanguageList() {
];
$this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add custom language'));
$this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE])->toString());
- $this->assertRaw('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
+ $this->assertSession()->responseContains('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
$this->assertText(t($name), 'Test language added.');
$language = \Drupal::service('language_manager')->getLanguage($langcode);
@@ -100,7 +100,7 @@ public function testLanguageList() {
'label' => $name,
];
$this->drupalPostForm('admin/config/regional/language/edit/' . $langcode, $edit, t('Save language'));
- $this->assertRaw($name, 'The language has been updated.');
+ $this->assertSession()->responseContains($name, 'The language has been updated.');
$this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $language])->toString());
// Change back the default language.
@@ -118,13 +118,13 @@ public function testLanguageList() {
// First test the 'cancel' link.
$this->clickLink(t('Cancel'));
$this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $english])->toString());
- $this->assertRaw($name, 'The language was not deleted.');
+ $this->assertSession()->responseContains($name, 'The language was not deleted.');
// Delete the language for real. This a confirm form, we do not need any
// fields changed.
$this->drupalPostForm('admin/config/regional/language/delete/' . $langcode, [], t('Delete'));
// We need raw here because %language and %langcode will add HTML.
$t_args = ['%language' => $name, '%langcode' => $langcode];
- $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The test language has been removed.');
+ $this->assertSession()->responseContains(t('The %language (%langcode) language has been removed.', $t_args), 'The test language has been removed.');
$this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE, 'language' => $english])->toString());
// Verify that language is no longer found.
$this->drupalGet('admin/config/regional/language/delete/' . $langcode);
@@ -136,7 +136,7 @@ public function testLanguageList() {
$this->rebuildContainer();
// We need raw here because %language and %langcode will add HTML.
$t_args = ['%language' => 'French', '%langcode' => 'fr'];
- $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The French language has been removed.');
+ $this->assertSession()->responseContains(t('The %language (%langcode) language has been removed.', $t_args), 'The French language has been removed.');
$this->assertUrl(Url::fromRoute('entity.configurable_language.collection', [], ['absolute' => TRUE])->toString());
// Verify that language is no longer found.
$this->drupalGet('admin/config/regional/language/delete/fr');
@@ -174,7 +174,7 @@ public function testLanguageList() {
$this->drupalPostForm('admin/config/regional/language/delete/en', [], t('Delete'));
// We need raw here because %language and %langcode will add HTML.
$t_args = ['%language' => 'English', '%langcode' => 'en'];
- $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The English language has been removed.');
+ $this->assertSession()->responseContains(t('The %language (%langcode) language has been removed.', $t_args), 'The English language has been removed.');
$this->rebuildContainer();
// Ensure we can't delete a locked language.
diff --git a/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php b/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
index 567ab2a25b..f048c6c1d1 100644
--- a/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
@@ -514,7 +514,7 @@ public function testLanguageDomain() {
'domain[it]' => 'it.example.com/',
];
$this->drupalPostForm('admin/config/regional/language/detection/url', $edit, t('Save configuration'));
- $this->assertRaw(t('The domain for %language may only contain the domain name, not a trailing slash, protocol and/or port.', ['%language' => 'Italian']));
+ $this->assertSession()->responseContains(t('The domain for %language may only contain the domain name, not a trailing slash, protocol and/or port.', ['%language' => 'Italian']));
// Build the link we're going to test.
$link = 'it.example.com' . rtrim(base_path(), '/') . '/admin';
diff --git a/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php b/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
index dc5ca8e46d..ddfd5c2662 100644
--- a/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
@@ -53,7 +53,7 @@ protected function setUp(): void {
// Check that drupalSettings contains path prefix.
$this->drupalGet('fr/admin/config/regional/language/detection');
- $this->assertRaw('"pathPrefix":"fr\/"', 'drupalSettings path prefix contains language code.');
+ $this->assertSession()->responseContains('"pathPrefix":"fr\/"', 'drupalSettings path prefix contains language code.');
}
/**
diff --git a/core/modules/link/tests/src/Functional/LinkFieldTest.php b/core/modules/link/tests/src/Functional/LinkFieldTest.php
index b78fe175bc..21d1117472 100644
--- a/core/modules/link/tests/src/Functional/LinkFieldTest.php
+++ b/core/modules/link/tests/src/Functional/LinkFieldTest.php
@@ -105,7 +105,7 @@ public function testURLValidation() {
// Display creation form.
$this->drupalGet('entity_test/add');
$this->assertFieldByName("{$field_name}[0][uri]", '', 'Link URL field is displayed');
- $this->assertRaw('placeholder="http://example.com"');
+ $this->assertSession()->responseContains('placeholder="http://example.com"');
// Create a path alias.
$this->createPathAlias('/admin', '/a/path/alias');
@@ -221,7 +221,7 @@ protected function assertValidEntries($field_name, array $valid_entries) {
preg_match('|entity_test/manage/(\d+)|', $this->getUrl(), $match);
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
- $this->assertRaw('"' . $string . '"');
+ $this->assertSession()->responseContains('"' . $string . '"');
}
}
@@ -294,14 +294,14 @@ public function testLinkTitle() {
// Assert label is shown.
$this->assertText('Read more about this entity');
$this->assertFieldByName("{$field_name}[0][uri]", '', 'URL field found.');
- $this->assertRaw('placeholder="http://example.com"');
+ $this->assertSession()->responseContains('placeholder="http://example.com"');
if ($title_setting === DRUPAL_DISABLED) {
$this->assertNoFieldByName("{$field_name}[0][title]", '', 'Link text field not found.');
$this->assertNoRaw('placeholder="Enter the text for this link"');
}
else {
- $this->assertRaw('placeholder="Enter the text for this link"');
+ $this->assertSession()->responseContains('placeholder="Enter the text for this link"');
$this->assertFieldByName("{$field_name}[0][title]", '', 'Link text field found.');
if ($title_setting === DRUPAL_OPTIONAL) {
diff --git a/core/modules/link/tests/src/Functional/Views/LinkViewsTokensTest.php b/core/modules/link/tests/src/Functional/Views/LinkViewsTokensTest.php
index 6a4227f78c..8a9afadb92 100644
--- a/core/modules/link/tests/src/Functional/Views/LinkViewsTokensTest.php
+++ b/core/modules/link/tests/src/Functional/Views/LinkViewsTokensTest.php
@@ -86,17 +86,17 @@ public function testLinkViewsTokens() {
foreach ($uris as $uri => $title) {
// Formatted link: {{ field_link }}
- $this->assertRaw("Formated:
$title ");
+ $this->assertSession()->responseContains("Formated:
$title ");
// Raw uri: {{ field_link__uri }}
- $this->assertRaw("Raw uri: $uri");
+ $this->assertSession()->responseContains("Raw uri: $uri");
// Raw title: {{ field_link__title }}
- $this->assertRaw("Raw title: $title");
+ $this->assertSession()->responseContains("Raw title: $title");
// Raw options: {{ field_link__options }}
// Options is an array and should return empty after token replace.
- $this->assertRaw("Raw options: .");
+ $this->assertSession()->responseContains("Raw options: .");
}
}
diff --git a/core/modules/locale/tests/src/Functional/LocaleContentTest.php b/core/modules/locale/tests/src/Functional/LocaleContentTest.php
index 09459f9e8e..71f0a1e21c 100644
--- a/core/modules/locale/tests/src/Functional/LocaleContentTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleContentTest.php
@@ -88,7 +88,7 @@ public function testContentTypeLanguageConfiguration() {
'language_configuration[language_alterable]' => TRUE,
];
$this->drupalPostForm("admin/structure/types/manage/{$type2->id()}", $edit, t('Save content type'));
- $this->assertRaw(t('The content type %type has been updated.', ['%type' => $type2->label()]));
+ $this->assertSession()->responseContains(t('The content type %type has been updated.', ['%type' => $type2->label()]));
$this->drupalLogout();
\Drupal::languageManager()->reset();
@@ -118,7 +118,7 @@ public function testContentTypeLanguageConfiguration() {
// Edit the content and ensure correct language is selected.
$path = 'node/' . $node->id() . '/edit';
$this->drupalGet($path);
- $this->assertRaw('
' . $name . ' ', 'Correct language selected.');
+ $this->assertSession()->responseContains('
' . $name . ' ', 'Correct language selected.');
// Ensure we can change the node language.
$edit = [
'langcode[0][value]' => 'en',
@@ -164,7 +164,7 @@ public function testContentTypeDirLang() {
'language_configuration[language_alterable]' => TRUE,
];
$this->drupalPostForm("admin/structure/types/manage/{$type->id()}", $edit, t('Save content type'));
- $this->assertRaw(t('The content type %type has been updated.', ['%type' => $type->label()]));
+ $this->assertSession()->responseContains(t('The content type %type has been updated.', ['%type' => $type->label()]));
$this->drupalLogout();
// Log in as web user to add new node.
diff --git a/core/modules/locale/tests/src/Functional/LocaleExportTest.php b/core/modules/locale/tests/src/Functional/LocaleExportTest.php
index 093e2e992d..c4bef89055 100644
--- a/core/modules/locale/tests/src/Functional/LocaleExportTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleExportTest.php
@@ -64,9 +64,9 @@ public function testExportTranslation() {
], t('Export'));
// Ensure we have a translation file.
- $this->assertRaw('# French translation of Drupal', 'Exported French translation file.');
+ $this->assertSession()->responseContains('# French translation of Drupal', 'Exported French translation file.');
// Ensure our imported translations exist in the file.
- $this->assertRaw('msgstr "lundi"', 'French translations present in exported file.');
+ $this->assertSession()->responseContains('msgstr "lundi"', 'French translations present in exported file.');
// Import some more French translations which will be marked as customized.
$name = $file_system->tempnam('temporary://', "po2_") . '.po';
@@ -94,9 +94,9 @@ public function testExportTranslation() {
], t('Export'));
// Ensure we have a translation file.
- $this->assertRaw('# French translation of Drupal', 'Exported French translation file with only customized strings.');
+ $this->assertSession()->responseContains('# French translation of Drupal', 'Exported French translation file with only customized strings.');
// Ensure the customized translations exist in the file.
- $this->assertRaw('msgstr "janvier"', 'French custom translation present in exported file.');
+ $this->assertSession()->responseContains('msgstr "janvier"', 'French custom translation present in exported file.');
// Ensure no untranslated strings exist in the file.
$this->assertNoRaw('msgid "February"', 'Untranslated string not present in exported file.');
@@ -109,11 +109,11 @@ public function testExportTranslation() {
], t('Export'));
// Ensure we have a translation file.
- $this->assertRaw('# French translation of Drupal', 'Exported French translation file with only untranslated strings.');
+ $this->assertSession()->responseContains('# French translation of Drupal', 'Exported French translation file with only untranslated strings.');
// Ensure no customized translations exist in the file.
$this->assertNoRaw('msgstr "janvier"', 'French custom translation not present in exported file.');
// Ensure the untranslated strings exist in the file, and with right quotes.
- $this->assertRaw($this->getUntranslatedString(), 'Empty string present in exported file.');
+ $this->assertSession()->responseContains($this->getUntranslatedString(), 'Empty string present in exported file.');
}
/**
@@ -127,7 +127,7 @@ public function testExportTranslationTemplateFile() {
// Get the translation template file.
$this->drupalPostForm('admin/config/regional/translate/export', [], t('Export'));
// Ensure we have a translation file.
- $this->assertRaw('# LANGUAGE translation of PROJECT', 'Exported translation template file.');
+ $this->assertSession()->responseContains('# LANGUAGE translation of PROJECT', 'Exported translation template file.');
}
/**
diff --git a/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php b/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
index 5ed2632e3e..feaccc3683 100644
--- a/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
@@ -77,10 +77,10 @@ public function testStandalonePoFile() {
]);
$this->config('locale.settings');
// The import should automatically create the corresponding language.
- $this->assertRaw(t('The language %language has been created.', ['%language' => 'French']), 'The language has been automatically created.');
+ $this->assertSession()->responseContains(t('The language %language has been created.', ['%language' => 'French']), 'The language has been automatically created.');
// The import should have created 8 strings.
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 8, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 8, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
// This import should have saved plural forms to have 2 variants.
$locale_plurals = \Drupal::service('locale.plural.formula')->getNumberOfPlurals('fr');
@@ -95,10 +95,10 @@ public function testStandalonePoFile() {
]);
// The import should have created 1 string and rejected 2.
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
$skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML.
See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML. See the log for details.', [':url' => Url::fromRoute('dblog.overview')->toString()]);
- $this->assertRaw($skip_message, 'Unsafe strings were skipped.');
+ $this->assertSession()->responseContains($skip_message, 'Unsafe strings were skipped.');
// Repeat the process with a user that can access site reports, and this
// time the different warnings must contain links to the log.
@@ -110,7 +110,7 @@ public function testStandalonePoFile() {
]);
$skip_message = \Drupal::translation()->formatPlural(2, 'One translation string was skipped because of disallowed or malformed HTML.
See the log for details.', '@count translation strings were skipped because of disallowed or malformed HTML.
See the log for details.', [':url' => Url::fromRoute('dblog.overview')->toString()]);
- $this->assertRaw($skip_message, 'Unsafe strings were skipped.');
+ $this->assertSession()->responseContains($skip_message, 'Unsafe strings were skipped.');
// Check empty files import with a user that cannot access site reports..
$this->drupalLogin($this->adminUser);
@@ -119,7 +119,7 @@ public function testStandalonePoFile() {
'langcode' => 'fr',
]);
// The import should have created 0 string and rejected 0.
- $this->assertRaw(t('One translation file could not be imported. See the log for details.'), 'The empty translation file import reported no translations imported.');
+ $this->assertSession()->responseContains(t('One translation file could not be imported. See the log for details.'), 'The empty translation file import reported no translations imported.');
// Repeat the process with a user that can access site reports, and this
// time the different warnings must contain links to the log.
@@ -129,7 +129,7 @@ public function testStandalonePoFile() {
'langcode' => 'fr',
]);
// The import should have created 0 string and rejected 0.
- $this->assertRaw(t('One translation file could not be imported.
See the log for details.', [':url' => Url::fromRoute('dblog.overview')->toString()]), 'The empty translation file import reported no translations imported.');
+ $this->assertSession()->responseContains(t('One translation file could not be imported.
See the log for details.', [':url' => Url::fromRoute('dblog.overview')->toString()]), 'The empty translation file import reported no translations imported.');
// Try importing a .po file which doesn't exist.
$name = $this->randomMachineName(16);
@@ -147,7 +147,7 @@ public function testStandalonePoFile() {
]);
// The import should have created 1 string.
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
// Ensure string wasn't overwritten.
$search = [
'string' => 'Montag',
@@ -169,7 +169,7 @@ public function testStandalonePoFile() {
]);
// The import should have updated 2 strings.
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 2, '%delete' => 0]), 'The translation file was successfully imported.');
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 2, '%delete' => 0]), 'The translation file was successfully imported.');
// Ensure string was overwritten.
$search = [
'string' => 'Montag',
@@ -189,7 +189,7 @@ public function testStandalonePoFile() {
]);
// The import should have created 6 strings.
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 6, '%update' => 0, '%delete' => 0]), 'The customized translation file was successfully imported.');
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 6, '%update' => 0, '%delete' => 0]), 'The customized translation file was successfully imported.');
// The database should now contain 6 customized strings (two imported
// strings are not translated).
@@ -205,7 +205,7 @@ public function testStandalonePoFile() {
]);
// The import should have created 1 string.
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The customized translation file was successfully imported.');
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The customized translation file was successfully imported.');
// Ensure string wasn't overwritten.
$search = [
'string' => 'januari',
@@ -224,7 +224,7 @@ public function testStandalonePoFile() {
]);
// The import should have updated 2 strings.
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 2, '%delete' => 0]), 'The customized translation file was successfully imported.');
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 2, '%delete' => 0]), 'The customized translation file was successfully imported.');
// Ensure string was overwritten.
$search = [
'string' => 'januari',
@@ -262,7 +262,7 @@ public function testEmptyMsgstr() {
'langcode' => $langcode,
]);
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 1, '%update' => 0, '%delete' => 0]), 'The translation file was successfully imported.');
$this->assertIdentical((string) t('Operations', [], ['langcode' => $langcode]), 'Műveletek', 'String imported and translated.');
// Try importing a .po file.
@@ -270,7 +270,7 @@ public function testEmptyMsgstr() {
'langcode' => $langcode,
'overwrite_options[not_customized]' => TRUE,
]);
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 0, '%delete' => 1]), 'The translation file was successfully imported.');
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.', ['%number' => 0, '%update' => 0, '%delete' => 1]), 'The translation file was successfully imported.');
$str = "Operations";
$search = [
diff --git a/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php b/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
index 6b41adb08b..1e55668ef3 100644
--- a/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleJavascriptTranslationTest.php
@@ -160,8 +160,8 @@ public function testLocaleTranslationJsDependencies() {
$js_filename = $prefix . '_' . $js_translation_files[$prefix] . '.js';
$content = $this->getSession()->getPage()->getContent();
- $this->assertRaw('core/misc/drupal.js');
- $this->assertRaw($js_filename);
+ $this->assertSession()->responseContains('core/misc/drupal.js');
+ $this->assertSession()->responseContains($js_filename);
// Assert translations JS is included before drupal.js.
$this->assertTrue(strpos($content, $js_filename) < strpos($content, 'core/misc/drupal.js'), 'Translations are included before Drupal.t.');
}
diff --git a/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php b/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
index 869496ef7c..e79549a753 100644
--- a/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
+++ b/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
@@ -237,22 +237,22 @@ public function testPluralEditExport() {
'langcode' => 'fr',
], t('Export'));
// Ensure we have a translation file.
- $this->assertRaw('# French translation of Drupal', 'Exported French translation file.');
+ $this->assertSession()->responseContains('# French translation of Drupal', 'Exported French translation file.');
// Ensure our imported translations exist in the file.
- $this->assertRaw("msgid \"Monday\"\nmsgstr \"lundi\"", 'French translations present in exported file.');
+ $this->assertSession()->responseContains("msgid \"Monday\"\nmsgstr \"lundi\"", 'French translations present in exported file.');
// Check for plural export specifically.
- $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count heure\"\nmsgstr[1] \"@count heures\"", 'Plural translations exported properly.');
+ $this->assertSession()->responseContains("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count heure\"\nmsgstr[1] \"@count heures\"", 'Plural translations exported properly.');
// Get the Croatian translations.
$this->drupalPostForm('admin/config/regional/translate/export', [
'langcode' => 'hr',
], t('Export'));
// Ensure we have a translation file.
- $this->assertRaw('# Croatian translation of Drupal', 'Exported Croatian translation file.');
+ $this->assertSession()->responseContains('# Croatian translation of Drupal', 'Exported Croatian translation file.');
// Ensure our imported translations exist in the file.
- $this->assertRaw("msgid \"Monday\"\nmsgstr \"Ponedjeljak\"", 'Croatian translations present in exported file.');
+ $this->assertSession()->responseContains("msgid \"Monday\"\nmsgstr \"Ponedjeljak\"", 'Croatian translations present in exported file.');
// Check for plural export specifically.
- $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count sat\"\nmsgstr[1] \"@count sata\"\nmsgstr[2] \"@count sati\"", 'Plural translations exported properly.');
+ $this->assertSession()->responseContains("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count sat\"\nmsgstr[1] \"@count sata\"\nmsgstr[2] \"@count sati\"", 'Plural translations exported properly.');
// Check if the source appears on the translation page.
$this->drupalGet('admin/config/regional/translate');
@@ -338,16 +338,16 @@ public function testPluralEditExport() {
'langcode' => 'fr',
], t('Export'));
// Check for plural export specifically.
- $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count heure edited\"\nmsgstr[1] \"@count heures\"", 'Edited French plural translations for hours exported properly.');
- $this->assertRaw("msgid \"1 day\"\nmsgid_plural \"@count days\"\nmsgstr[0] \"1 jour\"\nmsgstr[1] \"@count jours\"", 'Added French plural translations for days exported properly.');
+ $this->assertSession()->responseContains("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count heure edited\"\nmsgstr[1] \"@count heures\"", 'Edited French plural translations for hours exported properly.');
+ $this->assertSession()->responseContains("msgid \"1 day\"\nmsgid_plural \"@count days\"\nmsgstr[0] \"1 jour\"\nmsgstr[1] \"@count jours\"", 'Added French plural translations for days exported properly.');
// Get the Croatian translations.
$this->drupalPostForm('admin/config/regional/translate/export', [
'langcode' => 'hr',
], t('Export'));
// Check for plural export specifically.
- $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count sat\"\nmsgstr[1] \"@count sata edited\"\nmsgstr[2] \"@count sati\"", 'Edited Croatian plural translations exported properly.');
- $this->assertRaw("msgid \"1 day\"\nmsgid_plural \"@count days\"\nmsgstr[0] \"@count dan\"\nmsgstr[1] \"@count dana\"\nmsgstr[2] \"@count dana\"", 'Added Croatian plural translations exported properly.');
+ $this->assertSession()->responseContains("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count sat\"\nmsgstr[1] \"@count sata edited\"\nmsgstr[2] \"@count sati\"", 'Edited Croatian plural translations exported properly.');
+ $this->assertSession()->responseContains("msgid \"1 day\"\nmsgid_plural \"@count days\"\nmsgstr[0] \"@count dan\"\nmsgstr[1] \"@count dana\"\nmsgstr[2] \"@count dana\"", 'Added Croatian plural translations exported properly.');
}
/**
diff --git a/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php b/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
index d002423a05..ea7bd50a69 100644
--- a/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
@@ -93,7 +93,7 @@ public function testTranslatedUpdate() {
$this->drupalGet($update_url . '/selection', ['external' => TRUE]);
$this->updateRequirementsProblem();
$this->drupalGet($update_url . '/selection', ['external' => TRUE]);
- $this->assertRaw('messages--status', 'No pending updates.');
+ $this->assertSession()->responseContains('messages--status', 'No pending updates.');
$this->assertNoLinkByHref('fr/update.php/run', 'No link to run updates.');
}
diff --git a/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php b/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
index e7b9258b83..c9e8cb53e5 100644
--- a/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
@@ -68,7 +68,7 @@ public function testStringTranslation() {
t($name, [], ['langcode' => $langcode])->render();
// Reset locale cache.
$this->container->get('string_translation')->reset();
- $this->assertRaw('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
+ $this->assertSession()->responseContains('"edit-languages-' . $langcode . '-weight"', 'Language code found.');
$this->assertText(t($name), 'Test language added.');
$this->drupalLogout();
@@ -110,7 +110,7 @@ public function testStringTranslation() {
'translation' => 'translated',
];
$this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
- $this->assertRaw($translation, 'Non-English translation properly saved.');
+ $this->assertSession()->responseContains($translation, 'Non-English translation properly saved.');
$search = [
'string' => $name,
@@ -130,7 +130,7 @@ public function testStringTranslation() {
'translation' => 'translated',
];
$this->drupalPostForm('admin/config/regional/translate', $search, t('Filter'));
- $this->assertRaw($translation_to_en, 'English translation properly saved.');
+ $this->assertSession()->responseContains($translation_to_en, 'English translation properly saved.');
$this->assertTrue($name != $translation && t($name, [], ['langcode' => $langcode]) == $translation, 't() works for non-English.');
// Refresh the locale() cache to get fresh data from t() below. We are in
@@ -179,7 +179,7 @@ public function testStringTranslation() {
$this->drupalPostForm($path, [], t('Delete'));
// We need raw here because %language and %langcode will add HTML.
$t_args = ['%language' => $name, '%langcode' => $langcode];
- $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args), 'The test language has been removed.');
+ $this->assertSession()->responseContains(t('The %language (%langcode) language has been removed.', $t_args), 'The test language has been removed.');
// Reload to remove $name.
$this->drupalGet($path);
// Verify that language is no longer found.
@@ -201,7 +201,7 @@ public function testStringTranslation() {
$lid => '',
];
$this->drupalPostForm('admin/config/regional/translate', $edit, t('Save translations'));
- $this->assertRaw($name, 'The strings have been saved.');
+ $this->assertSession()->responseContains($name, 'The strings have been saved.');
$this->drupalLogin($translate_user);
$search = [
'string' => $name,
diff --git a/core/modules/locale/tests/src/Functional/LocaleUpdateInterfaceTest.php b/core/modules/locale/tests/src/Functional/LocaleUpdateInterfaceTest.php
index 99114f56d5..40a3c5b74b 100644
--- a/core/modules/locale/tests/src/Functional/LocaleUpdateInterfaceTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleUpdateInterfaceTest.php
@@ -46,7 +46,7 @@ public function testInterface() {
$this->assertNoText(t('Translation update status'), 'No status message');
$this->drupalGet('admin/reports/translations');
- $this->assertRaw(t('No translatable languages available.
Add a language first.', [':add_language' => Url::fromRoute('entity.configurable_language.collection')->toString()]), 'Language message');
+ $this->assertSession()->responseContains(t('No translatable languages available.
Add a language first.', [':add_language' => Url::fromRoute('entity.configurable_language.collection')->toString()]), 'Language message');
// Add German language.
$this->addLanguage('de');
@@ -71,7 +71,7 @@ public function testInterface() {
// Check if updates are available for German.
$this->drupalGet('admin/reports/status');
$this->assertText(t('Translation update status'), 'Status message');
- $this->assertRaw(t('Updates available for: @languages. See the
Available translation updates page for more information.', ['@languages' => t('German'), ':updates' => Url::fromRoute('locale.translate_status')->toString()]), 'Updates available message');
+ $this->assertSession()->responseContains(t('Updates available for: @languages. See the
Available translation updates page for more information.', ['@languages' => t('German'), ':updates' => Url::fromRoute('locale.translate_status')->toString()]), 'Updates available message');
$this->drupalGet('admin/reports/translations');
$this->assertText(t('Updates for: @modules', ['@modules' => 'Locale test translate']), 'Translations available');
@@ -85,7 +85,7 @@ public function testInterface() {
// Check if no updates were found.
$this->drupalGet('admin/reports/status');
$this->assertText(t('Translation update status'), 'Status message');
- $this->assertRaw(t('Missing translations for: @languages. See the
Available translation updates page for more information.', ['@languages' => t('German'), ':updates' => Url::fromRoute('locale.translate_status')->toString()]), 'Missing translations message');
+ $this->assertSession()->responseContains(t('Missing translations for: @languages. See the
Available translation updates page for more information.', ['@languages' => t('German'), ':updates' => Url::fromRoute('locale.translate_status')->toString()]), 'Missing translations message');
$this->drupalGet('admin/reports/translations');
$this->assertText(t('Missing translations for one project'), 'No translations found');
$release_details = new FormattableMarkup('@module (@version). @info', [
@@ -93,7 +93,7 @@ public function testInterface() {
'@version' => '1.3-dev',
'@info' => t('File not found at %local_path', ['%local_path' => 'core/modules/locale/tests/test.de.po']),
]);
- $this->assertRaw($release_details->__toString(), 'Release details');
+ $this->assertSession()->responseContains($release_details->__toString(), 'Release details');
// Override Drupal core translation status as 'no translations found'.
$status = locale_translation_get_status();
diff --git a/core/modules/locale/tests/src/Functional/LocaleUpdateTest.php b/core/modules/locale/tests/src/Functional/LocaleUpdateTest.php
index 7c470056a5..70ec66cb48 100644
--- a/core/modules/locale/tests/src/Functional/LocaleUpdateTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleUpdateTest.php
@@ -121,7 +121,7 @@ public function testUpdateImportSourceRemote() {
$this->drupalGet('admin/reports/translations/check');
// Check the status on the Available translation status page.
- $this->assertRaw('
Update German ', 'German language found');
+ $this->assertSession()->responseContains('
Update German ', 'German language found');
$this->assertText('Updates for: Contributed module one, Contributed module two, Custom module one, Locale test', 'Updates found');
/** @var \Drupal\Core\Datetime\DateFormatterInterface $date_formatter */
$date_formatter = $this->container->get('date.formatter');
@@ -302,7 +302,7 @@ public function testEnableUninstallModule() {
$this->drupalPostForm('admin/modules', $edit, t('Install'));
// Check if translations have been imported.
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
['%number' => 7, '%update' => 0, '%delete' => 0]), 'One translation file imported.');
$this->assertTranslation('Tuesday', 'Dienstag', 'de');
@@ -347,7 +347,7 @@ public function testEnableLanguage() {
$this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
// Check if the right number of translations are added.
- $this->assertRaw(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
+ $this->assertSession()->responseContains(t('One translation file imported. %number translations were added, %update translations were updated and %delete translations were removed.',
['%number' => 8, '%update' => 0, '%delete' => 0]), 'One language added.');
$this->assertTranslation('Extraday', 'extra dag', 'nl');
diff --git a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php
index ae9ab1416a..5f9d8ea9c8 100644
--- a/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php
+++ b/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php
@@ -177,7 +177,7 @@ public function testMediaOEmbedVideoSource() {
// 'view media' permission.
$this->drupalGet('media/oembed', ['query' => $query]);
$assert_session->pageTextContains('By the power of Greyskull, Vimeo works!');
- $this->assertRaw('core/themes/stable/templates/content/media-oembed-iframe.html.twig');
+ $this->assertSession()->responseContains('core/themes/stable/templates/content/media-oembed-iframe.html.twig');
$this->assertNoRaw('core/modules/media/templates/media-oembed-iframe.html.twig');
// Test themes not inheriting from stable.
@@ -186,7 +186,7 @@ public function testMediaOEmbedVideoSource() {
$this->drupalGet('media/oembed', ['query' => $query]);
$assert_session->pageTextContains('By the power of Greyskull, Vimeo works!');
$this->assertNoRaw('core/themes/stable/templates/content/media-oembed-iframe.html.twig');
- $this->assertRaw('core/modules/media/templates/media-oembed-iframe.html.twig');
+ $this->assertSession()->responseContains('core/modules/media/templates/media-oembed-iframe.html.twig');
// Remove the 'view media' permission to test that this restricts access.
$role = Role::load(AccountInterface::ANONYMOUS_ROLE);
diff --git a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
index 3769a8dadb..929accc4ad 100644
--- a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentDeleteFormTest.php
@@ -51,7 +51,7 @@ public function testMenuLinkContentDeleteForm() {
$menu_link = MenuLinkContent::load(1);
$this->drupalGet($menu_link->toUrl('delete-form'));
- $this->assertRaw(t('Are you sure you want to delete the custom menu link %name?', ['%name' => $menu_link->label()]));
+ $this->assertSession()->responseContains(t('Are you sure you want to delete the custom menu link %name?', ['%name' => $menu_link->label()]));
$this->assertLink(t('Cancel'));
// Make sure cancel link points to link edit
$this->assertLinkByHref($menu_link->toUrl('edit-form')->toString());
@@ -64,7 +64,7 @@ public function testMenuLinkContentDeleteForm() {
$menu = Menu::load($menu_link->getMenuName());
$this->assertLinkByHref($menu->toUrl('edit-form')->toString());
$this->drupalPostForm(NULL, [], t('Delete'));
- $this->assertRaw(t('The menu link %title has been deleted.', ['%title' => $menu_link->label()]));
+ $this->assertSession()->responseContains(t('The menu link %title has been deleted.', ['%title' => $menu_link->label()]));
}
}
diff --git a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
index 1e590223ad..ccd3633aff 100644
--- a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentFormTest.php
@@ -84,7 +84,7 @@ public function testMenuLinkContentForm() {
$this->assertNotEmpty($element, 'A default menu parent was found.');
$this->assertEqual('admin:', $element[0]->getValue(), '
menu is the parent.');
// Test that the field description is present.
- $this->assertRaw('The location this menu link points to.');
+ $this->assertSession()->responseContains('The location this menu link points to.');
$this->drupalPostForm(
NULL,
diff --git a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
index 0087b79027..4c3dd96cdd 100644
--- a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
@@ -98,9 +98,9 @@ public function testTranslationLinkTheme() {
$edit['admin_theme'] = 'seven';
$this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
$this->drupalGet('admin/structure/menu/item/' . $entityId . '/edit');
- $this->assertRaw('core/themes/seven/css/base/elements.css', 'Edit uses admin theme.');
+ $this->assertSession()->responseContains('core/themes/seven/css/base/elements.css', 'Edit uses admin theme.');
$this->drupalGet('admin/structure/menu/item/' . $entityId . '/edit/translations');
- $this->assertRaw('core/themes/seven/css/base/elements.css', 'Translation uses admin theme as well.');
+ $this->assertSession()->responseContains('core/themes/seven/css/base/elements.css', 'Translation uses admin theme as well.');
}
/**
@@ -124,7 +124,7 @@ protected function doTestTranslationEdit() {
'@title' => $entity->getTranslation($langcode)->label(),
'%language' => $languages[$langcode]->getName(),
]);
- $this->assertRaw($title);
+ $this->assertSession()->responseContains($title);
}
}
}
diff --git a/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php b/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
index 256f175775..7008885cd9 100644
--- a/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
@@ -121,7 +121,7 @@ public function testMenuNodeFormWidget() {
'menu_parent' => 'main:',
];
$this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
- $this->assertRaw(t('The content type %name has been updated.', ['%name' => 'Basic page']));
+ $this->assertSession()->responseContains(t('The content type %name has been updated.', ['%name' => 'Basic page']));
// Test that we can preview a node that will create a menu item.
$edit = [
diff --git a/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php b/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
index 55fe2f41ad..d6cd457ced 100644
--- a/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
+++ b/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
@@ -180,14 +180,14 @@ public function addCustomMenuCRUD() {
// Assert the new menu.
$this->drupalGet('admin/structure/menu/manage/' . $menu_name);
- $this->assertRaw($label, 'Custom menu was added.');
+ $this->assertSession()->responseContains($label, 'Custom menu was added.');
// Edit the menu.
$new_label = $this->randomMachineName(16);
$menu->set('label', $new_label);
$menu->save();
$this->drupalGet('admin/structure/menu/manage/' . $menu_name);
- $this->assertRaw($new_label, 'Custom menu was edited.');
+ $this->assertSession()->responseContains($new_label, 'Custom menu was edited.');
}
/**
@@ -210,7 +210,7 @@ public function addCustomMenu() {
// Verify that using a menu_name that is too long results in a validation
// message.
- $this->assertRaw(t('@name cannot be longer than %max characters but is currently %length characters long.', [
+ $this->assertSession()->responseContains(t('@name cannot be longer than %max characters but is currently %length characters long.', [
'@name' => t('Menu name'),
'%max' => MenuStorage::MAX_ID_LENGTH,
'%length' => mb_strlen($menu_name),
@@ -228,7 +228,7 @@ public function addCustomMenu() {
'%length' => mb_strlen($menu_name),
]));
// Verify that the confirmation message is displayed.
- $this->assertRaw(t('Menu %label has been added.', ['%label' => $label]));
+ $this->assertSession()->responseContains(t('Menu %label has been added.', ['%label' => $label]));
$this->drupalGet('admin/structure/menu');
$this->assertText($label, 'Menu created');
@@ -256,7 +256,7 @@ public function deleteCustomMenu() {
// Delete custom menu.
$this->drupalPostForm("admin/structure/menu/manage/$menu_name/delete", [], t('Delete'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('The menu %title has been deleted.', ['%title' => $label]), 'Custom menu was deleted');
+ $this->assertSession()->responseContains(t('The menu %title has been deleted.', ['%title' => $label]), 'Custom menu was deleted');
$this->assertNull(Menu::load($menu_name), 'Custom menu was deleted');
// Test if all menu links associated with the menu were removed from
// database.
@@ -293,7 +293,7 @@ public function doMenuTests() {
$this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name]));
// Test the 'Delete' operation.
$this->clickLink(t('Delete'));
- $this->assertRaw(t('Are you sure you want to delete the custom menu link %item?', ['%item' => $link_title]));
+ $this->assertSession()->responseContains(t('Are you sure you want to delete the custom menu link %item?', ['%item' => $link_title]));
$this->drupalPostForm(NULL, [], t('Delete'));
$this->assertUrl(Url::fromRoute('entity.menu.edit_form', ['menu' => $menu_name]));
@@ -637,7 +637,7 @@ public function addInvalidMenuLink() {
'title[0][value]' => 'title',
];
$this->drupalPostForm("admin/structure/menu/manage/{$this->menu->id()}/add", $edit, t('Save'));
- $this->assertRaw(t("The path '@link_path' is inaccessible.", ['@link_path' => $link_path]), 'Menu link was not created');
+ $this->assertSession()->responseContains(t("The path '@link_path' is inaccessible.", ['@link_path' => $link_path]), 'Menu link was not created');
}
}
@@ -777,7 +777,7 @@ public function resetMenuLink(MenuLinkInterface $menu_link, $old_weight) {
// Reset menu link.
$this->drupalPostForm("admin/structure/menu/link/{$menu_link->getPluginId()}/reset", [], t('Reset'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('The menu link was reset to its default settings.'), 'Menu link was reset');
+ $this->assertSession()->responseContains(t('The menu link was reset to its default settings.'), 'Menu link was reset');
// Verify menu link.
$instance = \Drupal::service('plugin.manager.menu.link')->createInstance($menu_link->getPluginId());
@@ -797,7 +797,7 @@ public function deleteMenuLink(MenuLinkContent $item) {
// Delete menu link.
$this->drupalPostForm("admin/structure/menu/item/$mlid/delete", [], t('Delete'));
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('The menu link %title has been deleted.', ['%title' => $title]), 'Menu link was deleted');
+ $this->assertSession()->responseContains(t('The menu link %title has been deleted.', ['%title' => $title]), 'Menu link was deleted');
// Verify deletion.
$this->drupalGet('');
diff --git a/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php b/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
index 53ac68709c..d0a97e9d22 100644
--- a/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
@@ -114,7 +114,7 @@ public function testNodeAccessAdministerField() {
// Confirm that the new default value appears when creating a new node.
$this->drupalGet('node/add/page');
- $this->assertRaw($default, 'The updated default value is displayed when creating a new node.');
+ $this->assertSession()->responseContains($default, 'The updated default value is displayed when creating a new node.');
}
}
diff --git a/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php b/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
index ffb2b77678..d9f9486263 100644
--- a/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
+++ b/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
@@ -66,7 +66,7 @@ public function testCommentPager() {
$this->drupalGet('node/' . $node->id());
$this->assertText($node->label());
$this->assertText(t('Comments'));
- $this->assertRaw('page=1');
+ $this->assertSession()->responseContains('page=1');
$this->assertNoRaw('page=2');
}
@@ -98,7 +98,7 @@ public function testForumPager() {
// page there should be two pages for 30 nodes, no more.
$this->drupalLogin($this->webUser);
$this->drupalGet('forum/' . $tid);
- $this->assertRaw('page=1');
+ $this->assertSession()->responseContains('page=1');
$this->assertNoRaw('page=2');
}
diff --git a/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php b/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
index 11c646df8c..e7e2d0bd17 100644
--- a/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
+++ b/core/modules/node/tests/src/Functional/NodeActionsConfigurationTest.php
@@ -76,7 +76,7 @@ public function testAssignOwnerNodeActionConfiguration() {
$this->assertSession()->statusCodeEquals(200);
// Make sure that the action was actually deleted.
- $this->assertRaw(t('The action %action has been deleted.', ['%action' => $new_action_label]), 'The delete confirmation message appears after deleting the node_assign_owner_action action.');
+ $this->assertSession()->responseContains(t('The action %action has been deleted.', ['%action' => $new_action_label]), 'The delete confirmation message appears after deleting the node_assign_owner_action action.');
$this->drupalGet('admin/config/system/actions');
$this->assertSession()->statusCodeEquals(200);
$this->assertNoText($new_action_label, 'The label for the node_assign_owner_action action does not appear on the actions administration page after deleting.');
diff --git a/core/modules/node/tests/src/Functional/NodeEditFormTest.php b/core/modules/node/tests/src/Functional/NodeEditFormTest.php
index fea180f3ae..7f9a5ef1d3 100644
--- a/core/modules/node/tests/src/Functional/NodeEditFormTest.php
+++ b/core/modules/node/tests/src/Functional/NodeEditFormTest.php
@@ -79,7 +79,7 @@ public function testNodeEdit() {
// Check that the title and body fields are displayed with the correct values.
// @todo Ideally assertLink would support HTML, but it doesn't.
- $this->assertRaw('Edit(active tab) ', 'Edit tab found and marked active.');
+ $this->assertSession()->responseContains('Edit(active tab) ', 'Edit tab found and marked active.');
$this->assertFieldByName($title_key, $edit[$title_key], 'Title field displayed.');
$this->assertFieldByName($body_key, $edit[$body_key], 'Body field displayed.');
@@ -131,7 +131,7 @@ public function testNodeEdit() {
$open_details_elements = count($this->cssSelect('details[open="open"]'));
$this->drupalPostForm(NULL, $edit, t('Save'));
// The node author details must be open.
- $this->assertRaw('');
+ $this->assertSession()->responseContains('');
// Only one extra details element should now be open.
$open_details_elements++;
$this->assertEqual(count($this->cssSelect('details[open="open"]')), $open_details_elements, 'Exactly one extra open <details> element found.');
@@ -255,7 +255,7 @@ protected function checkVariousAuthoredByValues(NodeInterface $node, $form_eleme
$form_element_name => 'invalid-name',
];
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Save'));
- $this->assertRaw(t('There are no entities matching "%name".', ['%name' => 'invalid-name']));
+ $this->assertSession()->responseContains(t('There are no entities matching "%name".', ['%name' => 'invalid-name']));
// Change the authored by field to an empty string, which should assign
// authorship to the anonymous user (uid 0).
diff --git a/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php b/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
index 61c7c5caa7..f856ab8380 100644
--- a/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
+++ b/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void {
'language_configuration[language_alterable]' => TRUE,
];
$this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type'));
- $this->assertRaw(t('The content type %type has been updated.', ['%type' => 'Basic page']), 'Basic page content type has been updated.');
+ $this->assertSession()->responseContains(t('The content type %type has been updated.', ['%type' => 'Basic page']), 'Basic page content type has been updated.');
// Make node body translatable.
$field_storage = FieldStorageConfig::loadByName('node', 'body');
@@ -96,10 +96,10 @@ public function testMultilingualNodeForm() {
// Test multilingual field language fallback logic.
$this->drupalGet("it/node/{$node->id()}");
- $this->assertRaw($body_value, 'Body correctly displayed using Italian as requested language');
+ $this->assertSession()->responseContains($body_value, 'Body correctly displayed using Italian as requested language');
$this->drupalGet("node/{$node->id()}");
- $this->assertRaw($body_value, 'Body correctly displayed using English as requested language');
+ $this->assertSession()->responseContains($body_value, 'Body correctly displayed using English as requested language');
}
/**
diff --git a/core/modules/node/tests/src/Functional/NodeRSSContentTest.php b/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
index b36b032735..323839dfba 100644
--- a/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
@@ -58,8 +58,8 @@ public function testNodeRSSContent() {
// Check that extra RSS elements and namespaces are added to RSS feed.
$test_element = '' . t('Value of testElement RSS element for node @nid.', ['@nid' => $node->id()]) . ' ';
$test_ns = 'xmlns:drupaltest="http://example.com/test-namespace"';
- $this->assertRaw($test_element, 'Extra RSS elements appear in RSS feed.');
- $this->assertRaw($test_ns, 'Extra namespaces appear in RSS feed.');
+ $this->assertSession()->responseContains($test_element, 'Extra RSS elements appear in RSS feed.');
+ $this->assertSession()->responseContains($test_ns, 'Extra namespaces appear in RSS feed.');
// Check that content added in 'rss' view mode doesn't appear when
// viewing node.
@@ -105,9 +105,9 @@ public function testUrlHandling() {
]);
$this->drupalGet('rss.xml');
- $this->assertRaw(file_create_url('public://root-relative'), 'Root-relative URL is transformed to absolute.');
- $this->assertRaw($protocol_relative_url, 'Protocol-relative URL is left untouched.');
- $this->assertRaw($absolute_url, 'Absolute URL is left untouched.');
+ $this->assertSession()->responseContains(file_create_url('public://root-relative'), 'Root-relative URL is transformed to absolute.');
+ $this->assertSession()->responseContains($protocol_relative_url, 'Protocol-relative URL is left untouched.');
+ $this->assertSession()->responseContains($absolute_url, 'Absolute URL is left untouched.');
}
}
diff --git a/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php b/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
index 5d0956b50f..75aa289a87 100644
--- a/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
@@ -149,7 +149,7 @@ public function testRevisions() {
// Confirm that revisions revert properly.
$this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/revert", [], t('Revert'));
- $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.',
+ $this->assertSession()->responseContains(t('@type %title has been reverted to the revision from %revision-date.',
[
'@type' => 'Basic page',
'%title' => $nodes[1]->getTitle(),
@@ -176,7 +176,7 @@ public function testRevisions() {
// Confirm revisions delete properly.
$this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/delete", [], t('Delete'));
- $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.',
+ $this->assertSession()->responseContains(t('Revision from %revision-date of @type %title has been deleted.',
[
'%revision-date' => $this->container->get('date.formatter')->format($nodes[1]->getRevisionCreationTime()),
'@type' => 'Basic page',
@@ -198,7 +198,7 @@ public function testRevisions() {
])
->execute();
$this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[2]->getRevisionId() . "/revert", [], t('Revert'));
- $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.', [
+ $this->assertSession()->responseContains(t('@type %title has been reverted to the revision from %revision-date.', [
'@type' => 'Basic page',
'%title' => $nodes[2]->getTitle(),
'%revision-date' => $this->container->get('date.formatter')->format($old_revision_date),
@@ -217,7 +217,7 @@ public function testRevisions() {
$this->drupalGet('node/' . $node->id() . '/revisions');
// Check that the pager exists.
- $this->assertRaw('page=1');
+ $this->assertSession()->responseContains('page=1');
// Check that the last revision is displayed on the first page.
$this->assertText(end($logs));
diff --git a/core/modules/node/tests/src/Functional/NodeRevisionsTest.php b/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
index b1daab2555..48e0f237f3 100644
--- a/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
@@ -172,7 +172,7 @@ public function testRevisions() {
// Confirm that revisions revert properly.
$this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionid() . "/revert", [], t('Revert'));
- $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.', [
+ $this->assertSession()->responseContains(t('@type %title has been reverted to the revision from %revision-date.', [
'@type' => 'Basic page',
'%title' => $nodes[1]->label(),
'%revision-date' => $this->container->get('date.formatter')->format($nodes[1]->getRevisionCreationTime()),
@@ -191,7 +191,7 @@ public function testRevisions() {
// Confirm revisions delete properly.
$this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[1]->getRevisionId() . "/delete", [], t('Delete'));
- $this->assertRaw(t('Revision from %revision-date of @type %title has been deleted.', [
+ $this->assertSession()->responseContains(t('Revision from %revision-date of @type %title has been deleted.', [
'%revision-date' => $this->container->get('date.formatter')->format($nodes[1]->getRevisionCreationTime()),
'@type' => 'Basic page',
'%title' => $nodes[1]->label(),
@@ -210,7 +210,7 @@ public function testRevisions() {
])
->execute();
$this->drupalPostForm("node/" . $node->id() . "/revisions/" . $nodes[2]->getRevisionId() . "/revert", [], t('Revert'));
- $this->assertRaw(t('@type %title has been reverted to the revision from %revision-date.', [
+ $this->assertSession()->responseContains(t('@type %title has been reverted to the revision from %revision-date.', [
'@type' => 'Basic page',
'%title' => $nodes[2]->label(),
'%revision-date' => $this->container->get('date.formatter')->format($old_revision_date),
diff --git a/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php b/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
index 75e2cb1e68..6e178451a9 100644
--- a/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRevisionsUiTest.php
@@ -120,11 +120,11 @@ public function testNodeRevisionDoubleEscapeFix() {
// Assert the old revision message.
$date = $this->container->get('date.formatter')->format($nodes[0]->revision_timestamp->value, 'short');
$url = new Url('entity.node.revision', ['node' => $nodes[0]->id(), 'node_revision' => $nodes[0]->getRevisionId()]);
- $this->assertRaw(Link::fromTextAndUrl($date, $url)->toString() . ' by ' . $editor);
+ $this->assertSession()->responseContains(Link::fromTextAndUrl($date, $url)->toString() . ' by ' . $editor);
// Assert the current revision message.
$date = $this->container->get('date.formatter')->format($nodes[1]->revision_timestamp->value, 'short');
- $this->assertRaw($nodes[1]->toLink($date)->toString() . ' by ' . $editor . '' . $revision_log . '
');
+ $this->assertSession()->responseContains($nodes[1]->toLink($date)->toString() . ' by ' . $editor . '' . $revision_log . '
');
}
/**
diff --git a/core/modules/node/tests/src/Functional/NodeTitleTest.php b/core/modules/node/tests/src/Functional/NodeTitleTest.php
index 92bf8fd126..2079171c5a 100644
--- a/core/modules/node/tests/src/Functional/NodeTitleTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTitleTest.php
@@ -98,11 +98,11 @@ public function testNodeTitle() {
// the page.
$edge_case_title_escaped = Html::escape($edge_case_title);
$this->drupalGet('node/' . $node->id());
- $this->assertRaw('' . $edge_case_title_escaped . ' | Drupal ', 'Page title is equal to article\'s "title".', 'Node');
+ $this->assertSession()->responseContains('' . $edge_case_title_escaped . ' | Drupal ', 'Page title is equal to article\'s "title".', 'Node');
// Test that the title appears as when reloading the node page.
$this->drupalGet('node/' . $node->id());
- $this->assertRaw('<title>' . $edge_case_title_escaped . ' | Drupal ', 'Page title is equal to article\'s "title".', 'Node');
+ $this->assertSession()->responseContains('' . $edge_case_title_escaped . ' | Drupal ', 'Page title is equal to article\'s "title".', 'Node');
}
diff --git a/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php b/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
index a5302e7042..36f3041e8f 100644
--- a/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
@@ -38,7 +38,7 @@ public function testNodeTitleXSS() {
$this->drupalGet('node/' . $node->id());
// Titles should be escaped.
- $this->assertRaw('' . Html::escape($title) . ' | Drupal ', 'Title is displayed when viewing a node.');
+ $this->assertSession()->responseContains('' . Html::escape($title) . ' | Drupal ', 'Title is displayed when viewing a node.');
$this->assertNoRaw($xss, 'Harmful tags are escaped when viewing a node.');
$this->drupalGet('node/' . $node->id() . '/edit');
diff --git a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
index 697be9a6de..a37e190c34 100644
--- a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
+++ b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
@@ -252,7 +252,7 @@ public function testTranslationLinkTheme() {
$edit['use_admin_theme'] = TRUE;
$this->drupalPostForm('admin/appearance', $edit, t('Save configuration'));
$this->drupalGet('node/' . $article->id() . '/translations');
- $this->assertRaw('core/themes/seven/css/base/elements.css', 'Translation uses admin theme if edit is admin.');
+ $this->assertSession()->responseContains('core/themes/seven/css/base/elements.css', 'Translation uses admin theme if edit is admin.');
// Turn off admin theme for editing, assert inheritance to translations.
$edit['use_admin_theme'] = FALSE;
@@ -466,7 +466,7 @@ protected function doTestTranslationEdit() {
'@title' => $entity->getTranslation($langcode)->label(),
'%language' => $languages[$langcode]->getName(),
]);
- $this->assertRaw($title);
+ $this->assertSession()->responseContains($title);
}
}
}
diff --git a/core/modules/node/tests/src/Functional/NodeTypeTest.php b/core/modules/node/tests/src/Functional/NodeTypeTest.php
index 3484cef5b1..a83df2f449 100644
--- a/core/modules/node/tests/src/Functional/NodeTypeTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTypeTest.php
@@ -176,7 +176,7 @@ public function testNodeTypeDeletion() {
$node = $this->drupalCreateNode(['type' => $type->id()]);
// Attempt to delete the content type, which should not be allowed.
$this->drupalGet('admin/structure/types/manage/' . $type->label() . '/delete');
- $this->assertRaw(
+ $this->assertSession()->responseContains(
t('%type is used by 1 piece of content on your site. You can not remove this content type until you have removed all of the %type content.', ['%type' => $type->label()]),
'The content type will not be deleted until all nodes of that type are removed.'
);
@@ -186,7 +186,7 @@ public function testNodeTypeDeletion() {
$node->delete();
// Attempt to delete the content type, which should now be allowed.
$this->drupalGet('admin/structure/types/manage/' . $type->label() . '/delete');
- $this->assertRaw(
+ $this->assertSession()->responseContains(
t('Are you sure you want to delete the content type %type?', ['%type' => $type->label()]),
'The content type is available for deletion.'
);
@@ -256,7 +256,7 @@ public function testNodeTypeNoContentType() {
// Navigate to content type administration screen
$this->drupalGet('admin/structure/types');
- $this->assertRaw(t('No content types available. Add content type .', [
+ $this->assertSession()->responseContains(t('No content types available. Add content type .', [
':link' => Url::fromRoute('node.type_add')->toString(),
]), 'Empty text when there are no content types in the system is correct.');
diff --git a/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php b/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
index f9db9c2f29..078a5dfeb0 100644
--- a/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
+++ b/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
@@ -119,14 +119,14 @@ public function testNodeTypeTranslation() {
$this->drupalGet("$langcode/node/add/$type");
// This is a Spanish page, so ensure the text asserted is translated in
// Spanish and not French by adding the langcode option.
- $this->assertRaw(t('Create @name', ['@name' => $translated_name], ['langcode' => $langcode]));
+ $this->assertSession()->responseContains(t('Create @name', ['@name' => $translated_name], ['langcode' => $langcode]));
// Check the name is translated with admin theme for editing.
$this->drupalPostForm('admin/appearance', ['use_admin_theme' => '1'], t('Save configuration'));
$this->drupalGet("$langcode/node/add/$type");
// This is a Spanish page, so ensure the text asserted is translated in
// Spanish and not French by adding the langcode option.
- $this->assertRaw(t('Create @name', ['@name' => $translated_name], ['langcode' => $langcode]));
+ $this->assertSession()->responseContains(t('Create @name', ['@name' => $translated_name], ['langcode' => $langcode]));
}
/**
diff --git a/core/modules/node/tests/src/Functional/PagePreviewTest.php b/core/modules/node/tests/src/Functional/PagePreviewTest.php
index 1dae8dec1c..0dad20d6a4 100644
--- a/core/modules/node/tests/src/Functional/PagePreviewTest.php
+++ b/core/modules/node/tests/src/Functional/PagePreviewTest.php
@@ -223,7 +223,7 @@ public function testPagePreview() {
$view_mode_edit = ['view_mode' => 'teaser'];
$this->drupalPostForm('node/preview/' . $uuid . '/full', $view_mode_edit, t('Switch'));
- $this->assertRaw('view-mode-teaser', 'View mode teaser class found.');
+ $this->assertSession()->responseContains('view-mode-teaser', 'View mode teaser class found.');
$this->assertNoText($edit[$body_key], 'Body not displayed.');
// Check that the title, body and term fields are displayed with the
@@ -271,8 +271,8 @@ public function testPagePreview() {
$newterm2 = $this->randomMachineName(8);
$edit[$term_key] = $this->term->getName() . ', ' . $newterm1 . ', ' . $newterm2;
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Preview'));
- $this->assertRaw('>' . $newterm1 . '<', 'First new term displayed.');
- $this->assertRaw('>' . $newterm2 . '<', 'Second new term displayed.');
+ $this->assertSession()->responseContains('>' . $newterm1 . '<', 'First new term displayed.');
+ $this->assertSession()->responseContains('>' . $newterm2 . '<', 'Second new term displayed.');
// The first term should be displayed as link, the others not.
$this->assertLink($this->term->getName());
$this->assertNoLink($newterm1);
@@ -286,9 +286,9 @@ public function testPagePreview() {
$newterm3 = $this->randomMachineName(8);
$edit[$term_key] = $newterm1 . ', ' . $newterm3 . ', ' . $newterm2;
$this->drupalPostForm('node/' . $node->id() . '/edit', $edit, t('Preview'));
- $this->assertRaw('>' . $newterm1 . '<', 'First existing term displayed.');
- $this->assertRaw('>' . $newterm2 . '<', 'Second existing term displayed.');
- $this->assertRaw('>' . $newterm3 . '<', 'Third new term displayed.');
+ $this->assertSession()->responseContains('>' . $newterm1 . '<', 'First existing term displayed.');
+ $this->assertSession()->responseContains('>' . $newterm2 . '<', 'Second existing term displayed.');
+ $this->assertSession()->responseContains('>' . $newterm3 . '<', 'Third new term displayed.');
$this->assertNoText($this->term->getName());
$this->assertLink($newterm1);
$this->assertLink($newterm2);
@@ -317,7 +317,7 @@ public function testPagePreview() {
$this->assertNoRaw('edit-submit');
$this->drupalPostForm('node/add/page', [$title_key => 'Preview'], t('Preview'));
$this->clickLink(t('Back to content editing'));
- $this->assertRaw('edit-submit');
+ $this->assertSession()->responseContains('edit-submit');
// Check that destination is remembered when clicking on preview. When going
// back to the edit form and clicking save, we should go back to the
@@ -367,10 +367,10 @@ public function testPagePreview() {
'title[0][value]' => $title,
'field_test_multi[0][value]' => $example_text_1,
];
- $this->assertRaw('Storage is not set');
+ $this->assertSession()->responseContains('Storage is not set');
$this->drupalPostForm(NULL, $edit, t('Preview'));
$this->clickLink(t('Back to content editing'));
- $this->assertRaw('Storage is set');
+ $this->assertSession()->responseContains('Storage is set');
$this->assertFieldByName('field_test_multi[0][value]');
$this->drupalPostForm(NULL, [], t('Save'));
$this->assertText('Basic page ' . $title . ' has been created.');
diff --git a/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php b/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
index 7c7561c337..5fe739e425 100644
--- a/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
+++ b/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
@@ -93,7 +93,7 @@ public function testNodeEditAccess() {
'action' => 'node_unpublish_action',
];
$this->drupalPostForm('test-node-bulk-form', $edit, t('Apply to selected items'));
- $this->assertRaw(new FormattableMarkup('No access to execute %action on the @entity_type_label %entity_label.', [
+ $this->assertSession()->responseContains(new FormattableMarkup('No access to execute %action on the @entity_type_label %entity_label.', [
'%action' => 'Unpublish content',
'@entity_type_label' => 'Content',
'%entity_label' => $node->label(),
@@ -138,7 +138,7 @@ public function testNodeEditAccess() {
];
$this->drupalPostForm('test-node-bulk-form', $edit, t('Apply to selected items'));
// Test that the action message isn't shown.
- $this->assertRaw(new FormattableMarkup('No access to execute %action on the @entity_type_label %entity_label.', [
+ $this->assertSession()->responseContains(new FormattableMarkup('No access to execute %action on the @entity_type_label %entity_label.', [
'%action' => 'Delete content',
'@entity_type_label' => 'Content',
'%entity_label' => $node->label(),
diff --git a/core/modules/node/tests/src/Functional/Views/NodeFieldTokensTest.php b/core/modules/node/tests/src/Functional/Views/NodeFieldTokensTest.php
index 4e32b723ab..7a872d74e2 100644
--- a/core/modules/node/tests/src/Functional/Views/NodeFieldTokensTest.php
+++ b/core/modules/node/tests/src/Functional/Views/NodeFieldTokensTest.php
@@ -53,16 +53,16 @@ public function testViewsTokenReplacement() {
$this->drupalGet('test_node_tokens');
// Body: {{ body }}$body
");
+ $this->assertSession()->responseContains("Body: $body
");
// Raw value: {{ body__value }}markup ', 'Option text was properly filtered.');
- $this->assertRaw('Some HTML encoded markup with < & >');
+ $this->assertSession()->responseContains('Some dangerous & unescaped markup ', 'Option text was properly filtered.');
+ $this->assertSession()->responseContains('Some HTML encoded markup with < & >');
// Select first option.
$edit = ['card_1' => 0];
@@ -203,7 +203,7 @@ public function testCheckBoxes() {
$this->assertNoFieldChecked('edit-card-2-0');
$this->assertNoFieldChecked('edit-card-2-1');
$this->assertNoFieldChecked('edit-card-2-2');
- $this->assertRaw('Some dangerous & unescaped markup ', 'Option text was properly filtered.');
+ $this->assertSession()->responseContains('Some dangerous & unescaped markup ', 'Option text was properly filtered.');
// Submit form: select first and third options.
$edit = [
@@ -299,12 +299,12 @@ public function testSelectListSingle() {
$this->assertFalse($this->assertSession()->optionExists('card_1', 0)->isSelected());
$this->assertFalse($this->assertSession()->optionExists('card_1', 1)->isSelected());
$this->assertFalse($this->assertSession()->optionExists('card_1', 2)->isSelected());
- $this->assertRaw('Some dangerous & unescaped markup', 'Option text was properly filtered.');
+ $this->assertSession()->responseContains('Some dangerous & unescaped markup', 'Option text was properly filtered.');
// Submit form: select invalid 'none' option.
$edit = ['card_1' => '_none'];
$this->drupalPostForm(NULL, $edit, t('Save'));
- $this->assertRaw(t('@title field is required.', ['@title' => $field->getName()]), 'Cannot save a required field when selecting "none" from the select list.');
+ $this->assertSession()->responseContains(t('@title field is required.', ['@title' => $field->getName()]), 'Cannot save a required field when selecting "none" from the select list.');
// Submit form: select first option.
$edit = ['card_1' => 0];
@@ -343,9 +343,9 @@ public function testSelectListSingle() {
$this->assertFalse($this->assertSession()->optionExists('card_1', 0)->isSelected());
$this->assertFalse($this->assertSession()->optionExists('card_1', 1)->isSelected());
$this->assertFalse($this->assertSession()->optionExists('card_1', 2)->isSelected());
- $this->assertRaw('Some dangerous & unescaped markup', 'Option text was properly filtered.');
- $this->assertRaw('More <script>dangerous</script> markup', 'Option group text was properly filtered.');
- $this->assertRaw('Group 1', 'Option groups are displayed.');
+ $this->assertSession()->responseContains('Some dangerous & unescaped markup', 'Option text was properly filtered.');
+ $this->assertSession()->responseContains('More <script>dangerous</script> markup', 'Option group text was properly filtered.');
+ $this->assertSession()->responseContains('Group 1', 'Option groups are displayed.');
// Submit form: select first option.
$edit = ['card_1' => 0];
@@ -395,7 +395,7 @@ public function testSelectListMultiple() {
$this->assertFalse($this->assertSession()->optionExists('card_2', 0)->isSelected());
$this->assertFalse($this->assertSession()->optionExists('card_2', 1)->isSelected());
$this->assertFalse($this->assertSession()->optionExists('card_2', 2)->isSelected());
- $this->assertRaw('Some dangerous & unescaped markup', 'Option text was properly filtered.');
+ $this->assertSession()->responseContains('Some dangerous & unescaped markup', 'Option text was properly filtered.');
// Submit form: select first and third options.
$edit = ['card_2[]' => [0 => 0, 2 => 2]];
@@ -465,9 +465,9 @@ public function testSelectListMultiple() {
$this->assertFalse($this->assertSession()->optionExists('card_2', 0)->isSelected());
$this->assertFalse($this->assertSession()->optionExists('card_2', 1)->isSelected());
$this->assertFalse($this->assertSession()->optionExists('card_2', 2)->isSelected());
- $this->assertRaw('Some dangerous & unescaped markup', 'Option text was properly filtered.');
- $this->assertRaw('More <script>dangerous</script> markup', 'Option group text was properly filtered.');
- $this->assertRaw('Group 1', 'Option groups are displayed.');
+ $this->assertSession()->responseContains('Some dangerous & unescaped markup', 'Option text was properly filtered.');
+ $this->assertSession()->responseContains('More <script>dangerous</script> markup', 'Option group text was properly filtered.');
+ $this->assertSession()->responseContains('Group 1', 'Option groups are displayed.');
// Submit form: select first option.
$edit = ['card_2[]' => [0 => 0]];
diff --git a/core/modules/page_cache/tests/src/Functional/PageCacheTest.php b/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
index b361a21357..0b0c1b12da 100644
--- a/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
+++ b/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
@@ -134,13 +134,13 @@ public function testQueryParameterFormatRequests() {
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'HTML page was not yet cached.');
$this->drupalGet($accept_header_cache_url);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'HTML page was cached.');
- $this->assertRaw('oh hai this is html.
', 'The correct HTML response was returned.');
+ $this->assertSession()->responseContains('oh hai this is html.
', 'The correct HTML response was returned.');
$this->drupalGet($accept_header_cache_url_with_json);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'MISS', 'Json response was not yet cached.');
$this->drupalGet($accept_header_cache_url_with_json);
$this->assertEqual($this->drupalGetHeader('X-Drupal-Cache'), 'HIT', 'Json response was cached.');
- $this->assertRaw('{"content":"oh hai this is json"}', 'The correct Json response was returned.');
+ $this->assertSession()->responseContains('{"content":"oh hai this is json"}', 'The correct Json response was returned.');
// Enable REST support for nodes and hal+json.
\Drupal::service('module_installer')->install(['node', 'rest', 'hal', 'basic_auth']);
diff --git a/core/modules/path/tests/src/Functional/PathAliasTest.php b/core/modules/path/tests/src/Functional/PathAliasTest.php
index 99eaa4fee0..b6186b6263 100644
--- a/core/modules/path/tests/src/Functional/PathAliasTest.php
+++ b/core/modules/path/tests/src/Functional/PathAliasTest.php
@@ -135,12 +135,12 @@ public function testAdminAlias() {
$this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
// Confirm no duplicate was created.
- $this->assertRaw(t('The alias %alias is already in use in this language.', ['%alias' => $edit['alias[0][value]']]), 'Attempt to move alias was rejected.');
+ $this->assertSession()->responseContains(t('The alias %alias is already in use in this language.', ['%alias' => $edit['alias[0][value]']]), 'Attempt to move alias was rejected.');
$edit_upper = $edit;
$edit_upper['alias[0][value]'] = mb_strtoupper($edit['alias[0][value]']);
$this->drupalPostForm('admin/config/search/path/add', $edit_upper, t('Save'));
- $this->assertRaw(t('The alias %alias could not be added because it is already in use in this language with different capitalization: %stored_alias.', [
+ $this->assertSession()->responseContains(t('The alias %alias could not be added because it is already in use in this language with different capitalization: %stored_alias.', [
'%alias' => $edit_upper['alias[0][value]'],
'%stored_alias' => $edit['alias[0][value]'],
]), 'Attempt to move upper-case alias was rejected.');
@@ -148,7 +148,7 @@ public function testAdminAlias() {
// Delete alias.
$this->drupalGet('admin/config/search/path/edit/' . $pid);
$this->clickLink(t('Delete'));
- $this->assertRaw(t('Are you sure you want to delete the URL alias %name?', ['%name' => $edit['alias[0][value]']]));
+ $this->assertSession()->responseContains(t('Are you sure you want to delete the URL alias %name?', ['%name' => $edit['alias[0][value]']]));
$this->drupalPostForm(NULL, [], t('Delete'));
// Confirm that the alias no longer works.
@@ -211,7 +211,7 @@ public function testAdminAlias() {
$edit['alias[0][value]'] = $node4_alias;
$edit['path[0][value]'] = '/node/' . $node3->id();
$this->drupalPostForm('admin/config/search/path/edit/' . $pid, $edit, t('Save'));
- $this->assertRaw(t('The alias %alias is already in use in this language.', ['%alias' => $edit['alias[0][value]']]));
+ $this->assertSession()->responseContains(t('The alias %alias is already in use in this language.', ['%alias' => $edit['alias[0][value]']]));
// Create an alias without a starting slash.
$node5 = $this->drupalCreateNode();
diff --git a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php
index ee64685004..5577656130 100644
--- a/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php
+++ b/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php
@@ -194,8 +194,8 @@ public function testWithPendingRevision() {
$this->assertNoRaw('data-quickedit-field-id="node/' . $this->testNode->id() . '/title/' . $this->testNode->language()->getId() . '/full"');
$this->drupalGet('node/' . $this->testNode->id());
- $this->assertRaw('data-quickedit-entity-id="node/' . $this->testNode->id() . '"');
- $this->assertRaw('data-quickedit-field-id="node/' . $this->testNode->id() . '/title/' . $this->testNode->language()->getId() . '/full"');
+ $this->assertSession()->responseContains('data-quickedit-entity-id="node/' . $this->testNode->id() . '"');
+ $this->assertSession()->responseContains('data-quickedit-field-id="node/' . $this->testNode->id() . '/title/' . $this->testNode->language()->getId() . '/full"');
// Wait for the page to completely load before making any changes to the
// node. This allows Quick Edit to fetch the metadata without causing
@@ -336,7 +336,7 @@ public function testContentBlock() {
// Check that the data- attribute is present.
$this->drupalLogin($this->editorUser);
$this->drupalGet('');
- $this->assertRaw('data-quickedit-entity-id="block_content/1"');
+ $this->assertSession()->responseContains('data-quickedit-entity-id="block_content/1"');
}
/**
diff --git a/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
index 214e5b111a..11b9121b51 100644
--- a/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
@@ -204,7 +204,7 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
'#alt' => $alt,
];
$default_output = str_replace("\n", NULL, $renderer->renderRoot($image));
- $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
+ $this->assertSession()->responseContains($default_output, 'Default formatter displaying correctly on full node view.');
// Test field not being configured. This should not cause a fatal error.
$display_options = [
@@ -290,33 +290,33 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
// Output should contain all image styles and all breakpoints.
$this->drupalGet('node/' . $nid);
if (!$empty_styles) {
- $this->assertRaw('/styles/medium/');
+ $this->assertSession()->responseContains('/styles/medium/');
// Assert the empty image is present.
- $this->assertRaw('data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==');
+ $this->assertSession()->responseContains('data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==');
$thumbnail_style = ImageStyle::load('thumbnail');
// Assert the output of the 'srcset' attribute (small multipliers first).
- $this->assertRaw('data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw== 1x, ' . file_url_transform_relative($thumbnail_style->buildUrl($image_uri)) . ' 1.5x');
- $this->assertRaw('/styles/medium/');
+ $this->assertSession()->responseContains('data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw== 1x, ' . file_url_transform_relative($thumbnail_style->buildUrl($image_uri)) . ' 1.5x');
+ $this->assertSession()->responseContains('/styles/medium/');
// Assert the output of the original image.
- $this->assertRaw(file_url_transform_relative(file_create_url($image_uri)) . ' 3x');
+ $this->assertSession()->responseContains(file_url_transform_relative(file_create_url($image_uri)) . ' 3x');
// Assert the output of the breakpoints.
- $this->assertRaw('media="(min-width: 0px)"');
- $this->assertRaw('media="(min-width: 560px)"');
+ $this->assertSession()->responseContains('media="(min-width: 0px)"');
+ $this->assertSession()->responseContains('media="(min-width: 560px)"');
// Assert the output of the 'sizes' attribute.
- $this->assertRaw('sizes="(min-width: 700px) 700px, 100vw"');
+ $this->assertSession()->responseContains('sizes="(min-width: 700px) 700px, 100vw"');
$this->assertPattern('/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');
- $this->assertRaw('media="(min-width: 851px)"');
+ $this->assertSession()->responseContains(file_url_transform_relative($medium_style->buildUrl($image_uri)) . ' 220w, ' . file_url_transform_relative($large_style->buildUrl($image_uri)) . ' 360w');
+ $this->assertSession()->responseContains('media="(min-width: 851px)"');
}
- $this->assertRaw('/styles/large/');
+ $this->assertSession()->responseContains('/styles/large/');
$cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags'));
$this->assertContains('config:responsive_image.styles.style_one', $cache_tags);
if (!$empty_styles) {
$this->assertContains('config:image.style.medium', $cache_tags);
$this->assertContains('config:image.style.thumbnail', $cache_tags);
- $this->assertRaw('type="image/png"');
+ $this->assertSession()->responseContains('type="image/png"');
}
$this->assertContains('config:image.style.large', $cache_tags);
@@ -331,7 +331,7 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles =
// responsive-image.html.twig doesn't have one after the fallback image, so
// we remove it here.
$default_output = trim($renderer->renderRoot($fallback_image));
- $this->assertRaw($default_output, 'Image style large formatter displaying correctly on full node view.');
+ $this->assertSession()->responseContains($default_output, 'Image style large formatter displaying correctly on full node view.');
if ($scheme == 'private') {
// Log out and ensure the file cannot be accessed.
@@ -453,7 +453,7 @@ public function testResponsiveImageFieldFormattersOneSource() {
$medium_style = ImageStyle::load('medium');
$node = $node_storage->load($nid);
$image_uri = File::load($node->{$field_name}->target_id)->getFileUri();
- $this->assertRaw('subjectkeyword ');');
+ $this->assertSession()->responseContains('<script>alert('subjectkeyword ');');
$this->assertNoRaw('');
+ $this->assertSession()->responseContains('');
$this->assertEscaped('');
}
diff --git a/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
index 47077f1d7e..8d6cec0b7c 100644
--- a/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
+++ b/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
@@ -200,7 +200,7 @@ protected function doTestExoticPath() {
// Characters from various non-ASCII alphabets.
"éøïвβ中國書۞";
$this->drupalGet($path);
- $this->assertRaw('This is the menuTestCallback content.');
+ $this->assertSession()->responseContains('This is the menuTestCallback content.');
$this->assertNoText(t('The website encountered an unexpected error. Please try again later.'));
}
@@ -270,7 +270,7 @@ public function testThemeIntegration() {
protected function doTestThemeCallbackAdministrative() {
$this->drupalGet('menu-test/theme-callback/use-admin-theme');
$this->assertText('Active theme: seven. Actual theme: seven.', 'The administrative theme can be correctly set in a theme negotiation.');
- $this->assertRaw('seven/css/base/elements.css', "The administrative theme's CSS appears on the page.");
+ $this->assertSession()->responseContains('seven/css/base/elements.css', "The administrative theme's CSS appears on the page.");
}
/**
@@ -282,14 +282,14 @@ protected function doTestThemeCallbackMaintenanceMode() {
// For a regular user, the fact that the site is in maintenance mode means
// we expect the theme callback system to be bypassed entirely.
$this->drupalGet('menu-test/theme-callback/use-admin-theme');
- $this->assertRaw('bartik/css/base/elements.css', "The maintenance theme's CSS appears on the page.");
+ $this->assertSession()->responseContains('bartik/css/base/elements.css', "The maintenance theme's CSS appears on the page.");
// An administrator, however, should continue to see the requested theme.
$admin_user = $this->drupalCreateUser(['access site in maintenance mode']);
$this->drupalLogin($admin_user);
$this->drupalGet('menu-test/theme-callback/use-admin-theme');
$this->assertText('Active theme: seven. Actual theme: seven.', 'The theme negotiation system is correctly triggered for an administrator when the site is in maintenance mode.');
- $this->assertRaw('seven/css/base/elements.css', "The administrative theme's CSS appears on the page.");
+ $this->assertSession()->responseContains('seven/css/base/elements.css', "The administrative theme's CSS appears on the page.");
$this->container->get('state')->set('system.maintenance_mode', FALSE);
}
@@ -301,7 +301,7 @@ protected function doTestThemeCallbackOptionalTheme() {
// Request a theme that is not installed.
$this->drupalGet('menu-test/theme-callback/use-test-theme');
$this->assertText('Active theme: bartik. Actual theme: bartik.', 'The theme negotiation system falls back on the default theme when a theme that is not installed is requested.');
- $this->assertRaw('bartik/css/base/elements.css', "The default theme's CSS appears on the page.");
+ $this->assertSession()->responseContains('bartik/css/base/elements.css', "The default theme's CSS appears on the page.");
// Now install the theme and request it again.
/** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
@@ -310,7 +310,7 @@ protected function doTestThemeCallbackOptionalTheme() {
$this->drupalGet('menu-test/theme-callback/use-test-theme');
$this->assertText('Active theme: test_theme. Actual theme: test_theme.', 'The theme negotiation system uses an optional theme once it has been installed.');
- $this->assertRaw('test_theme/kitten.css', "The optional theme's CSS appears on the page.");
+ $this->assertSession()->responseContains('test_theme/kitten.css', "The optional theme's CSS appears on the page.");
$theme_installer->uninstall(['test_theme']);
}
@@ -321,7 +321,7 @@ protected function doTestThemeCallbackOptionalTheme() {
protected function doTestThemeCallbackFakeTheme() {
$this->drupalGet('menu-test/theme-callback/use-fake-theme');
$this->assertText('Active theme: bartik. Actual theme: bartik.', 'The theme negotiation system falls back on the default theme when a theme that does not exist is requested.');
- $this->assertRaw('bartik/css/base/elements.css', "The default theme's CSS appears on the page.");
+ $this->assertSession()->responseContains('bartik/css/base/elements.css', "The default theme's CSS appears on the page.");
}
/**
@@ -330,7 +330,7 @@ protected function doTestThemeCallbackFakeTheme() {
protected function doTestThemeCallbackNoThemeRequested() {
$this->drupalGet('menu-test/theme-callback/no-theme-requested');
$this->assertText('Active theme: bartik. Actual theme: bartik.', 'The theme negotiation system falls back on the default theme when no theme is requested.');
- $this->assertRaw('bartik/css/base/elements.css', "The default theme's CSS appears on the page.");
+ $this->assertSession()->responseContains('bartik/css/base/elements.css', "The default theme's CSS appears on the page.");
}
}
diff --git a/core/modules/system/tests/src/Functional/Module/DependencyTest.php b/core/modules/system/tests/src/Functional/Module/DependencyTest.php
index b8022c8b88..8b8f1570b8 100644
--- a/core/modules/system/tests/src/Functional/Module/DependencyTest.php
+++ b/core/modules/system/tests/src/Functional/Module/DependencyTest.php
@@ -63,7 +63,7 @@ public function testMissingModules() {
// Test that the system_dependencies_test module is marked
// as missing a dependency.
$this->drupalGet('admin/modules');
- $this->assertRaw(t('@module (missing )', ['@module' => Unicode::ucfirst('_missing_dependency')]), 'A module with missing dependencies is marked as such.');
+ $this->assertSession()->responseContains(t('@module (missing )', ['@module' => Unicode::ucfirst('_missing_dependency')]), 'A module with missing dependencies is marked as such.');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[system_dependencies_test][enable]"]');
$this->assertCount(1, $checkbox, 'Checkbox for the module is disabled.');
}
@@ -75,7 +75,7 @@ public function testIncompatibleModuleVersionDependency() {
// Test that the system_incompatible_module_version_dependencies_test is
// marked as having an incompatible dependency.
$this->drupalGet('admin/modules');
- $this->assertRaw(t('@module (incompatible with version @version)', [
+ $this->assertSession()->responseContains(t('@module (incompatible with version @version)', [
'@module' => 'System incompatible module version test (>2.0)',
'@version' => '1.0',
]), 'A module that depends on an incompatible version of a module is marked as such.');
@@ -90,7 +90,7 @@ public function testIncompatibleCoreVersionDependency() {
// Test that the system_incompatible_core_version_dependencies_test is
// marked as having an incompatible dependency.
$this->drupalGet('admin/modules');
- $this->assertRaw(t('@module (incompatible with this version of Drupal core)', [
+ $this->assertSession()->responseContains(t('@module (incompatible with this version of Drupal core)', [
'@module' => 'System core incompatible semver test',
]), 'A module that depends on a module with an incompatible core version is marked as such.');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[system_incompatible_core_version_dependencies_test][enable]"]');
@@ -102,7 +102,7 @@ public function testIncompatibleCoreVersionDependency() {
*/
public function testIncompatiblePhpVersionDependency() {
$this->drupalGet('admin/modules');
- $this->assertRaw('This module requires PHP version 6502.* and is incompatible with PHP version ' . phpversion() . '.', 'User is informed when the PHP dependency requirement of a module is not met.');
+ $this->assertSession()->responseContains('This module requires PHP version 6502.* and is incompatible with PHP version ' . phpversion() . '.', 'User is informed when the PHP dependency requirement of a module is not met.');
$checkbox = $this->xpath('//input[@type="checkbox" and @disabled="disabled" and @name="modules[system_incompatible_php_version_test][enable]"]');
$this->assertCount(1, $checkbox, 'Checkbox for the module is disabled.');
}
diff --git a/core/modules/system/tests/src/Functional/Module/UninstallTest.php b/core/modules/system/tests/src/Functional/Module/UninstallTest.php
index 3c5e9fb359..9f6451b3c1 100644
--- a/core/modules/system/tests/src/Functional/Module/UninstallTest.php
+++ b/core/modules/system/tests/src/Functional/Module/UninstallTest.php
@@ -75,7 +75,7 @@ public function testUninstallPage() {
// Be sure labels are rendered properly.
// @see regression https://www.drupal.org/node/2512106
- $this->assertRaw('Node ');
+ $this->assertSession()->responseContains('Node ');
$this->assertText(\Drupal::translation()->translate('The following reason prevents Node from being uninstalled:'));
$this->assertText(\Drupal::translation()->translate('There is content for the entity type: Content'));
@@ -112,7 +112,7 @@ public function testUninstallPage() {
$entity_type = \Drupal::entityTypeManager()->getDefinition($entity_type_id);
// Add h3's since the entity type label is often repeated in the entity
// labels.
- $this->assertRaw('' . $entity_type->getLabel() . ' ');
+ $this->assertSession()->responseContains('' . $entity_type->getLabel() . ' ');
}
// Set a unique cache entry to be able to test whether all caches are
diff --git a/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php b/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
index 696acc16cd..f4d7d42d18 100644
--- a/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
+++ b/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
@@ -36,17 +36,17 @@ public function testUpcasting() {
// paramconverter_test/test_user_node_foo/{user}/{node}/{foo}
$this->drupalGet("paramconverter_test/test_user_node_foo/" . $user->id() . '/' . $node->id() . "/$foo");
- $this->assertRaw("user: {$user->label()}, node: {$node->label()}, foo: $foo", 'user and node upcast by entity name');
+ $this->assertSession()->responseContains("user: {$user->label()}, node: {$node->label()}, foo: $foo", 'user and node upcast by entity name');
// paramconverter_test/test_node_user_user/{node}/{foo}/{user}
// options.parameters.foo.type = entity:user
$this->drupalGet("paramconverter_test/test_node_user_user/" . $node->id() . "/" . $user->id() . "/" . $user->id());
- $this->assertRaw("user: {$user->label()}, node: {$node->label()}, foo: {$user->label()}", 'foo converted to user as well');
+ $this->assertSession()->responseContains("user: {$user->label()}, node: {$node->label()}, foo: {$user->label()}", 'foo converted to user as well');
// paramconverter_test/test_node_node_foo/{user}/{node}/{foo}
// options.parameters.user.type = entity:node
$this->drupalGet("paramconverter_test/test_node_node_foo/" . $node->id() . "/" . $node->id() . "/$foo");
- $this->assertRaw("user: {$node->label()}, node: {$node->label()}, foo: $foo", 'user is upcast to node (rather than to user)');
+ $this->assertSession()->responseContains("user: {$node->label()}, node: {$node->label()}, foo: $foo", 'user is upcast to node (rather than to user)');
}
/**
@@ -58,7 +58,7 @@ public function testSameTypes() {
// paramconverter_test/node/{node}/set/parent/{parent}
// options.parameters.parent.type = entity:node
$this->drupalGet("paramconverter_test/node/" . $node->id() . "/set/parent/" . $parent->id());
- $this->assertRaw("Setting '" . $parent->getTitle() . "' as parent of '" . $node->getTitle() . "'.");
+ $this->assertSession()->responseContains("Setting '" . $parent->getTitle() . "' as parent of '" . $node->getTitle() . "'.");
}
/**
@@ -79,9 +79,9 @@ public function testEntityLanguage() {
$translation->setTitle('Deutscher Titel')->save();
$this->drupalGet("/paramconverter_test/node/" . $node->id() . "/test_language");
- $this->assertRaw("English label");
+ $this->assertSession()->responseContains("English label");
$this->drupalGet("paramconverter_test/node/" . $node->id() . "/test_language", ['language' => $language]);
- $this->assertRaw("Deutscher Titel");
+ $this->assertSession()->responseContains("Deutscher Titel");
}
}
diff --git a/core/modules/system/tests/src/Functional/Render/DisplayVariantTest.php b/core/modules/system/tests/src/Functional/Render/DisplayVariantTest.php
index 41f8586155..7bb6173588 100644
--- a/core/modules/system/tests/src/Functional/Render/DisplayVariantTest.php
+++ b/core/modules/system/tests/src/Functional/Render/DisplayVariantTest.php
@@ -31,8 +31,8 @@ public function testPageDisplayVariantSelectionEvent() {
// was passed correctly. If the configuration wasn't passed, we'd get an
// error page here.
$this->drupalGet('');
- $this->assertRaw('A very important, required value.');
- $this->assertRaw('Explicitly passed in context.');
+ $this->assertSession()->responseContains('A very important, required value.');
+ $this->assertSession()->responseContains('Explicitly passed in context.');
$this->assertCacheTag('custom_cache_tag');
}
diff --git a/core/modules/system/tests/src/Functional/Render/RenderArrayNonHtmlSubscriberTest.php b/core/modules/system/tests/src/Functional/Render/RenderArrayNonHtmlSubscriberTest.php
index 97015201e4..29572ccf08 100644
--- a/core/modules/system/tests/src/Functional/Render/RenderArrayNonHtmlSubscriberTest.php
+++ b/core/modules/system/tests/src/Functional/Render/RenderArrayNonHtmlSubscriberTest.php
@@ -33,7 +33,7 @@ public function testResponses() {
$this->drupalGet($url);
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('Controller response successfully rendered.'));
+ $this->assertSession()->responseContains(t('Controller response successfully rendered.'));
// Test that correct response code is returned for any non-HTML format.
foreach (['json', 'hal+json', 'xml', 'foo'] as $format) {
@@ -53,7 +53,7 @@ public function testResponses() {
$this->drupalGet($url);
$this->assertSession()->statusCodeEquals(200);
- $this->assertRaw(t('Raw controller response.'));
+ $this->assertSession()->responseContains(t('Raw controller response.'));
}
}
diff --git a/core/modules/system/tests/src/Functional/Render/UrlBubbleableMetadataBubblingTest.php b/core/modules/system/tests/src/Functional/Render/UrlBubbleableMetadataBubblingTest.php
index ad2f9774fe..6d792472ff 100644
--- a/core/modules/system/tests/src/Functional/Render/UrlBubbleableMetadataBubblingTest.php
+++ b/core/modules/system/tests/src/Functional/Render/UrlBubbleableMetadataBubblingTest.php
@@ -43,7 +43,7 @@ public function testUrlBubbleableMetadataBubbling() {
$url = Url::fromRoute('cache_test.url_bubbling');
$this->drupalGet($url);
$this->assertCacheContext('url.site');
- $this->assertRaw($url->setAbsolute()->toString());
+ $this->assertSession()->responseContains($url->setAbsolute()->toString());
}
}
diff --git a/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php b/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php
index ebf5b3ac9e..6a1b442fa3 100644
--- a/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php
+++ b/core/modules/system/tests/src/Functional/Routing/RouterPermissionTest.php
@@ -40,7 +40,7 @@ public function testPermissionAccess() {
$this->drupalGet('router_test/test7');
$this->assertSession()->statusCodeEquals(200);
$this->assertNoRaw('Access denied');
- $this->assertRaw('test7text', 'The correct string was returned because the route was successful.');
+ $this->assertSession()->responseContains('test7text', 'The correct string was returned because the route was successful.');
}
}
diff --git a/core/modules/system/tests/src/Functional/Routing/RouterTest.php b/core/modules/system/tests/src/Functional/Routing/RouterTest.php
index b97ab7787f..ef6da00b14 100644
--- a/core/modules/system/tests/src/Functional/Routing/RouterTest.php
+++ b/core/modules/system/tests/src/Functional/Routing/RouterTest.php
@@ -37,7 +37,7 @@ public function testFinishResponseSubscriber() {
// Confirm that the router can get to a controller.
$this->drupalGet('router_test/test1');
- $this->assertRaw('test1', 'The correct string was returned because the route was successful.');
+ $this->assertSession()->responseContains('test1', 'The correct string was returned because the route was successful.');
$session = $this->getSession();
// Check expected headers from FinishResponseSubscriber.
$headers = $session->getResponseHeaders();
@@ -49,14 +49,14 @@ public function testFinishResponseSubscriber() {
$this->assertNull($this->drupalGetHeader('Vary'), 'Vary header is not set.');
$this->drupalGet('router_test/test2');
- $this->assertRaw('test2', 'The correct string was returned because the route was successful.');
+ $this->assertSession()->responseContains('test2', 'The correct string was returned because the route was successful.');
// Check expected headers from FinishResponseSubscriber.
$headers = $session->getResponseHeaders();
$this->assertEqual($headers['X-Drupal-Cache-Contexts'], [implode(' ', $expected_cache_contexts)]);
$this->assertEqual($headers['X-Drupal-Cache-Tags'], ['config:user.role.anonymous http_response rendered']);
// Confirm that the page wrapping is being added, so we're not getting a
// raw body returned.
- $this->assertRaw(' 
assertSession()->responseContains('