summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authoricewind1991 <robin@icewind.nl>2014-01-14 07:13:21 -0800
committericewind1991 <robin@icewind.nl>2014-01-14 07:13:21 -0800
commitc6ca9be4063855557621c992adfc40c4e408b487 (patch)
tree60a2dee50951d1760602e6deed9cb5f8250d1e21 /tests/lib
parent7dddf59942fa1c2b211a6906b910190b759606b7 (diff)
parenta8fd55d90df1c8db3ef096d3e85d0b83336f10fb (diff)
downloadnextcloud-server-c6ca9be4063855557621c992adfc40c4e408b487.tar.gz
nextcloud-server-c6ca9be4063855557621c992adfc40c4e408b487.zip
Merge pull request #6612 from owncloud/user-no-change-displayname-stable
Backport: Re-add the config options to remove the ability for users to change their displayname
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/user/user.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
index 0bbcda013ce..3f90432c6b0 100644
--- a/tests/lib/user/user.php
+++ b/tests/lib/user/user.php
@@ -9,6 +9,7 @@
namespace Test\User;
+use OC\AllConfig;
use OC\Hooks\PublicEmitter;
class User extends \PHPUnit_Framework_TestCase {
@@ -205,7 +206,9 @@ class User extends \PHPUnit_Framework_TestCase {
->method('implementsActions')
->will($this->returnValue(false));
- $user = new \OC\User\User('foo', $backend);
+ $allConfig = new AllConfig();
+
+ $user = new \OC\User\User('foo', $backend, null, $allConfig);
$this->assertEquals(\OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data") . '/foo', $user->getHome());
}