summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2014-09-04 19:51:38 +0200
committerkondou <kondou@ts.unde.re>2014-09-04 20:44:50 +0200
commitecc9b42e4143773e4a850d6ee385328b16cda813 (patch)
tree06eb3ab650a82c270be4b42da24a493e897ed744 /tests
parenta10411d2bc3f98b8a0f2fa99563328ccf4605d0b (diff)
downloadnextcloud-server-ecc9b42e4143773e4a850d6ee385328b16cda813.tar.gz
nextcloud-server-ecc9b42e4143773e4a850d6ee385328b16cda813.zip
Match \OC_Helper::linkToPublic() to new links and fit unittests
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/helper.php26
1 files changed, 22 insertions, 4 deletions
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 20b8571b91d..cb342e295ba 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -443,15 +443,33 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
public function testLinkToPublic() {
\OC::$WEBROOT = '';
$result = \OC_Helper::linkToPublic('files');
- $this->assertEquals('http://localhost/public.php?service=files', $result);
+ $this->assertEquals('http://localhost/s', $result);
$result = \OC_Helper::linkToPublic('files', false);
- $this->assertEquals('http://localhost/public.php?service=files', $result);
+ $this->assertEquals('http://localhost/s', $result);
+ $result = \OC_Helper::linkToPublic('files', true);
+ $this->assertEquals('http://localhost/s/', $result);
+
+ $result = \OC_Helper::linkToPublic('other');
+ $this->assertEquals('http://localhost/public.php?service=other', $result);
+ $result = \OC_Helper::linkToPublic('other', false);
+ $this->assertEquals('http://localhost/public.php?service=other', $result);
+ $result = \OC_Helper::linkToPublic('other', true);
+ $this->assertEquals('http://localhost/public.php?service=other/', $result);
\OC::$WEBROOT = '/owncloud';
$result = \OC_Helper::linkToPublic('files');
- $this->assertEquals('http://localhost/owncloud/public.php?service=files', $result);
+ $this->assertEquals('http://localhost/owncloud/s', $result);
$result = \OC_Helper::linkToPublic('files', false);
- $this->assertEquals('http://localhost/owncloud/public.php?service=files', $result);
+ $this->assertEquals('http://localhost/owncloud/s', $result);
+ $result = \OC_Helper::linkToPublic('files', true);
+ $this->assertEquals('http://localhost/owncloud/s/', $result);
+
+ $result = \OC_Helper::linkToPublic('other');
+ $this->assertEquals('http://localhost/owncloud/public.php?service=other', $result);
+ $result = \OC_Helper::linkToPublic('other', false);
+ $this->assertEquals('http://localhost/owncloud/public.php?service=other', $result);
+ $result = \OC_Helper::linkToPublic('other', true);
+ $this->assertEquals('http://localhost/owncloud/public.php?service=other/', $result);
}
/**