diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-21 00:23:38 +0100 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-11-21 00:23:38 +0100 |
| commit | b27fc42e1f0fbd1edebb1eb1818de4b4e0c4ee4b (patch) | |
| tree | 6e66949a72e8471a01817ff05851b65aec6ef8f0 /apps/files_encryption/tests | |
| parent | 318db64b2d9f724c3209bd6ca97f560840e2cc20 (diff) | |
| download | nextcloud-server-b27fc42e1f0fbd1edebb1eb1818de4b4e0c4ee4b.tar.gz nextcloud-server-b27fc42e1f0fbd1edebb1eb1818de4b4e0c4ee4b.zip | |
public upload now also works with encryption enabled
Diffstat (limited to 'apps/files_encryption/tests')
| -rw-r--r-- | apps/files_encryption/tests/keymanager.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php index ad6bbd3a7e9..72ee270ee59 100644 --- a/apps/files_encryption/tests/keymanager.php +++ b/apps/files_encryption/tests/keymanager.php @@ -145,13 +145,15 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { $file = 'unittest-' . time() . '.txt'; + $util = new Encryption\Util($this->view, $this->userId); + // Disable encryption proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; \OC_FileProxy::$enabled = false; $this->view->file_put_contents($this->userId . '/files/' . $file, $this->dataShort); - Encryption\Keymanager::setFileKey($this->view, $file, $this->userId, $key); + Encryption\Keymanager::setFileKey($this->view, $util, $file, $this->userId, $key); $this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles/' . $file . '.key')); |