Adapt tests to use new BaseURL UriInterface

diff --git a/tests/src/Content/Text/BBCodeTest.php b/tests/src/Content/Text/BBCodeTest.php
index 2cdbb7239eba00e8dd2ade630dd896054d11f370..4c1292344c1c5fee714affd5b142953c12b1b076 100644 (file)
--- a/tests/src/Content/Text/BBCodeTest.php
+++ b/tests/src/Content/Text/BBCodeTest.php
@@ -34,13 +34,11 @@ class BBCodeTest extends FixtureTest
                DI::config()->set('system', 'remove_multiplicated_lines', false);
                DI::config()->set('system', 'no_oembed', false);
                DI::config()->set('system', 'allowed_link_protocols', []);
-               DI::config()->set('system', 'url', 'friendica.local');
+               DI::config()->set('system', 'url', 'https://friendica.local');
                DI::config()->set('system', 'no_smilies', false);
                DI::config()->set('system', 'big_emojis', false);
                DI::config()->set('system', 'allowed_oembed', '');
 
-               DI::baseUrl()->save('friendica.local', DI::baseUrl()::SSL_POLICY_FULL, '');
-
                $config = \HTMLPurifier_HTML5Config::createDefault();
                $config->set('HTML.Doctype', 'HTML5');
                $config->set('Attr.AllowedRel', [

diff --git a/tests/src/Core/SystemTest.php b/tests/src/Core/SystemTest.php
index 9cfbe052cadfe235ca2f641f7f20381ad7a07ecc..c47539c79f18d574494e47546581c4c4bea6cf81 100644 (file)
--- a/tests/src/Core/SystemTest.php
+++ b/tests/src/Core/SystemTest.php
@@ -32,7 +32,7 @@ class SystemTest extends TestCase
        private function useBaseUrl()
        {
                $baseUrl = \Mockery::mock(BaseURL::class);
-               $baseUrl->shouldReceive('getHostname')->andReturn('friendica.local')->once();
+               $baseUrl->shouldReceive('getHost')->andReturn('friendica.local')->once();
                $dice = \Mockery::mock(Dice::class);
                $dice->shouldReceive('create')->with(BaseURL::class)->andReturn($baseUrl);
 

diff --git a/tests/src/Model/User/CookieTest.php b/tests/src/Model/User/CookieTest.php
index 64d5455ef3dc9067f37b947f0cfb4b26c08ed9e7..372645bf3f21ba48c4fb5235c1a0cd3e7f4668e7 100644 (file)
--- a/tests/src/Model/User/CookieTest.php
+++ b/tests/src/Model/User/CookieTest.php
@@ -60,7 +60,7 @@ class CookieTest extends MockedTest
         */
        public function testInstance()
        {
-               $this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
+               $this->baseUrl->shouldReceive('getScheme')->andReturn('https')->once();
                $this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn('1235')->once();
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
                $this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
@@ -127,7 +127,7 @@ class CookieTest extends MockedTest
         */
        public function testGet(array $cookieData, bool $hasValues, $uid, $hash, $ip)
        {
-               $this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
+               $this->baseUrl->shouldReceive('getScheme')->andReturn('https')->once();
                $this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn('1235')->once();
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
                $this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
@@ -188,7 +188,7 @@ class CookieTest extends MockedTest
         */
        public function testCheck(string $serverPrivateKey, string $userPrivateKey, string $password, string $assertHash, bool $assertTrue)
        {
-               $this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
+               $this->baseUrl->shouldReceive('getScheme')->andReturn('https')->once();
                $this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn($serverPrivateKey)->once();
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn('7')->once();
                $this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
@@ -248,7 +248,7 @@ class CookieTest extends MockedTest
         */
        public function testSet($serverKey, $uid, $password, $privateKey, $assertHash, $remoteIp, $serverArray)
        {
-               $this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
+               $this->baseUrl->shouldReceive('getScheme')->andReturn('https')->once();
                $this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn($serverKey)->once();
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
                $this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
@@ -275,7 +275,7 @@ class CookieTest extends MockedTest
         */
        public function testDoubleSet($serverKey, $uid, $password, $privateKey, $assertHash, $remoteIp, $serverArray)
        {
-               $this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
+               $this->baseUrl->shouldReceive('getScheme')->andReturn('https')->once();
                $this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn($serverKey)->once();
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
                $this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();
@@ -301,7 +301,7 @@ class CookieTest extends MockedTest
                        Cookie::NAME => 'test'
                ];
 
-               $this->baseUrl->shouldReceive('getSSLPolicy')->andReturn(true)->once();
+               $this->baseUrl->shouldReceive('getScheme')->andReturn('https')->once();
                $this->config->shouldReceive('get')->with('system', 'site_prvkey')->andReturn(24)->once();
                $this->config->shouldReceive('get')->with('system', 'auth_cookie_lifetime', Cookie::DEFAULT_EXPIRE)->andReturn(Cookie::DEFAULT_EXPIRE)->once();
                $this->config->shouldReceive('get')->with('proxy', 'trusted_proxies', '')->andReturn('')->once();

diff --git a/tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php b/tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php
index 6311175d34b007361a5232ca86f5f01e5928f591..b6166fc400d48404148f864ae18642c87f128f26 100644 (file)
--- a/tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php
+++ b/tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php
@@ -21,12 +21,9 @@
 
 namespace Friendica\Test\src\Module\Api\GnuSocial\GnuSocial;
 
-use Friendica\App\BaseURL;
-use Friendica\App\Router;
 use Friendica\DI;
 use Friendica\Module\Api\GNUSocial\GNUSocial\Config;
 use Friendica\Test\src\Module\Api\ApiTest;
-use Friendica\Test\Util\VFSTrait;
 
 class ConfigTest extends ApiTest
 {
@@ -35,13 +32,11 @@ class ConfigTest extends ApiTest
         */
        public function testApiStatusnetConfig()
        {
-               DI::config()->set('system', 'ssl_policy', BaseURL::SSL_POLICY_FULL);
-
                $response = (new Config(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
                $json = $this->toJson($response);
 
-               self::assertEquals(DI::config()->get('config', 'hostname'), $json->site->server);
+               self::assertEquals(DI::baseUrl()->getHost(), $json->site->server);
                self::assertEquals(DI::config()->get('system', 'theme'), $json->site->theme);
                self::assertEquals(DI::baseUrl() . '/images/friendica-64.png', $json->site->logo);
                self::assertTrue($json->site->fancy);

diff --git a/tests/src/Util/EMailerTest.php b/tests/src/Util/EMailerTest.php
index b43482b304fd51a5f8b0ccbc82179eef29a9171c..6432d580085f6ef38f432b7bd0bb41ce052e5104 100644 (file)
--- a/tests/src/Util/EMailerTest.php
+++ b/tests/src/Util/EMailerTest.php
@@ -68,8 +68,8 @@ class EMailerTest extends MockedTest
                $this->pConfig = \Mockery::mock(IManagePersonalConfigValues::class);
                $this->l10n    = \Mockery::mock(L10n::class);
                $this->baseUrl = \Mockery::mock(BaseURL::class);
-               $this->baseUrl->shouldReceive('getHostname')->andReturn('friendica.local');
-               $this->baseUrl->shouldReceive('get')->andReturn('http://friendica.local');
+               $this->baseUrl->shouldReceive('getHost')->andReturn('friendica.local');
+               $this->baseUrl->shouldReceive('__toString')->andReturn('http://friendica.local');
        }
 
        protected function tearDown(): void

diff --git a/tests/src/Util/Emailer/MailBuilderTest.php b/tests/src/Util/Emailer/MailBuilderTest.php
index 76d2ef1918034c0c33c6f568dbd3f2acf4d4687c..ecfed9f084a0b5e625e664a5f72f5f96310decd5 100644 (file)
--- a/tests/src/Util/Emailer/MailBuilderTest.php
+++ b/tests/src/Util/Emailer/MailBuilderTest.php
@@ -60,8 +60,8 @@ class MailBuilderTest extends MockedTest
                $this->config  = \Mockery::mock(IManageConfigValues::class);
                $this->l10n    = \Mockery::mock(L10n::class);
                $this->baseUrl = \Mockery::mock(BaseURL::class);
-               $this->baseUrl->shouldReceive('getHostname')->andReturn('friendica.local');
-               $this->baseUrl->shouldReceive('get')->andReturn('http://friendica.local');
+               $this->baseUrl->shouldReceive('getHost')->andReturn('friendica.local');
+               $this->baseUrl->shouldReceive('__toString')->andReturn('http://friendica.local');
 
                $this->defaultHeaders = [];
        }

diff --git a/tests/src/Util/Emailer/SystemMailBuilderTest.php b/tests/src/Util/Emailer/SystemMailBuilderTest.php
index 13262d20723f5da08be0304835d396e0437811ef..fe3b5709682b931b9050e958254f441582d8c148 100644 (file)
--- a/tests/src/Util/Emailer/SystemMailBuilderTest.php
+++ b/tests/src/Util/Emailer/SystemMailBuilderTest.php
@@ -54,8 +54,8 @@ class SystemMailBuilderTest extends MockedTest
                        return $msg;
                });
                $this->baseUrl = \Mockery::mock(BaseURL::class);
-               $this->baseUrl->shouldReceive('getHostname')->andReturn('friendica.local');
-               $this->baseUrl->shouldReceive('get')->andReturn('http://friendica.local');
+               $this->baseUrl->shouldReceive('getHost')->andReturn('friendica.local');
+               $this->baseUrl->shouldReceive('__toString')->andReturn('http://friendica.local');
        }
 
        /**