summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/tests/controller/sharecontroller.php
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-05-20 13:52:08 +0200
committerVincent Petry <pvince81@owncloud.com>2015-05-20 13:52:08 +0200
commit7386257676cff4648f4e71d05cdabff75578e947 (patch)
treea7320e5eec4f943cbc03f97cf5b9d942a5ef672e /apps/files_sharing/tests/controller/sharecontroller.php
parentf9784745776eda5caedbbc72cf516ae70bce6f6a (diff)
parent6d97dfb00c6bd660d9f8ac3a579f34d70fe87af1 (diff)
downloadnextcloud-server-7386257676cff4648f4e71d05cdabff75578e947.tar.gz
nextcloud-server-7386257676cff4648f4e71d05cdabff75578e947.zip
Merge pull request #16075 from owncloud/skeleton-copy-delay
wait with copying the skeleton untill login and setupfs are done
Diffstat (limited to 'apps/files_sharing/tests/controller/sharecontroller.php')
-rw-r--r--apps/files_sharing/tests/controller/sharecontroller.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php
index d0c111b8e5b..eaa7ce7bfde 100644
--- a/apps/files_sharing/tests/controller/sharecontroller.php
+++ b/apps/files_sharing/tests/controller/sharecontroller.php
@@ -77,10 +77,7 @@ class ShareControllerTest extends \Test\TestCase {
\OC_User::createUser($this->user, $this->user);
\OC_Util::tearDownFS();
- \OC_User::setUserId('');
- Filesystem::tearDown();
- \OC_User::setUserId($this->user);
- \OC_Util::setupFS($this->user);
+ $this->loginAsUser($this->user);
// Create a dummy shared file
$view = new View('/'. $this->user . '/files');