Skip to content

fix Controller tests #33324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Jul 22, 2022
Merged

fix Controller tests #33324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/Core/Controller/AvatarControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ function is_uploaded_file($filename) {
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;
Expand All @@ -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 */
Expand Down Expand Up @@ -115,7 +116,7 @@ protected function setUp(): void {
$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');
Expand Down
16 changes: 10 additions & 6 deletions tests/Core/Controller/LoginControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public function testShowLoginFormForLoggedInUsers() {
->willReturn('/default/foo');

$expectedResponse = new RedirectResponse('/default/foo');
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', '', ''));
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', ''));
}

public function testShowLoginFormWithErrorsInSession() {
Expand Down Expand Up @@ -279,10 +279,11 @@ public function testShowLoginFormWithErrorsInSession() {
'login',
[
'alt_login' => [],
'pageTitle' => 'Login'
],
'guest'
);
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', '', ''));
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', ''));
}

public function testShowLoginFormForFlowAuth() {
Expand All @@ -303,16 +304,17 @@ public function testShowLoginFormForFlowAuth() {
'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,
Expand Down Expand Up @@ -371,10 +373,11 @@ public function testShowLoginFormWithPasswordResetOption($canChangePassword,
'login',
[
'alt_login' => [],
'pageTitle' => 'Login'
],
'guest'
);
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('LdapUser', '', ''));
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('LdapUser', ''));
}

public function testShowLoginFormForUserNamed0() {
Expand Down Expand Up @@ -425,10 +428,11 @@ public function testShowLoginFormForUserNamed0() {
'login',
[
'alt_login' => [],
'pageTitle' => 'Login'
],
'guest'
);
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('0', '', ''));
$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('0', ''));
}

public function testLoginWithInvalidCredentials() {
Expand Down