diff options
| -rw-r--r-- | lib/private/user/user.php | 1 | ||||
| -rw-r--r-- | tests/lib/user/user.php | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/private/user/user.php b/lib/private/user/user.php index ca79f12469c..d60ffe95fc3 100644 --- a/lib/private/user/user.php +++ b/lib/private/user/user.php @@ -79,6 +79,7 @@ class User implements IUser { $this->emitter = $emitter; $this->config = $config; $this->avatarManager = $avatarManager; + $this->urlGenerator = $urlGenerator; if ($this->config) { $enabled = $this->config->getUserValue($uid, 'core', 'enabled', 'true'); $this->enabled = ($enabled === 'true'); diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php index 52f0a125303..134b79383ea 100644 --- a/tests/lib/user/user.php +++ b/tests/lib/user/user.php @@ -468,8 +468,14 @@ class User extends \Test\TestCase { */ $backend = $this->getMock('\Test\Util\User\Dummy'); $urlGenerator = $this->getMockBuilder('\OC\URLGenerator') + ->setMethods(['getAbsoluteURL']) ->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); - $this->assertEquals("foo@localhost", $user->getCloudId()); + $this->assertEquals("foo@localhost:8888/owncloud", $user->getCloudId()); } } |