diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-02 23:39:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 23:39:30 +0200 |
| commit | 8ede3f6346aaf96671878b320b82fd5542acef91 (patch) | |
| tree | c0759b03e99e374bed3c8adb98c166ba5337d9c2 /tests | |
| parent | e45248c17a796645c6de4399b6693405e5b19818 (diff) | |
| parent | 9dae927b0c666f8db70732b0ac098b44ed913d92 (diff) | |
| download | nextcloud-server-8ede3f6346aaf96671878b320b82fd5542acef91.tar.gz nextcloud-server-8ede3f6346aaf96671878b320b82fd5542acef91.zip | |
Merge pull request #11446 from nextcloud/bugfix/10678/pretty-urls-dont-work
Allow overwrite.cli.url without trailing slash
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/SetupTest.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/lib/SetupTest.php b/tests/lib/SetupTest.php index 628f9393c15..176a5b19f29 100644 --- a/tests/lib/SetupTest.php +++ b/tests/lib/SetupTest.php @@ -153,14 +153,24 @@ 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/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/test123/' => ['https://nctest13pgsql.lan/test123/', '/test123'], + 'https://nctest13pgsql.lan/test123' => ['https://nctest13pgsql.lan/test123', '/test123'], + '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/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], ]; } |