From c275beecebb96a914616e39ec61a22e4597358ec Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Fri, 28 Sep 2018 22:32:19 +0200 Subject: Allow url without / for overwrite.cli.url Signed-off-by: Daniel Kesselberg --- tests/lib/SetupTest.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php index 628f9393c15..68ef0b2913e 100644 --- a/tests/lib/SetupTest.php +++ b/tests/lib/SetupTest.php @@ -153,14 +153,21 @@ class SetupTest extends \Test\TestCase { } \OC::$CLI = $cliState; - $this->assertEquals($webRoot, $expected); + $this->assertSame($webRoot, $expected); } public function findWebRootProvider(): array { return [ 'https://www.example.com/nextcloud' => ['https://www.example.com/nextcloud', '/nextcloud'], 'https://www.example.com/' => ['https://www.example.com/', ''], - 'https://www.example.com' => ['https://www.example.com', false], + 'https://www.example.com' => ['https://www.example.com', ''], + 'https://nctest13pgsql.lan/nextcloud' => ['https://nctest13pgsql.lan/', ''], + 'https://nctest13pgsql.lan/' => ['https://nctest13pgsql.lan/', ''], + 'https://nctest13pgsql.lan' => ['https://nctest13pgsql.lan', ''], + 'https://192.168.10.10/nc' => ['https://192.168.10.10/nc', '/nc'], + 'https://192.168.10.10/' => ['https://192.168.10.10/', ''], + 'https://192.168.10.10' => ['https://192.168.10.10', ''], + 'invalid' => ['invalid', false], 'empty' => ['', false], ]; } -- cgit v1.2.3