diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-11-17 16:44:45 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-11-17 16:44:45 +0100 |
| commit | 146cb920c9daba10da0bd93efab3e64df97224de (patch) | |
| tree | d55b5e13f4b9903cc23b9946ce188e9ad8c62ad7 /apps/files | |
| parent | 36528c6ef622876f9d89d3b0fbfafc8e44f569fb (diff) | |
| parent | 6625d5c88f74edade459ec7e2ee0bfb79f21fedd (diff) | |
| download | nextcloud-server-146cb920c9daba10da0bd93efab3e64df97224de.tar.gz nextcloud-server-146cb920c9daba10da0bd93efab3e64df97224de.zip | |
Merge pull request #12218 from owncloud/issue/10991-fixes
Issue/10991 Make unit tests pass on windows
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/tests/ajax_rename.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php index 5ed8b1931f4..3bccaca1231 100644 --- a/apps/files/tests/ajax_rename.php +++ b/apps/files/tests/ajax_rename.php @@ -34,7 +34,14 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase { */ private $files; - function setUp() { + /** @var \OC\Files\Storage\Storage */ + private $originalStorage; + + protected function setUp() { + parent::setUp(); + + $this->originalStorage = \OC\Files\Filesystem::getStorage('/'); + // mock OC_L10n if (!self::$user) { self::$user = uniqid(); @@ -59,10 +66,13 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase { $this->files = new \OCA\Files\App($viewMock, $l10nMock); } - function tearDown() { + protected function tearDown() { $result = \OC_User::deleteUser(self::$user); $this->assertTrue($result); \OC\Files\Filesystem::tearDown(); + \OC\Files\Filesystem::mount($this->originalStorage, array(), '/'); + + parent::tearDown(); } /** |