sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33324 from nextcloud/fix/noid/controller_tests 

fix Controller tests
pull/29861/head
blizzz 2022-07-23 00:12:51 +07:00 committed by GitHub
parent 4ced3a4518 b3b6f2d581
commit c73fd32206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/Core/Controller/AvatarControllerTest.php
Unescape Escape View File

@ -38,6 +38,7 @@ use OCP\Files\File;
use OCP\Files\IRootFolder;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Files\SimpleFS\ISimpleFile;
use OCP\IAvatar;
use OCP\IAvatarManager;
use OCP\ICache;
@ -59,7 +60,7 @@ class AvatarControllerTest extends \Test\TestCase {
private $avatarMock;
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
private $userMock;
/** @var File|\PHPUnit\Framework\MockObject\MockObject */
/** @var ISimpleFile|\PHPUnit\Framework\MockObject\MockObject */
private $avatarFile;
/** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */
@ -115,7 +116,7 @@ class AvatarControllerTest extends \Test\TestCase {
$this->userManager->method('get')
->willReturnMap([['userId', $this->userMock]]);
$this->avatarFile = $this->getMockBuilder('OCP\Files\File')->getMock();
$this->avatarFile = $this->getMockBuilder(ISimpleFile::class)->getMock();
$this->avatarFile->method('getContent')->willReturn('image data');
$this->avatarFile->method('getMimeType')->willReturn('image type');
$this->avatarFile->method('getEtag')->willReturn('my etag');

16
tests/Core/Controller/LoginControllerTest.php
Unescape Escape View File

@ -228,7 +228,7 @@ class LoginControllerTest extends TestCase {
->willReturn('/default/foo');
$expectedResponse = new RedirectResponse('/default/foo');
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', '', ''));
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', ''));
}
public function testShowLoginFormWithErrorsInSession() {
@ -279,10 +279,11 @@ class LoginControllerTest extends TestCase {
'login',
[
'alt_login' => [],
'pageTitle' => 'Login'
],
'guest'
);
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', '', ''));
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', ''));
}
public function testShowLoginFormForFlowAuth() {
@ -303,16 +304,17 @@ class LoginControllerTest extends TestCase {
'login',
[
'alt_login' => [],
'pageTitle' => 'Login'
],
'guest'
);
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', 'login/flow', ''));
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', 'login/flow'));
}
/**
* @return array
*/
public function passwordResetDataProvider() {
public function passwordResetDataProvider(): array {
return [
[
true,
@ -371,10 +373,11 @@ class LoginControllerTest extends TestCase {
'login',
[
'alt_login' => [],
'pageTitle' => 'Login'
],
'guest'
);
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('LdapUser', '', ''));
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('LdapUser', ''));
}
public function testShowLoginFormForUserNamed0() {
@ -425,10 +428,11 @@ class LoginControllerTest extends TestCase {
'login',
[
'alt_login' => [],
'pageTitle' => 'Login'
],
'guest'
);
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('0', '', ''));
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('0', ''));
}
public function testLoginWithInvalidCredentials() {