Merge pull request PrestaShop#1065 from tblivet/fix/assets-path

[NEW UI] Fix assets path
tblivet · Dec 4, 2024 · 5166761 · 5166761
2 parents 0c8863e + 6bb0aa1
commit 5166761
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/classes/Twig/AssetsEnvironment.php b/classes/Twig/AssetsEnvironment.php
@@ -77,6 +77,6 @@ private function getShopUrlFromRequest(Request $request): string
 
         $path = array_splice($path, 0, -$numberOfSubDirs);
 
-        return $request->getSchemeAndHttpHost() . implode('/', $path);
+        return implode('/', $path);
     }
 }
diff --git a/tests/unit/Twig/AssetsEnvironmentTest.php b/tests/unit/Twig/AssetsEnvironmentTest.php
@@ -72,7 +72,7 @@ public function testGetAssetsBaseUrlReturnsDevUrlInDevMode()
 
     public function testGetAssetsBaseUrlReturnsProductionUrl()
     {
-        $expectedUrl = 'http://localhost/modules/autoupgrade/views';
+        $expectedUrl = '/modules/autoupgrade/views';
         $server = [
             'HTTP_HOST' => 'localhost',
             'SERVER_PORT' => '80',
@@ -100,7 +100,7 @@ public function testGetAssetsBaseUrlReturnsProductionUrlWithShopInSubFolder()
 
         $request = new Request([], [], [], [], [], $server);
 
-        $expectedUrl = 'http://localhost/hello-world/modules/autoupgrade/views';
+        $expectedUrl = '/hello-world/modules/autoupgrade/views';
         $this->assertSame($expectedUrl, $this->assetsEnvironment->getAssetsBaseUrl($request));
     }
 
@@ -117,7 +117,7 @@ public function testGetAssetsBaseUrlReturnsProductionUrlWithCustomEntrypoint()
 
         $request = new Request([], [], [], [], [], $server);
 
-        $expectedUrl = 'http://localhost/modules/autoupgrade/views';
+        $expectedUrl = '/modules/autoupgrade/views';
         $this->assertSame($expectedUrl, $this->assetsEnvironment->getAssetsBaseUrl($request));
     }
 
@@ -134,7 +134,7 @@ public function testGetAssetsBaseUrlReturnsProductionUrlWithShopInSubFolderAndPa
 
         $request = new Request([], [], [], [], [], $server);
 
-        $expectedUrl = 'http://localhost/hello-world/modules/autoupgrade/views';
+        $expectedUrl = '/hello-world/modules/autoupgrade/views';
         $this->assertSame($expectedUrl, $this->assetsEnvironment->getAssetsBaseUrl($request));
     }
 }