diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/RouterTest.php b/core/modules/system/lib/Drupal/system/Tests/Routing/RouterTest.php index b32c724..fbbb607 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Routing/RouterTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Routing/RouterTest.php @@ -147,12 +147,17 @@ public function testControllerResolutionPage() { * Checks the generate method on the url generator using the front router. */ public function testUrlGeneratorFront() { + // Setup the request context of the url generator. Note: Just calling the + // code without a proper request, does not setup the request context + // automatically. $context = new RequestContext(); $context->fromRequest($this->container->get('request')); $this->container->get('url_generator')->setContext($context); - $this->assertEqual($this->container->get('url_generator')->generate('front'), $context->getBaseUrl() . '/'); - $this->assertEqual($this->container->get('url_generator')->generateFromPath(''), $context->getBaseUrl() . '/'); + global $base_path; + + $this->assertEqual($this->container->get('url_generator')->generate('front'), $base_path); + $this->assertEqual($this->container->get('url_generator')->generateFromPath(''), $base_path); } /**