From ba29ea178f7ba18795e36b55ba8b397703280792 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Sun, 1 Feb 2015 17:34:03 +0100 Subject: [PATCH] Add unit tests for empty token --- core/lostpassword/controller/lostcontroller.php | 2 +- .../controller/lostcontrollertest.php | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php index 5297e9a9a2a..c039c578b59 100644 --- a/core/lostpassword/controller/lostcontroller.php +++ b/core/lostpassword/controller/lostcontroller.php @@ -141,7 +141,7 @@ class LostController extends Controller { * @return array */ public function setPassword($token, $userId, $password, $proceed) { - if ($this->isDataEncrypted && !$proceed){ + if ($this->isDataEncrypted && !$proceed) { return $this->error('', array('encryption' => true)); } diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php index 2ed7692a32f..3f3cda2b0c7 100644 --- a/tests/core/lostpassword/controller/lostcontrollertest.php +++ b/tests/core/lostpassword/controller/lostcontrollertest.php @@ -159,7 +159,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { $this->container['Config'] ->expects($this->once()) ->method('getUserValue') - ->with('InvalidTokenUser', 'owncloud', 'lostpassword') + ->with('InvalidTokenUser', 'owncloud', 'lostpassword', null) ->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword')); // With an invalid token @@ -178,7 +178,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { $this->container['Config'] ->expects($this->once()) ->method('getUserValue') - ->with('ValidTokenUser', 'owncloud', 'lostpassword') + ->with('ValidTokenUser', 'owncloud', 'lostpassword', null) ->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword')); $user = $this->getMockBuilder('\OCP\IUser') ->disableOriginalConstructor()->getMock(); @@ -200,4 +200,17 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase { $expectedResponse = array('status' => 'success'); $this->assertSame($expectedResponse, $response); } + + public function testIsSetPasswordWithoutTokenFailing() { + $this->container['Config'] + ->expects($this->once()) + ->method('getUserValue') + ->with('ValidTokenUser', 'owncloud', 'lostpassword', null) + ->will($this->returnValue(null)); + + $response = $this->lostController->setPassword('', 'ValidTokenUser', 'NewPassword', true); + $expectedResponse = ['status' => 'error', 'msg' => '']; + $this->assertSame($expectedResponse, $response); + } + } -- 2.39.5