diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-29 11:21:00 +0400 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-29 11:21:00 +0400 |
| commit | c398fc59ad870751cee73a2fbef8bc75233a7515 (patch) | |
| tree | f686bab6d58a62fefd231b8132b5efa0001ba0ec /apps/files_encryption/tests/crypt.php | |
| parent | 09b54ccb2b01c558b1d9ccad1e335492d97b4fe1 (diff) | |
| parent | 7c0c6bd779cb73c4fdc9993f6dc78f9dd1138a88 (diff) | |
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/stream.php
Diffstat (limited to 'apps/files_encryption/tests/crypt.php')
| -rwxr-xr-x | apps/files_encryption/tests/crypt.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php index f5407deef0e..32156eea272 100755 --- a/apps/files_encryption/tests/crypt.php +++ b/apps/files_encryption/tests/crypt.php @@ -270,7 +270,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename); // get session - $session = new Encryption\Session($this->view); + $session = new \OCA\Encryption\Session($this->view); // get private key $privateKey = $session->getPrivateKey($this->userId); @@ -345,7 +345,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { $shareKey = Encryption\Keymanager::getShareKey($this->view, $this->userId, $filename); // get session - $session = new Encryption\Session($this->view); + $session = new \OCA\Encryption\Session($this->view); // get private key $privateKey = $session->getPrivateKey($this->userId); |