From 31ca404ff7ba5e8734172b9f23a60cb86f1d91d3 Mon Sep 17 00:00:00 2001
From: rubencm <rubencm@gmail.com>
Date: Sun, 21 Mar 2021 23:58:48 +0100
Subject: [PATCH] [ticket/14285] Fix tests

PHPBB3-14285
---
 tests/functional/feed_test.php                      | 2 +-
 tests/test_framework/phpbb_functional_test_case.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php
index 3651134c61..4c1f05542d 100644
--- a/tests/functional/feed_test.php
+++ b/tests/functional/feed_test.php
@@ -1417,7 +1417,7 @@ class phpbb_functional_feed_test extends phpbb_functional_test_case
 					$content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text();
 					foreach ($attachments as $i => $attachment)
 					{
-						$url = self::$root_url . "download/attachment/{$attachment['id']}";
+						$url = self::$root_url . "app.php/download/attachment/{$attachment['id']}";
 						$string = "Attachment #{$i}";
 
 						if ($attachment['displayed'])
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 2dfbfcfd5a..5df9d49be5 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -47,7 +47,6 @@ class phpbb_functional_test_case extends phpbb_test_case
 		parent::setUpBeforeClass();
 
 		self::$config = phpbb_test_case_helpers::get_test_config();
-		self::$root_url = self::$config['phpbb_functional_url'];
 
 		// Important: this is used both for installation and by
 		// test cases for querying the tables.
@@ -60,6 +59,8 @@ class phpbb_functional_test_case extends phpbb_test_case
 			self::markTestSkipped('phpbb_functional_url was not set in test_config and wasn\'t set as PHPBB_FUNCTIONAL_URL environment variable either.');
 		}
 
+		self::$root_url = self::$config['phpbb_functional_url'];
+
 		if (!self::$already_installed)
 		{
 			self::install_board();