summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-03-26 22:39:04 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-03-26 22:39:04 +0100
commitd082e37270f19269cd13098cb013c8543f4a1843 (patch)
treed6f733ddf5cf5d3d096d28f158838c2785236a08 /apps/files_sharing/tests
parentc2909355bf66c92e46c9fbea39497ba91dbe37a0 (diff)
parenta3592534ef9dfd93388c09e9aa6fce3ca45fc9ee (diff)
downloadnextcloud-server-d082e37270f19269cd13098cb013c8543f4a1843.tar.gz
nextcloud-server-d082e37270f19269cd13098cb013c8543f4a1843.zip
Merge pull request #15244 from owncloud/use_default_share_folder
always fall back to default share folder
Diffstat (limited to 'apps/files_sharing/tests')
-rw-r--r--apps/files_sharing/tests/helper.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files_sharing/tests/helper.php b/apps/files_sharing/tests/helper.php
index 1d7093a1cf0..34a1389db77 100644
--- a/apps/files_sharing/tests/helper.php
+++ b/apps/files_sharing/tests/helper.php
@@ -52,9 +52,11 @@ class Test_Files_Sharing_Helper extends TestCase {
function testSetGetShareFolder() {
$this->assertSame('/', \OCA\Files_Sharing\Helper::getShareFolder());
- \OCA\Files_Sharing\Helper::setShareFolder('/Shared');
+ \OCA\Files_Sharing\Helper::setShareFolder('/Shared/Folder');
- $this->assertSame('/Shared', \OCA\Files_Sharing\Helper::getShareFolder());
+ $sharedFolder = \OCA\Files_Sharing\Helper::getShareFolder();
+ $this->assertSame('/Shared/Folder', \OCA\Files_Sharing\Helper::getShareFolder());
+ $this->assertTrue(\OC\Files\Filesystem::is_dir($sharedFolder));
// cleanup
\OC::$server->getConfig()->deleteSystemValue('share_folder');