diff -u b/core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php --- b/core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/RenderElementTypesTest.php @@ -7,9 +7,10 @@ namespace Drupal\system\Tests\Common; -use Drupal\simpletest\WebTestBase; use Drupal\Component\Utility\String; use Drupal\Component\Utility\Url; +use Drupal\Component\Utility\Xss; +use Drupal\simpletest\WebTestBase; /** * Tests the markup of core render element types passed to drupal_render(). @@ -148,7 +149,7 @@ else { $head_title = array('name' => String::checkPlain($site_name)); if ($site_slogan) { - $head_title['slogan'] = strip_tags(filter_xss_admin($site_slogan)); + $head_title['slogan'] = strip_tags(Xss::filterAdmin($site_slogan)); } } $head_title = implode(' | ', $head_title); @@ -175,33 +176,35 @@ $css = drupal_add_css(); // Simulate the expected output of a "vanilla" maintenance page. - $expected = ''; - $expected .= ''; - $expected .= ''; - $expected .= '!head'; - $expected .= '!head_title'; - $expected .= '!styles'; - $expected .= '!scripts'; - $expected .= ''; - $expected .= ''; - $expected .= '
'; - $expected .= '
'; - $expected .= ''; - $expected .= 'Home'; - $expected .= ''; - $expected .= '
'; - $expected .= '

'; - $expected .= '!site_name'; - $expected .= '

'; - $expected .= '
'; - $expected .= '
'; - $expected .= '
'; - $expected .= '!title'; - $expected .= '!content'; - $expected .= '
'; - $expected .= '
'; - $expected .= ''; - $expected .= ''; + $expected = << + + + !head + !head_title + !styles + !scripts + + +
+
+ + Home + +
+

+ !site_name +

+
+
+
+ !title + !content +
+
+ + +EOT; $placeholders = array( '!head' => drupal_get_html_head(),