summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-07-02 13:02:20 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-07-02 13:02:20 +0200
commitf5c57e076ecf7b897a6f6bbea8f4de32e57cfba2 (patch)
tree31d4ca594624f780881dde3c50aa9e8dd0731c38 /apps/files_sharing/tests
parentaedf4848f7100360d1f6695ebf23733e85b3a729 (diff)
parent8a2ef26b5e8f2f8b4235263fb25c4d94d2f06647 (diff)
downloadnextcloud-server-f5c57e076ecf7b897a6f6bbea8f4de32e57cfba2.tar.gz
nextcloud-server-f5c57e076ecf7b897a6f6bbea8f4de32e57cfba2.zip
Merge pull request #17077 from owncloud/files-scan-absolute-path
fix getting mount points when passing a path to the files:scan command
Diffstat (limited to 'apps/files_sharing/tests')
-rw-r--r--apps/files_sharing/tests/unsharechildren.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/files_sharing/tests/unsharechildren.php b/apps/files_sharing/tests/unsharechildren.php
index 0cf551c0500..c57070ba641 100644
--- a/apps/files_sharing/tests/unsharechildren.php
+++ b/apps/files_sharing/tests/unsharechildren.php
@@ -40,7 +40,7 @@ class UnshareChildren extends TestCase {
\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
$this->folder = self::TEST_FOLDER_NAME;
- $this->subfolder = '/subfolder_share_api_test';
+ $this->subfolder = '/subfolder_share_api_test';
$this->subsubfolder = '/subsubfolder_share_api_test';
$this->filename = '/share-api-test';
@@ -49,12 +49,14 @@ class UnshareChildren extends TestCase {
$this->view->mkdir($this->folder);
$this->view->mkdir($this->folder . $this->subfolder);
$this->view->mkdir($this->folder . $this->subfolder . $this->subsubfolder);
- $this->view->file_put_contents($this->folder.$this->filename, $this->data);
+ $this->view->file_put_contents($this->folder . $this->filename, $this->data);
$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
}
protected function tearDown() {
- $this->view->deleteAll($this->folder);
+ if ($this->view) {
+ $this->view->deleteAll($this->folder);
+ }
self::$tempStorage = null;