diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2014-04-01 21:23:53 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2014-04-01 21:23:53 +0200 |
| commit | 630b5b648f4cf3742978f00f6b70c574846f2be8 (patch) | |
| tree | 68ff7e4335829e8538d95a34f1700006c75fdb8e /apps | |
| parent | 0e93c3fd9a969594661fd3165f91878759ef3003 (diff) | |
| parent | f37a76c396ae728b1f1061cc37213dad5fd06f12 (diff) | |
| download | nextcloud-server-630b5b648f4cf3742978f00f6b70c574846f2be8.tar.gz nextcloud-server-630b5b648f4cf3742978f00f6b70c574846f2be8.zip | |
Merge pull request #7997 from owncloud/correct-remember-trashbin-state
Correct the remembering of the trashbin app state in encryption test
Diffstat (limited to 'apps')
| -rwxr-xr-x | apps/files_encryption/tests/share.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php index be56968ac09..1f57d7cb635 100755 --- a/apps/files_encryption/tests/share.php +++ b/apps/files_encryption/tests/share.php @@ -100,11 +100,11 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { $this->filename = 'share-tmp.test'; - // we don't want to tests with app files_trashbin enabled - \OC_App::disable('files_trashbin'); - // remember files_trashbin state $this->stateFilesTrashbin = OC_App::isEnabled('files_trashbin'); + + // we don't want to tests with app files_trashbin enabled + \OC_App::disable('files_trashbin'); } function tearDown() { |