]> git.mxchange.org Git - friendica.git/commitdiff
Bugfix BaseURL
authorPhilipp Holzer <admin@philipp.info>
Sun, 14 Apr 2019 12:53:57 +0000 (14:53 +0200)
committerPhilipp Holzer <admin@philipp.info>
Sun, 14 Apr 2019 12:53:57 +0000 (14:53 +0200)
tests/src/Util/BaseURLTest.php

index ee88bd980461d95f90caf7d6a8b9fd0f16a27276..1e74af39fe3937d96811b7d1bd21736830619500 100644 (file)
@@ -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());