From feab11e493deb978aeb2c45439b79fca23d830e0 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Fri, 1 Sep 2023 09:33:37 +0100
Subject: [PATCH] Issue #2986962 by fjgarlin, ppseftogiannis, smustgrave,
Sut3kh: BrowserTestBase::drupalGet() does not appear to be handling base url
properly
---
core/tests/Drupal/Tests/UiHelperTrait.php | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/core/tests/Drupal/Tests/UiHelperTrait.php b/core/tests/Drupal/Tests/UiHelperTrait.php
index 61fb51c3d273..7c2e59992fec 100644
--- a/core/tests/Drupal/Tests/UiHelperTrait.php
+++ b/core/tests/Drupal/Tests/UiHelperTrait.php
@@ -272,6 +272,8 @@ protected function drupalGet($path, array $options = [], array $headers = []) {
* An absolute URL string.
*/
protected function buildUrl($path, array $options = []) {
+ global $base_path;
+
if ($path instanceof Url) {
$url_options = $path->getOptions();
$options = $url_options + $options;
@@ -281,6 +283,12 @@ protected function buildUrl($path, array $options = []) {
// The URL generator service is not necessarily available yet; e.g., in
// interactive installer tests.
elseif (\Drupal::hasService('url_generator')) {
+ // Strip $base_path, if existent.
+ $length = strlen($base_path);
+ if (substr($path, 0, $length) === $base_path) {
+ $path = substr($path, $length);
+ }
+
$force_internal = isset($options['external']) && $options['external'] == FALSE;
if (!$force_internal && UrlHelper::isExternal($path)) {
return Url::fromUri($path, $options)->toString();
--
GitLab