aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-04-21 11:48:26 +0200
committerVincent Petry <pvince81@owncloud.com>2016-04-21 11:48:26 +0200
commitb50d3255fb512c1b4f1186a5874c9528d9b407a3 (patch)
tree8874e8f1d00f1b3694951ada7234622bb21fb291 /tests
parent6f5d3adfa405d41dd0e803d44bd54efcaa35769b (diff)
parent89223379ad155ae0896d1481089e3751257aa76f (diff)
downloadnextcloud-server-b50d3255fb512c1b4f1186a5874c9528d9b407a3.tar.gz
nextcloud-server-b50d3255fb512c1b4f1186a5874c9528d9b407a3.zip
Merge pull request #22791 from owncloud/enc_master_key_improvements
Enc master key improvements
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/traits/encryptiontrait.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/lib/traits/encryptiontrait.php b/tests/lib/traits/encryptiontrait.php
index 2c1c585d6d4..5e2ca4e561f 100644
--- a/tests/lib/traits/encryptiontrait.php
+++ b/tests/lib/traits/encryptiontrait.php
@@ -63,7 +63,7 @@ trait EncryptionTrait {
$keyManager = $container->query('KeyManager');
/** @var Setup $userSetup */
$userSetup = $container->query('UserSetup');
- $userSetup->setupServerSide($name, $password);
+ $userSetup->setupUser($name, $password);
$keyManager->init($name, $password);
}