From 462973b0028ae62d4c817b8ef80298dc3319da77 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 14 Apr 2019 14:53:57 +0200 Subject: [PATCH] Bugfix BaseURL --- tests/src/Util/BaseURLTest.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/src/Util/BaseURLTest.php b/tests/src/Util/BaseURLTest.php index ee88bd9804..1e74af39fe 100644 --- a/tests/src/Util/BaseURLTest.php +++ b/tests/src/Util/BaseURLTest.php @@ -179,18 +179,26 @@ class BaseURLTest extends MockedTest $configMock->shouldReceive('get')->with('system', 'ssl_policy')->andReturn($input['sslPolicy']); $configMock->shouldReceive('get')->with('system', 'url')->andReturn($input['url']); + // If we don't have an urlPath as an input, we assert it, we will save it to the DB for the next time if (!isset($input['urlPath']) && isset($assert['urlPath'])) { $configMock->shouldReceive('set')->with('system', 'urlpath', $assert['urlPath'])->once(); } + // If we don't have the ssl_policy as an input, we assert it, we will save it to the DB for the next time if (!isset($input['sslPolicy']) && isset($assert['sslPolicy'])) { $configMock->shouldReceive('set')->with('system', 'ssl_policy', $assert['sslPolicy'])->once(); } - if (!isset($input['hostname']) && !empty($assert['hostname'])) { + // If we don't have the hostname as an input, we assert it, we will save it to the DB for the next time + if (empty($input['hostname']) && !empty($assert['hostname'])) { $configMock->shouldReceive('set')->with('config', 'hostname', $assert['hostname'])->once(); } + // If we don't have an URL at first, but we assert it, we will save it to the DB for the next time + if (empty($input['url']) && !empty($assert['url'])) { + $configMock->shouldReceive('set')->with('system', 'url', $assert['url'])->once(); + } + $baseUrl = new BaseURL($configMock, $server); $this->assertEquals($assert['hostname'], $baseUrl->getHostname()); -- 2.39.5