From ed5d89dc18f19686d8dfccdf9cb6a03295181933 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sat, 16 Dec 2023 08:14:26 +0000
Subject: [PATCH] Issue #3402618 by zniki.ru: Replace $GLOBALS['base_root']
with getAbsoluteUrl() in Functional Test
---
.../tests/src/Functional/ConfigTranslationUiThemeTest.php | 2 +-
core/modules/system/tests/src/Functional/Pager/PagerTest.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
index 04227c6370da..0ebd70b7f415 100644
--- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
@@ -73,7 +73,7 @@ public function testThemeDiscovery() {
$this->drupalGet('admin/appearance');
$element = $this->assertSession()->elementExists('xpath', "//a[normalize-space()='Install and set as default' and contains(@href, '{$theme}')]");
- $this->drupalGet($GLOBALS['base_root'] . $element->getAttribute('href'), ['external' => TRUE]);
+ $this->drupalGet($this->getAbsoluteUrl($element->getAttribute('href')), ['external' => TRUE]);
$translation_base_url = 'admin/config/development/performance/translate';
$this->drupalGet($translation_base_url);
diff --git a/core/modules/system/tests/src/Functional/Pager/PagerTest.php b/core/modules/system/tests/src/Functional/Pager/PagerTest.php
index 02f6263d5e79..9686d44dbb68 100644
--- a/core/modules/system/tests/src/Functional/Pager/PagerTest.php
+++ b/core/modules/system/tests/src/Functional/Pager/PagerTest.php
@@ -73,7 +73,7 @@ public function testActiveClass() {
$element = $this->assertSession()->elementExists('xpath', '//li[contains(@class, "pager__item--last")]/a');
preg_match('@page=(\d+)@', $element->getAttribute('href'), $matches);
$current_page = (int) $matches[1];
- $this->drupalGet($GLOBALS['base_root'] . parse_url($this->getUrl())['path'] . $element->getAttribute('href'), ['external' => TRUE]);
+ $this->drupalGet($this->getAbsoluteUrl(parse_url($this->getUrl())['path'] . $element->getAttribute('href')), ['external' => TRUE]);
$this->assertPagerItems($current_page);
// Verify the pager does not render on a list without pagination.
@@ -181,7 +181,7 @@ public function testMultiplePagers() {
// (1-indexed) and resulting query parameter
foreach ($test_data as $data) {
$input_query = str_replace(' ', '%20', $data['input_query']);
- $this->drupalGet($GLOBALS['base_root'] . parse_url($this->getUrl())['path'] . $input_query, ['external' => TRUE]);
+ $this->drupalGet($this->getAbsoluteUrl(parse_url($this->getUrl())['path'] . $input_query), ['external' => TRUE]);
foreach ([0, 1, 4] as $pager_element) {
$active_page = $this->cssSelect("div.test-pager-{$pager_element} ul.pager__items li.is-active:contains('{$data['expected_page'][$pager_element]}')");
$destination = str_replace('%2C', ',', $active_page[0]->find('css', 'a')->getAttribute('href'));
--
GitLab