diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-05-24 02:21:19 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-05-24 02:21:19 -0700 |
| commit | 4911305887840e21452b77f594cdf7e14ed967bf (patch) | |
| tree | 7e7fd7e90cb76b8159828303150b2c6b6ee56541 /tests | |
| parent | 3fbfe3c06a46f442c588daf037c997da658d3526 (diff) | |
| parent | 6c8de5ae6d11886d498e810808484a2bdfeaef12 (diff) | |
| download | nextcloud-server-4911305887840e21452b77f594cdf7e14ed967bf.tar.gz nextcloud-server-4911305887840e21452b77f594cdf7e14ed967bf.zip | |
Merge pull request #3416 from owncloud/files_encryption
New files encryption app
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/enable_all.php | 1 | ||||
| -rw-r--r-- | tests/lib/cache/file.php | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/enable_all.php b/tests/enable_all.php index 44af0115650..111ed0e1357 100644 --- a/tests/enable_all.php +++ b/tests/enable_all.php @@ -8,6 +8,7 @@ require_once __DIR__.'/../lib/base.php'; +OC_App::enable('files_encryption'); OC_App::enable('calendar'); OC_App::enable('contacts'); OC_App::enable('apptemplateadvanced'); diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php index 5dcd3268804..7da5a8b85c6 100644 --- a/tests/lib/cache/file.php +++ b/tests/lib/cache/file.php @@ -31,12 +31,13 @@ class Test_Cache_File extends Test_Cache { //clear all proxies and hooks so we can do clean testing OC_FileProxy::clearProxies(); OC_Hook::clear('OC_Filesystem'); - + + //disabled atm //enable only the encryption hook if needed - if(OC_App::isEnabled('files_encryption')) { - OC_FileProxy::register(new OC_FileProxy_Encryption()); - } - + //if(OC_App::isEnabled('files_encryption')) { + // OC_FileProxy::register(new OC_FileProxy_Encryption()); + //} + //set up temporary storage \OC\Files\Filesystem::clearMounts(); \OC\Files\Filesystem::mount('\OC\Files\Storage\Temporary',array(),'/'); |