Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
d0397f9b53
commit
f42115d6bb
|
@ -31,6 +31,7 @@ use OCP\Encryption\IEncryptionModule;
|
|||
use OCP\Encryption\IManager;
|
||||
use OCP\IConfig;
|
||||
use OCP\IL10N;
|
||||
use OCP\ILogger;
|
||||
use OCP\IRequest;
|
||||
use OCP\IURLGenerator;
|
||||
use OCP\IUser;
|
||||
|
@ -74,6 +75,8 @@ class LostControllerTest extends \Test\TestCase {
|
|||
private $request;
|
||||
/** @var ICrypto|\PHPUnit_Framework_MockObject_MockObject */
|
||||
private $crypto;
|
||||
/** @var ILogger|\PHPUnit_Framework_MockObject_MockObject */
|
||||
private $logger;
|
||||
|
||||
protected function setUp() {
|
||||
parent::setUp();
|
||||
|
@ -124,6 +127,7 @@ class LostControllerTest extends \Test\TestCase {
|
|||
->method('isEnabled')
|
||||
->willReturn(true);
|
||||
$this->crypto = $this->createMock(ICrypto::class);
|
||||
$this->logger = $this->createMock(ILogger::class);
|
||||
$this->lostController = new LostController(
|
||||
'Core',
|
||||
$this->request,
|
||||
|
@ -137,7 +141,8 @@ class LostControllerTest extends \Test\TestCase {
|
|||
$this->encryptionManager,
|
||||
$this->mailer,
|
||||
$this->timeFactory,
|
||||
$this->crypto
|
||||
$this->crypto,
|
||||
$this->logger
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -265,6 +270,9 @@ class LostControllerTest extends \Test\TestCase {
|
|||
array(false, $nonExistingUser)
|
||||
)));
|
||||
|
||||
$this->logger->expects($this->exactly(2))
|
||||
->method('logException');
|
||||
|
||||
$this->userManager
|
||||
->method('getByEmail')
|
||||
->willReturn([]);
|
||||
|
@ -272,8 +280,7 @@ class LostControllerTest extends \Test\TestCase {
|
|||
// With a non existing user
|
||||
$response = $this->lostController->email($nonExistingUser);
|
||||
$expectedResponse = new JSONResponse([
|
||||
'status' => 'error',
|
||||
'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.'
|
||||
'status' => 'success',
|
||||
]);
|
||||
$expectedResponse->throttle();
|
||||
$this->assertEquals($expectedResponse, $response);
|
||||
|
@ -286,8 +293,7 @@ class LostControllerTest extends \Test\TestCase {
|
|||
->will($this->returnValue(null));
|
||||
$response = $this->lostController->email($existingUser);
|
||||
$expectedResponse = new JSONResponse([
|
||||
'status' => 'error',
|
||||
'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.'
|
||||
'status' => 'success',
|
||||
]);
|
||||
$expectedResponse->throttle();
|
||||
$this->assertEquals($expectedResponse, $response);
|
||||
|
@ -511,8 +517,11 @@ class LostControllerTest extends \Test\TestCase {
|
|||
$this->equalTo('test@example.comSECRET')
|
||||
)->willReturn('encryptedToken');
|
||||
|
||||
$this->logger->expects($this->exactly(1))
|
||||
->method('logException');
|
||||
|
||||
$response = $this->lostController->email('ExistingUser');
|
||||
$expectedResponse = new JSONResponse(['status' => 'error', 'msg' => 'Couldn\'t send reset email. Please contact your administrator.']);
|
||||
$expectedResponse = new JSONResponse(['status' => 'success']);
|
||||
$expectedResponse->throttle();
|
||||
$this->assertEquals($expectedResponse, $response);
|
||||
}
|
||||
|
@ -708,8 +717,11 @@ class LostControllerTest extends \Test\TestCase {
|
|||
->with('ExistingUser')
|
||||
->willReturn($user);
|
||||
|
||||
$this->logger->expects($this->exactly(1))
|
||||
->method('logException');
|
||||
|
||||
$response = $this->lostController->email('ExistingUser');
|
||||
$expectedResponse = new JSONResponse(['status' => 'error', 'msg' => 'Could not send reset email because there is no email address for this username. Please contact your administrator.']);
|
||||
$expectedResponse = new JSONResponse(['status' => 'success']);
|
||||
$expectedResponse->throttle();
|
||||
$this->assertEquals($expectedResponse, $response);
|
||||
}
|
||||
|
@ -790,12 +802,14 @@ class LostControllerTest extends \Test\TestCase {
|
|||
->method('getByEmail')
|
||||
->willReturn([$user1, $user2]);
|
||||
|
||||
$this->logger->expects($this->exactly(1))
|
||||
->method('logException');
|
||||
|
||||
// request password reset for test@example.com
|
||||
$response = $this->lostController->email('test@example.com');
|
||||
|
||||
$expectedResponse = new JSONResponse([
|
||||
'status' => 'error',
|
||||
'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.'
|
||||
'status' => 'success'
|
||||
]);
|
||||
$expectedResponse->throttle();
|
||||
|
||||
|
|
Loading…
Reference in New Issue