diff -u b/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php b/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php --- b/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php +++ b/core/modules/block_content/tests/src/Functional/BlockContentListViewsTest.php @@ -114,7 +114,7 @@ $delete_text = t('Delete'); $this->clickLink($delete_text); $this->assertSession()->statusCodeEquals(200); - $this->assertTitle("Are you sure you want to delete the custom block $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 diff -u b/core/modules/content_translation/tests/src/Functional/Views/ContentTranslationViewsUITest.php b/core/modules/content_translation/tests/src/Functional/Views/ContentTranslationViewsUITest.php --- b/core/modules/content_translation/tests/src/Functional/Views/ContentTranslationViewsUITest.php +++ b/core/modules/content_translation/tests/src/Functional/Views/ContentTranslationViewsUITest.php @@ -35,7 +35,7 @@ */ public function testViewsUI() { $this->drupalGet('admin/structure/views/view/test_view/edit'); - $this->assertTitle('Test view (Views test data) | ' . $this->config('system.site')->get('name')); + $this->assertTitle('Test view (Views test data) | Drupal'); } } diff -u b/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php b/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php --- b/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php +++ b/core/modules/image/tests/src/Functional/ImageAdminStylesTest.php @@ -216,7 +216,7 @@ // Check that the URL was updated. $this->drupalGet($style_path); - $this->assertTitle("Edit style $style_label | Drupal"); + $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']); diff -u b/core/modules/search/tests/src/Functional/SearchPageTextTest.php b/core/modules/search/tests/src/Functional/SearchPageTextTest.php --- b/core/modules/search/tests/src/Functional/SearchPageTextTest.php +++ b/core/modules/search/tests/src/Functional/SearchPageTextTest.php @@ -76,6 +76,7 @@ $this->drupalPostForm('search/node', $edit, t('Search')); $this->assertText('search yielded no results'); $this->assertText(t('Search')); + $title_source = 'Search for @keywords | Drupal'; $title_source = 'Search for '.Unicode::truncate($search_terms, 60, TRUE, TRUE).' | Drupal'; $this->assertTitle('Search for ' . Unicode::truncate($search_terms, 60, TRUE, TRUE) . ' | Drupal'); $this->assertNoText('Node', 'Erroneous tab and breadcrumb text is not present'); diff -u b/core/modules/tracker/tests/src/Functional/TrackerTest.php b/core/modules/tracker/tests/src/Functional/TrackerTest.php --- b/core/modules/tracker/tests/src/Functional/TrackerTest.php +++ b/core/modules/tracker/tests/src/Functional/TrackerTest.php @@ -212,7 +212,7 @@ $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($this->user->getAccountName() . ' | ' . $this->config('system.site')->get('name')); + $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']); diff -u b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php --- b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php +++ b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php @@ -110,7 +110,7 @@ // Check successful login. $this->drupalPostForm(NULL, NULL, t('Log in')); $this->assertLink(t('Log out')); - $this->assertTitle($this->account->getAccountName() . ' | ' . $this->config('system.site')->get('name')); + $this->assertTitle($this->account->getAccountName() . ' | Drupal'); // Change the forgotten password. $password = user_password(); @@ -189,7 +189,7 @@ $reset_url = $this->getResetURL(); $this->drupalGet($reset_url . '/login'); $this->assertLink(t('Log out')); - $this->assertTitle($this->account->getAccountName() . ' | ' . $this->config('system.site')->get('name')); + $this->assertTitle($this->account->getAccountName() . ' | Drupal'); // Ensure blocked and deleted accounts can't access the user.reset.login // route. @@ -359,7 +359,7 @@ $reset_url = $this->getResetURL(); $this->drupalGet($reset_url . '/login'); $this->assertLink(t('Log out')); - $this->assertTitle($this->account->getAccountName() . ' | ' . $this->config('system.site')->get('name')); + $this->assertTitle($this->account->getAccountName() . ' | Drupal'); $this->drupalLogout(); // The next request should *not* trigger flood control, since a successful diff -u b/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php b/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php --- b/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php +++ b/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php @@ -93,7 +93,7 @@ $edit = [ 'id' => 'duplicate_of_glossary', ]; - $this->assertTitle('Duplicate of Glossary | ' . $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.');