Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kesselberg <mail@danielkesselberg.de>2018-09-28 23:32:19 +0300
committerDaniel Kesselberg <mail@danielkesselberg.de>2018-09-28 23:32:19 +0300
commitc275beecebb96a914616e39ec61a22e4597358ec (patch)
treec6c850aa4a5d2a72bc48ea35a57eec9d0abce5ac /tests/lib/SetupTest.php
parentb7bd6bd68250612d975b63fcfbb0865224c93d7c (diff)
Allow url without / for overwrite.cli.url
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'tests/lib/SetupTest.php')
-rw-r--r--tests/lib/SetupTest.php11
1 files changed, 9 insertions, 2 deletions
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],
];
}