wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix getCloudId

Browse source
This commit is contained in:
Thomas Müller 2015-12-01 14:50:13 +01:00
parent 6abc02cb88
commit 0391cc0451
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/private/user/user.php
View file

@ -79,6 +79,7 @@ class User implements IUser {
$this->emitter = $emitter; $this->emitter = $emitter;
$this->config = $config; $this->config = $config;
$this->avatarManager = $avatarManager; $this->avatarManager = $avatarManager;
$this->urlGenerator = $urlGenerator;
if ($this->config) { if ($this->config) {
$enabled = $this->config->getUserValue($uid, 'core', 'enabled', 'true'); $enabled = $this->config->getUserValue($uid, 'core', 'enabled', 'true');
$this->enabled = ($enabled === 'true'); $this->enabled = ($enabled === 'true');

8
tests/lib/user/user.php
View file

@ -468,8 +468,14 @@ class User extends \Test\TestCase {
*/ */
$backend = $this->getMock('\Test\Util\User\Dummy'); $backend = $this->getMock('\Test\Util\User\Dummy');
$urlGenerator = $this->getMockBuilder('\OC\URLGenerator') $urlGenerator = $this->getMockBuilder('\OC\URLGenerator')
->setMethods(['getAbsoluteURL'])
->disableOriginalConstructor()->getMock(); ->disableOriginalConstructor()->getMock();
$urlGenerator
->expects($this->any())
->method('getAbsoluteURL')
->withAnyParameters()
->willReturn('http://localhost:8888/owncloud');
$user = new \OC\User\User('foo', $backend, null, null, null, $urlGenerator); $user = new \OC\User\User('foo', $backend, null, null, null, $urlGenerator);
$this->assertEquals("foo@localhost", $user->getCloudId()); $this->assertEquals("foo@localhost:8888/owncloud", $user->getCloudId());
} }
} }