Commit e4e64fa0 authored by xjm's avatar xjm

Issue #3143339 by mohrerao, mondrake, longwave: Clean up the arguments of...

Issue #3143339 by mohrerao, mondrake, longwave: Clean up the arguments of calls to WebAssert::titleEquals() and AssertLegacyTrait::assertTitle()
parent 2b29ed1d
......@@ -253,7 +253,7 @@ public function testBlockThemeSelector() {
$theme_settings = $this->config('system.theme');
foreach (['bartik', 'seven', 'stark'] as $theme) {
$this->drupalGet('admin/structure/block/list/' . $theme);
$this->assertTitle(t('Block layout') . ' | Drupal');
$this->assertTitle('Block layout | Drupal');
// Select the 'Powered by Drupal' block to be placed.
$block = [];
$block['id'] = strtolower($this->randomMachineName());
......
......@@ -35,7 +35,7 @@ public function testListing() {
$this->drupalGet('admin/structure/block/block-content');
// Test for the page title.
$this->assertTitle(t('Custom block library') . ' | Drupal');
$this->assertTitle('Custom block library | Drupal');
// Test for the table.
$element = $this->xpath('//div[@class="layout-content"]//table');
......@@ -85,7 +85,7 @@ public function testListing() {
$this->assertLinkByHref('block/' . $block->id());
$this->clickLink(t('Edit'));
$this->assertSession()->statusCodeEquals(200);
$this->assertTitle(strip_tags(t('Edit custom block %label', ['%label' => $label]) . ' | Drupal'));
$this->assertTitle("Edit custom block $label | Drupal");
$edit = ['info[0][value]' => $new_label];
$this->drupalPostForm(NULL, $edit, t('Save'));
}
......@@ -102,7 +102,7 @@ public function testListing() {
$delete_text = t('Delete');
$this->clickLink($delete_text);
$this->assertSession()->statusCodeEquals(200);
$this->assertTitle(strip_tags(t('Are you sure you want to delete the custom block %label?', ['%label' => $new_label]) . ' | Drupal'));
$this->assertTitle("Are you sure you want to delete the custom block $new_label? | Drupal");
$this->drupalPostForm(NULL, [], $delete_text);
// Verify that the text of the label and machine name does not appear in
......
......@@ -38,7 +38,7 @@ public function testListing() {
$this->drupalGet('admin/structure/block/block-content');
// Test for the page title.
$this->assertTitle(t('Custom block library') . ' | Drupal');
$this->assertTitle('Custom block library | Drupal');
// Test for the exposed filters.
$this->assertFieldByName('info');
......@@ -97,7 +97,7 @@ public function testListing() {
$this->assertLinkByHref('block/' . $block->id());
$this->clickLink(t('Edit'));
$this->assertSession()->statusCodeEquals(200);
$this->assertTitle(strip_tags(t('Edit custom block %label', ['%label' => $label]) . ' | Drupal'));
$this->assertTitle("Edit custom block $label | Drupal");
$edit = ['info[0][value]' => $new_label];
$this->drupalPostForm(NULL, $edit, t('Save'));
}
......@@ -114,7 +114,7 @@ public function testListing() {
$delete_text = t('Delete');
$this->clickLink($delete_text);
$this->assertSession()->statusCodeEquals(200);
$this->assertTitle(strip_tags(t('Are you sure you want to delete the custom block %label?', ['%label' => $new_label]) . ' | Drupal'));
$this->assertTitle("Are you sure you want to delete the custom block $new_label? | Drupal");
$this->drupalPostForm(NULL, [], $delete_text);
// Verify that the text of the label and machine name does not appear in
......
......@@ -2,7 +2,6 @@
namespace Drupal\Tests\block_content\Functional;
use Drupal\Component\Render\FormattableMarkup;
use Drupal\block_content\Entity\BlockContentType;
use Drupal\Component\Utility\Html;
use Drupal\Core\Url;
......@@ -121,7 +120,7 @@ public function testBlockContentTypeEditing() {
'label' => 'Bar',
];
$this->drupalGet('admin/structure/block/block-content/manage/basic');
$this->assertTitle(new FormattableMarkup('Edit @type custom block type | Drupal', ['@type' => 'basic']));
$this->assertTitle('Edit basic custom block type | Drupal');
$this->drupalPostForm(NULL, $edit, t('Save'));
$front_page_path = Url::fromRoute('<front>')->toString();
$this->assertBreadcrumb('admin/structure/block/block-content/manage/basic/fields', [
......
......@@ -97,9 +97,7 @@ public function testCommentInterface() {
$this->setCommentPreview(DRUPAL_OPTIONAL);
$this->drupalGet('comment/' . $comment->id() . '/edit');
$this->assertTitle(t('Edit comment @title | Drupal', [
'@title' => $comment->getSubject(),
]));
$this->assertTitle('Edit comment ' . $comment->getSubject() . ' | Drupal');
// Test changing the comment author to "Anonymous".
$comment = $this->postComment(NULL, $comment->comment_body->value, $comment->getSubject(), ['uid' => '']);
......
......@@ -67,7 +67,7 @@ public function testCommentPreview() {
$this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
// Check that the preview is displaying the title and body.
$this->assertTitle(t('Preview comment | Drupal'), 'Page title is "Preview comment".');
$this->assertTitle('Preview comment | Drupal');
$this->assertText($edit['subject[0][value]'], 'Subject displayed.');
$this->assertText($edit['comment_body[0][value]'], 'Comment displayed.');
......@@ -101,7 +101,7 @@ public function testCommentPreviewDuplicateSubmission() {
$this->drupalPostForm('node/' . $this->node->id(), $edit, t('Preview'));
// Check that the preview is displaying the title and body.
$this->assertTitle(t('Preview comment | Drupal'), 'Page title is "Preview comment".');
$this->assertTitle('Preview comment | Drupal');
$this->assertText($edit['subject[0][value]'], 'Subject displayed.');
$this->assertText($edit['comment_body[0][value]'], 'Comment displayed.');
......@@ -150,7 +150,7 @@ public function testCommentEditPreviewSave() {
$this->drupalPostForm('comment/' . $comment->id() . '/edit', $edit, t('Preview'));
// Check that the preview is displaying the subject, comment, author and date correctly.
$this->assertTitle(t('Preview comment | Drupal'), 'Page title is "Preview comment".');
$this->assertTitle('Preview comment | Drupal');
$this->assertText($edit['subject[0][value]'], 'Subject displayed.');
$this->assertText($edit['comment_body[0][value]'], 'Comment displayed.');
$this->assertText($web_user->getAccountName(), 'Author displayed.');
......
......@@ -41,7 +41,7 @@ public function testDraggableList() {
$this->drupalGet('admin/people/roles');
// Test for the page title.
$this->assertSession()->titleEquals(t('Roles') . ' | Drupal');
$this->assertSession()->titleEquals('Roles | Drupal');
// Count the number of rows in table.
$rows = $this->xpath('//form[@class="user-admin-roles-form"]/table/tbody/tr');
......
......@@ -301,7 +301,7 @@ public function testImportDiff() {
// Load the diff UI and verify that the diff reflects the change.
$this->drupalGet('admin/config/development/configuration/sync/diff/' . $config_name);
$this->assertNoRaw('&amp;nbsp;');
$this->assertTitle(new FormattableMarkup('View changes of @config_name | Drupal', ['@config_name' => $config_name]));
$this->assertTitle("View changes of $config_name | Drupal");
// The following assertions do not use $this::assertEscaped() because
// \Drupal\Component\Diff\DiffFormatter adds markup that signifies what has
......
......@@ -35,7 +35,7 @@ class ContentTranslationViewsUITest extends UITestBase {
*/
public function testViewsUI() {
$this->drupalGet('admin/structure/views/view/test_view/edit');
$this->assertTitle(t('@label (@table) | @site-name', ['@label' => 'Test view', '@table' => 'Views test data', '@site-name' => $this->config('system.site')->get('name')]));
$this->assertTitle('Test view (Views test data) | Drupal');
}
}
......@@ -95,7 +95,7 @@ public function testFileListingPages() {
$this->drupalGet('admin/content/files/usage/' . $file->id());
$this->assertSession()->statusCodeEquals(200);
$this->assertTitle(t('File usage information for @file | Drupal', ['@file' => $file->getFilename()]));
$this->assertTitle('File usage information for ' . $file->getFilename() . ' | Drupal');
foreach ($nodes as &$node) {
$this->drupalGet('node/' . $node->id() . '/edit');
......
......@@ -246,12 +246,12 @@ public function testForum() {
// Test the root forum page title change.
$this->drupalGet('forum');
$this->assertCacheTag('config:taxonomy.vocabulary.' . $this->forum['vid']);
$this->assertTitle(t('Forums | Drupal'));
$this->assertTitle('Forums | Drupal');
$vocabulary = Vocabulary::load($this->forum['vid']);
$vocabulary->set('name', 'Discussions');
$vocabulary->save();
$this->drupalGet('forum');
$this->assertTitle(t('Discussions | Drupal'));
$this->assertTitle('Discussions | Drupal');
// Test anonymous action link.
$this->drupalLogout();
......@@ -620,7 +620,7 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
$this->drupalGet('admin/help/forum');
$this->assertSession()->statusCodeEquals($response2);
if ($response2 == 200) {
$this->assertTitle(t('Forum | Drupal'), 'Forum help title was displayed');
$this->assertTitle('Forum | Drupal');
$this->assertText(t('Forum'), 'Forum help node was displayed');
}
......@@ -634,7 +634,7 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
// View forum node.
$this->drupalGet('node/' . $node->id());
$this->assertSession()->statusCodeEquals(200);
$this->assertTitle($node->label() . ' | Drupal', 'Forum node was displayed');
$this->assertTitle($node->label() . ' | Drupal');
$breadcrumb_build = [
Link::createFromRoute(t('Home'), '<front>'),
Link::createFromRoute(t('Forums'), 'forum.index'),
......@@ -651,7 +651,7 @@ private function verifyForums(EntityInterface $node, $admin, $response = 200) {
$this->drupalGet('node/' . $node->id() . '/edit');
$this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertTitle('Edit Forum topic ' . $node->label() . ' | Drupal', 'Forum edit node was displayed');
$this->assertTitle('Edit Forum topic ' . $node->label() . ' | Drupal');
}
if ($response == 200) {
......
......@@ -127,7 +127,7 @@ protected function verifyHelp($response = 200) {
$this->drupalGet('admin/help/' . $module);
$this->assertSession()->statusCodeEquals($response);
if ($response == 200) {
$this->assertTitle($name . ' | Drupal', new FormattableMarkup('%module title was displayed', ['%module' => $module]));
$this->assertTitle("$name | Drupal");
$this->assertEquals($name, $this->cssSelect('h1.page-title')[0]->getText(), "$module heading was displayed");
$info = \Drupal::service('extension.list.module')->getExtensionInfo($module);
$admin_tasks = system_get_module_admin_tasks($module, $info);
......
......@@ -216,7 +216,7 @@ public function testStyle() {
// Check that the URL was updated.
$this->drupalGet($style_path);
$this->assertTitle(t('Edit style @name | Drupal', ['@name' => $style_label]));
$this->assertTitle("Edit style $style_label | Drupal");
// Check that the available image effects are properly sorted.
$option = $this->xpath('//select[@id=:id]//option', [':id' => 'edit-new--2']);
......
......@@ -93,7 +93,7 @@ public function testLanguageList() {
// Ensure 'Edit' link works.
$this->drupalGet('admin/config/regional/language');
$this->clickLink(t('Edit'));
$this->assertTitle(t('Edit language | Drupal'), 'Page title is "Edit language".');
$this->assertTitle('Edit language | Drupal');
// Edit a language.
$name = $this->randomMachineName(16);
$edit = [
......
......@@ -709,7 +709,7 @@ public function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkConten
// Verify menu link link.
$this->clickLink($title);
$title = $parent_node->label();
$this->assertTitle(t("@title | Drupal", ['@title' => $title]), 'Parent menu link link target was correct');
$this->assertTitle("$title | Drupal");
}
// Verify menu link.
......@@ -719,7 +719,7 @@ public function verifyMenuLink(MenuLinkContent $item, $item_node, MenuLinkConten
// Verify menu link link.
$this->clickLink($title);
$title = $item_node->label();
$this->assertTitle(t("@title | Drupal", ['@title' => $title]), 'Menu link link target was correct');
$this->assertTitle("$title | Drupal");
}
/**
......
......@@ -83,7 +83,7 @@ public function testNodeTitle() {
$node = $this->drupalCreateNode($settings);
// Test that 0 appears as <title>.
$this->drupalGet('node/' . $node->id());
$this->assertTitle(0 . ' | Drupal', 'Page title is equal to 0.', 'Node');
$this->assertTitle('0 | Drupal');
// Test that 0 appears in the template <h1>.
$xpath = '//h1';
$this->assertSame('0', $this->xpath($xpath)[0]->getText(), 'Node title is displayed as 0.');
......
......@@ -440,7 +440,7 @@ public function testPagePreviewWithRevisions() {
$this->drupalPostForm('node/add/page', $edit, t('Preview'));
// Check that the preview is displaying the title, body and term.
$this->assertTitle(t('@title | Drupal', ['@title' => $edit[$title_key]]), 'Basic page title is preview.');
$this->assertTitle($edit[$title_key] . ' | Drupal');
$this->assertText($edit[$title_key], 'Title displayed.');
$this->assertText($edit[$body_key], 'Body displayed.');
$this->assertText($edit[$term_key], 'Term displayed.');
......
......@@ -68,7 +68,7 @@ public function testSearchText() {
$this->drupalGet('search/node');
$this->assertText(t('Enter your keywords'));
$this->assertText(t('Search'));
$this->assertTitle(t('Search') . ' | Drupal', 'Search page title is correct');
$this->assertTitle('Search | Drupal');
$edit = [];
$search_terms = 'bike shed ' . $this->randomMachineName();
......@@ -77,7 +77,7 @@ public function testSearchText() {
$this->assertText('search yielded no results');
$this->assertText(t('Search'));
$title_source = 'Search for @keywords | Drupal';
$this->assertTitle(t($title_source, ['@keywords' => Unicode::truncate($search_terms, 60, TRUE, TRUE)]), 'Search page title is correct');
$this->assertTitle('Search for ' . Unicode::truncate($search_terms, 60, TRUE, TRUE) . ' | Drupal');
$this->assertNoText('Node', 'Erroneous tab and breadcrumb text is not present');
$this->assertNoText(t('Node'), 'Erroneous translated tab and breadcrumb text is not present');
$this->assertText(t('Content'), 'Tab and breadcrumb text is present');
......@@ -91,7 +91,7 @@ public function testSearchText() {
$search_terms = 'Every word is like an unnecessary stain on silence and nothingness.';
$edit['keys'] = $search_terms;
$this->drupalPostForm('search/node', $edit, t('Search'));
$this->assertTitle(t($title_source, ['@keywords' => 'Every word is like an unnecessary stain on silence and…']), 'Search page title is correct');
$this->assertTitle('Search for Every word is like an unnecessary stain on silence and… | Drupal');
// Search for a string with a lot of special characters.
$search_terms = 'Hear nothing > "see nothing" `feel' . " '1982.";
......@@ -103,7 +103,7 @@ public function testSearchText() {
$edit['keys'] = $this->searchingUser->getAccountName();
$this->drupalPostForm('search/user', $edit, t('Search'));
$this->assertText(t('Search'));
$this->assertTitle(t($title_source, ['@keywords' => Unicode::truncate($this->searchingUser->getAccountName(), 60, TRUE, TRUE)]));
$this->assertTitle('Search for ' . Unicode::truncate($this->searchingUser->getAccountName(), 60, TRUE, TRUE) . ' | Drupal');
$this->clickLink('Search help');
$this->assertText('Search help', 'Correct title is on search help page');
......
......@@ -60,7 +60,7 @@ public function testShortcutSetEdit() {
$this->drupalGet('admin/config/user-interface/shortcut/manage/' . $set->id() . '/customize');
// Test for the page title.
$this->assertTitle(t('List links') . ' | Drupal');
$this->assertTitle('List links | Drupal');
// Test for the table.
$element = $this->xpath('//div[@class="layout-content"]//table');
......
......@@ -29,7 +29,7 @@ public function testConfirmForm() {
// Test the building of the form.
$this->drupalGet('form-test/confirm-form');
$site_name = $this->config('system.site')->get('name');
$this->assertTitle(t('ConfirmFormTestForm::getQuestion(). | @site-name', ['@site-name' => $site_name]), 'The question was found as the page title.');
$this->assertTitle("ConfirmFormTestForm::getQuestion(). | $site_name");
$this->assertText(t('ConfirmFormTestForm::getDescription().'), 'The description was used.');
$this->assertFieldByXPath('//input[@id="edit-submit"]', t('ConfirmFormTestForm::getConfirmText().'), 'The confirm text was used.');
......
......@@ -41,7 +41,7 @@ protected function assertBreadcrumb($goto, array $trail, $page_title = NULL, arr
// Additionally assert page title, if given.
if (isset($page_title)) {
$this->assertTitle(strtr('@title | Drupal', ['@title' => $page_title]));
$this->assertTitle("$page_title | Drupal");
}
// Additionally assert active trail in a menu tree output, if given.
......
......@@ -60,7 +60,7 @@ public function testUninstallPage() {
$node->save();
$this->drupalGet('admin/modules/uninstall');
$this->assertTitle(t('Uninstall') . ' | Drupal');
$this->assertTitle('Uninstall | Drupal');
foreach (\Drupal::service('extension.list.module')->getAllInstalledInfo() as $module => $info) {
$field_name = "uninstall[$module]";
......@@ -136,7 +136,7 @@ public function testUninstallPage() {
// Make sure confirmation page is accessible only during uninstall process.
$this->drupalGet('admin/modules/uninstall/confirm');
$this->assertUrl('admin/modules/uninstall');
$this->assertTitle(t('Uninstall') . ' | Drupal');
$this->assertTitle('Uninstall | Drupal');
// Make sure the correct error is shown when no modules are selected.
$edit = [];
......
......@@ -51,7 +51,7 @@ public function drupalGetAuthorizePHP($page_title = 'system-test-auth') {
public function testFileTransferHooks() {
$page_title = $this->randomMachineName(16);
$this->drupalGetAuthorizePHP($page_title);
$this->assertTitle(strtr('@title | Drupal', ['@title' => $page_title]), 'authorize.php page title is correct.');
$this->assertTitle("$page_title | Drupal");
$this->assertNoText('It appears you have reached this page in error.');
$this->assertText('To continue, provide your server connection details');
// Make sure we see the new connection method added by system_test.
......
......@@ -81,7 +81,7 @@ public function testVocabularyInterface() {
$this->drupalPostForm('admin/structure/taxonomy/add', $edit, t('Save'));
$site_name = $this->config('system.site')->get('name');
$this->assertTitle(t("Don't Panic | @site-name", ['@site-name' => $site_name]), 'The page title contains the escaped character.');
$this->assertTitle("Don't Panic | $site_name");
}
/**
......
......@@ -212,7 +212,7 @@ public function testTrackerUser() {
$this->assertNoLink($unpublished->label());
// Verify that title and tab title have been set correctly.
$this->assertText('Activity', 'The user activity tab has the name "Activity".');
$this->assertTitle(t('@name | @site', ['@name' => $this->user->getAccountName(), '@site' => $this->config('system.site')->get('name')]), 'The user tracker page has the correct page title.');
$this->assertTitle($this->user->getAccountName() . ' | Drupal');
// Verify that unpublished comments are removed from the tracker.
$admin_user = $this->drupalCreateUser(['post comments', 'administer comments', 'access user profiles']);
......
......@@ -120,16 +120,16 @@ public function testAccountPageTitles() {
$title_suffix = ' | Drupal';
$this->drupalGet('user');
$this->assertTitle('Log in' . $title_suffix, "Page title of /user is 'Log in'");
$this->assertTitle('Log in' . $title_suffix);
$this->drupalGet('user/login');
$this->assertTitle('Log in' . $title_suffix, "Page title of /user/login is 'Log in'");
$this->assertTitle('Log in' . $title_suffix);
$this->drupalGet('user/register');
$this->assertTitle('Create new account' . $title_suffix, "Page title of /user/register is 'Create new account' for anonymous users.");
$this->assertTitle('Create new account' . $title_suffix);
$this->drupalGet('user/password');
$this->assertTitle('Reset your password' . $title_suffix, "Page title of /user/register is 'Reset your password' for anonymous users.");
$this->assertTitle('Reset your password' . $title_suffix);
// Check the page title for registered users is "My Account" in menus.
$this->drupalLogin($this->drupalCreateUser());
......
......@@ -105,12 +105,12 @@ public function testUserPasswordReset() {
// Check the one-time login page.
$this->assertText($this->account->getAccountName(), 'One-time login page contains the correct username.');
$this->assertText(t('This login can be used only once.'), 'Found warning about one-time login.');
$this->assertTitle(t('Reset password | Drupal'), 'Page title is "Reset password".');
$this->assertTitle('Reset password | Drupal');
// Check successful login.
$this->drupalPostForm(NULL, NULL, t('Log in'));
$this->assertLink(t('Log out'));
$this->assertTitle(t('@name | @site', ['@name' => $this->account->getAccountName(), '@site' => $this->config('system.site')->get('name')]), 'Logged in using password reset link.');
$this->assertTitle($this->account->getAccountName() . ' | Drupal');
// Change the forgotten password.
$password = user_password();
......@@ -189,7 +189,7 @@ public function testUserPasswordReset() {
$reset_url = $this->getResetURL();
$this->drupalGet($reset_url . '/login');
$this->assertLink(t('Log out'));
$this->assertTitle(t('@name | @site', ['@name' => $this->account->getAccountName(), '@site' => $this->config('system.site')->get('name')]), 'Logged in using password reset link.');
$this->assertTitle($this->account->getAccountName() . ' | Drupal');
// Ensure blocked and deleted accounts can't access the user.reset.login
// route.
......@@ -359,7 +359,7 @@ public function testUserResetPasswordUserFloodControlIsCleared() {
$reset_url = $this->getResetURL();
$this->drupalGet($reset_url . '/login');
$this->assertLink(t('Log out'));
$this->assertTitle(t('@name | @site', ['@name' => $this->account->getAccountName(), '@site' => $this->config('system.site')->get('name')]), 'Logged in using password reset link.');
$this->assertTitle($this->account->getAccountName() . ' | Drupal');
$this->drupalLogout();
// The next request should *not* trigger flood control, since a successful
......
......@@ -55,7 +55,7 @@ public function testRegistrationWithEmailVerification() {
$this->assertTrue($new_user->isActive(), 'New account is active after registration.');
$resetURL = user_pass_reset_url($new_user);
$this->drupalGet($resetURL);
$this->assertTitle(t('Set password | Drupal'), 'Page title is "Set password".');
$this->assertTitle('Set password | Drupal');
// Allow registration by site visitors, but require administrator approval.
$config->set('register', UserInterface::REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL)->save();
......
......@@ -99,7 +99,7 @@ public function testPageDisplayMenu() {
':a_class' => 'is-active',
]);
$this->assertEqual($element[0]->getText(), t('Test default tab'));
$this->assertTitle(t('Test default page | Drupal'));
$this->assertTitle('Test default page | Drupal');
$this->drupalGet('test_page_display_menu/default');
$this->assertSession()->statusCodeEquals(404);
......@@ -111,7 +111,7 @@ public function testPageDisplayMenu() {
':a_class' => 'is-active',
]);
$this->assertEqual($element[0]->getText(), t('Test local tab'));
$this->assertTitle(t('Test local page | Drupal'));
$this->assertTitle('Test local page | Drupal');
// Check an ordinary menu link.
$admin_user = $this->drupalCreateUser(['administer menu']);
......
......@@ -93,7 +93,7 @@ public function testDefaultViews() {
$edit = [
'id' => 'duplicate_of_glossary',
];
$this->assertTitle(t('Duplicate of @label | @site-name', ['@label' => 'Glossary', '@site-name' => $this->config('system.site')->get('name')]));
$this->assertTitle('Duplicate of Glossary | Drupal');
$this->drupalPostForm(NULL, $edit, t('Duplicate'));
$this->assertUrl('admin/structure/views/view/duplicate_of_glossary', [], 'The normal duplicating name schema is applied.');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment