diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php index 61f9eac..511c00b 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php +++ b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php @@ -58,12 +58,12 @@ public function testTwigUrlGenerator() { $expected = array( 'url_from_path not absolute: ' . $url_generator->generateFromPath('user/register'), 'url_from_path absolute: ' . $url_generator->generateFromPath('user/register', array('absolute' => TRUE)), - 'url not absolute: ' . $url_generator->generateFromRoute('user_register'), - 'url absolute: ' . $url_generator->generateFromRoute('user_register', array(), array('absolute' => TRUE)), - 'url absolute with fragment: ' . $url_generator->generateFromRoute('user_register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')), - 'link not absolute: ' . $link_generator->generate('Register', 'user_register'), - 'link absolute: ' . $link_generator->generate('Register', 'user_register', array(), array('absolute' => TRUE)), - 'link absolute with fragment: ' . $link_generator->generate('Register', 'user_register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')), + 'url not absolute: ' . $url_generator->generateFromRoute('user.register'), + 'url absolute: ' . $url_generator->generateFromRoute('user.register', array(), array('absolute' => TRUE)), + 'url absolute with fragment: ' . $url_generator->generateFromRoute('user.register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')), + 'link not absolute: ' . $link_generator->generate('Register', 'user.register'), + 'link absolute: ' . $link_generator->generate('Register', 'user.register', array(), array('absolute' => TRUE)), + 'link absolute with fragment: ' . $link_generator->generate('Register', 'user.register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')), ); // Make sure we got something. $content = $this->drupalGetContent(); diff --git a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_generator.html.twig b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_generator.html.twig index 569718f..70c2179 100644 --- a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_generator.html.twig +++ b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_generator.html.twig @@ -5,16 +5,16 @@ {# Test the url twig function #} -
url not absolute: {{ url('user_register') }}
+
url not absolute: {{ url('user.register') }}
-
url absolute: {{ url('user_register', {}, {'absolute': '1' }) }}
+
url absolute: {{ url('user.register', {}, {'absolute': '1' }) }}
-
url absolute with fragment: {{ url('user_register', {}, {'absolute': '1', 'fragment': 'bottom' }) }}
+
url absolute with fragment: {{ url('user.register', {}, {'absolute': '1', 'fragment': 'bottom' }) }}
{# Test the link twig function #} -
link not absolute: {{ link('Register', 'user_register') }}
+
link not absolute: {{ link('Register', 'user.register') }}
-
link absolute: {{ link('Register', 'user_register', {}, {'absolute': '1' }) }}
+
link absolute: {{ link('Register', 'user.register', {}, {'absolute': '1' }) }}
-
link absolute with fragment: {{ link('Register', 'user_register', {}, {'absolute': '1', 'fragment': 'bottom' }) }}
+
link absolute with fragment: {{ link('Register', 'user.register', {}, {'absolute': '1', 'fragment': 'bottom' }) }}