diff options
author | Bjoern Schiessle <bjoern@schiessle.org> | 2016-11-24 01:57:20 +0300 |
---|---|---|
committer | Bjoern Schiessle <bjoern@schiessle.org> | 2016-11-25 12:26:48 +0300 |
commit | 0de685c5629deb66984e536e5fd20f140228aa3f (patch) | |
tree | 7386419957b1faecca0be50a56427fa531166857 /tests/Settings | |
parent | 3fc75073b80a3ffedbcd127e9e75edf567f245a5 (diff) |
bring back setEmailAddress for the user management
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'tests/Settings')
-rw-r--r-- | tests/Settings/Controller/UsersControllerTest.php | 70 |
1 files changed, 61 insertions, 9 deletions
diff --git a/tests/Settings/Controller/UsersControllerTest.php b/tests/Settings/Controller/UsersControllerTest.php index 9f381e31957..69082a7929c 100644 --- a/tests/Settings/Controller/UsersControllerTest.php +++ b/tests/Settings/Controller/UsersControllerTest.php @@ -11,7 +11,6 @@ namespace Tests\Settings\Controller; use OC\Accounts\AccountManager; -use OC\ForbiddenException; use OC\Group\Manager; use OC\Settings\Controller\UsersController; use OCP\App\IAppManager; @@ -2045,7 +2044,7 @@ class UsersControllerTest extends \Test\TestCase { */ public function testSetUserSettings($email, $validEmail, $expectedStatus) { $controller = $this->getController(false, ['saveUserSettings']); - $user = $this->getMock(IUser::class); + $user = $this->createMock(IUser::class); $this->userSession->method('getUser')->willReturn($user); @@ -2102,10 +2101,11 @@ class UsersControllerTest extends \Test\TestCase { $oldDisplayName ) { $controller = $this->getController(); - $user = $this->getMock(IUser::class); + $user = $this->createMock(IUser::class); $user->method('getDisplayName')->willReturn($oldDisplayName); $user->method('getEMailAddress')->willReturn($oldEmailAddress); + $user->method('canChangeDisplayName')->willReturn(true); if ($data[AccountManager::PROPERTY_EMAIL]['value'] !== $oldEmailAddress) { $user->expects($this->once())->method('setEMailAddress') @@ -2174,7 +2174,7 @@ class UsersControllerTest extends \Test\TestCase { * @param string $oldEmailAddress * @param string $oldDisplayName * @param bool $setDisplayNameResult - * @param bool $setEmailResult + * @param bool $canChangeEmail * * @expectedException \OC\ForbiddenException */ @@ -2182,18 +2182,17 @@ class UsersControllerTest extends \Test\TestCase { $oldEmailAddress, $oldDisplayName, $setDisplayNameResult, - $setEmailResult + $canChangeEmail ) { $controller = $this->getController(); - $user = $this->getMock(IUser::class); + $user = $this->createMock(IUser::class); $user->method('getDisplayName')->willReturn($oldDisplayName); $user->method('getEMailAddress')->willReturn($oldEmailAddress); if ($data[AccountManager::PROPERTY_EMAIL]['value'] !== $oldEmailAddress) { - $user->method('setEMailAddress') - ->with($data[AccountManager::PROPERTY_EMAIL]['value']) - ->willReturn($setEmailResult); + $user->method('canChangeDisplayName') + ->willReturn($canChangeEmail); } if ($data[AccountManager::PROPERTY_DISPLAYNAME]['value'] !== $oldDisplayName) { @@ -2241,4 +2240,57 @@ class UsersControllerTest extends \Test\TestCase { ]; } + + /** + * @return array + */ + public function setEmailAddressData() { + return [ + /* mailAddress, isValid, expectsUpdate, canChangeDisplayName, responseCode */ + [ '', true, true, true, Http::STATUS_OK ], + [ 'foo@local', true, true, true, Http::STATUS_OK], + [ 'foo@bar@local', false, false, true, Http::STATUS_UNPROCESSABLE_ENTITY], + [ 'foo@local', true, false, false, Http::STATUS_FORBIDDEN], + ]; + } + /** + * @dataProvider setEmailAddressData + * + */ + public function testSetEMailAddress($mailAddress, $isValid, $expectsUpdate, $canChangeDisplayName, $responseCode) { + $user = $this->getMockBuilder('\OC\User\User') + ->disableOriginalConstructor()->getMock(); + $user + ->expects($this->any()) + ->method('getUID') + ->will($this->returnValue('foo')); + $user + ->expects($this->any()) + ->method('canChangeDisplayName') + ->will($this->returnValue($canChangeDisplayName)); + $user + ->expects($expectsUpdate ? $this->once() : $this->never()) + ->method('setEMailAddress') + ->with( + $this->equalTo($mailAddress) + ); + $this->mailer + ->expects($this->any()) + ->method('validateMailAddress') + ->with($mailAddress) + ->willReturn($isValid); + if ($isValid) { + $user->expects($this->atLeastOnce()) + ->method('canChangeDisplayName') + ->willReturn(true); + $this->userManager + ->expects($this->atLeastOnce()) + ->method('get') + ->with('foo') + ->will($this->returnValue($user)); + } + $controller = $this->getController(true); + $response = $controller->setEMailAddress($user->getUID(), $mailAddress); + $this->assertSame($responseCode, $response->getStatus()); + } } |