From 89dc7a3c6eee631ef4d4c072c7b551b79bec9a2e Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 19 Jun 2020 19:03:22 +0200
Subject: [PATCH] Fix tests
---
modules/admin/lib/Controller/Federation.php | 1 +
tests/modules/admin/lib/Controller/ConfigTest.php | 3 +++
tests/modules/admin/lib/Controller/TestTest.php | 5 +++++
3 files changed, 9 insertions(+)
diff --git a/modules/admin/lib/Controller/Federation.php b/modules/admin/lib/Controller/Federation.php
index b0cdef7bd..d45d0f2f7 100644
--- a/modules/admin/lib/Controller/Federation.php
+++ b/modules/admin/lib/Controller/Federation.php
@@ -415,6 +415,7 @@ class Federation
$error = $e->getMessage();
}
+ $output = [];
if ($entities !== null) {
// get all metadata for the entities
foreach ($entities as &$entity) {
diff --git a/tests/modules/admin/lib/Controller/ConfigTest.php b/tests/modules/admin/lib/Controller/ConfigTest.php
index 8685e4c9c..67611e0f6 100644
--- a/tests/modules/admin/lib/Controller/ConfigTest.php
+++ b/tests/modules/admin/lib/Controller/ConfigTest.php
@@ -81,6 +81,7 @@ class ConfigTest extends TestCase
*/
public function testDiagnostics(): void
{
+ $_SERVER['REQUEST_URI'] = '/module.php/admin/diagnostics';
$request = Request::create(
'/diagnostics',
'GET'
@@ -99,6 +100,7 @@ class ConfigTest extends TestCase
*/
public function testMain(): void
{
+ $_SERVER['REQUEST_URI'] = '/module.php/admin';
$request = Request::create(
'/',
'GET'
@@ -117,6 +119,7 @@ class ConfigTest extends TestCase
*/
public function testPhpinfo(): void
{
+ $_SERVER['REQUEST_URI'] = '/module.php/admin/phpinfo';
$request = Request::create(
'/phpinfo',
'GET'
diff --git a/tests/modules/admin/lib/Controller/TestTest.php b/tests/modules/admin/lib/Controller/TestTest.php
index a74fa8319..b509f78c4 100644
--- a/tests/modules/admin/lib/Controller/TestTest.php
+++ b/tests/modules/admin/lib/Controller/TestTest.php
@@ -78,6 +78,7 @@ class TestTest extends TestCase
*/
public function testMainWithoutAuthSource(): void
{
+ $_SERVER['REQUEST_URI'] = '/module.php/admin/test';
$request = Request::create(
'/test',
'GET'
@@ -97,6 +98,7 @@ class TestTest extends TestCase
*/
public function testMainWithAuthSourceAndLogout(): void
{
+ $_SERVER['REQUEST_URI'] = '/module.php/admin/test';
$request = Request::create(
'/test',
'GET',
@@ -124,6 +126,7 @@ class TestTest extends TestCase
*/
public function testMainWithAuthSourceAndException(): void
{
+ $_SERVER['REQUEST_URI'] = '/module.php/admin/test';
$request = Request::create(
'/test',
'GET',
@@ -150,6 +153,7 @@ class TestTest extends TestCase
*/
public function testMainWithAuthSourceNotAuthenticated(): void
{
+ $_SERVER['REQUEST_URI'] = '/module.php/admin/test';
$request = Request::create(
'/test',
'GET',
@@ -182,6 +186,7 @@ class TestTest extends TestCase
*/
public function testMainWithAuthSourceAuthenticated(): void
{
+ $_SERVER['REQUEST_URI'] = '/module.php/admin/test';
$request = Request::create(
'/test',
'GET'
--
GitLab