mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix unit tests 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2016-11-02 15:16:14 +01:00 committed by Lukas Reschke
parent 922f51e901
commit b2d9c20aac
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php
View File

@ -24,6 +24,7 @@ namespace OCA\TwoFactorBackupCodes\Tests\Unit\Controller;
use OCA\TwoFactorBackupCodes\Controller\SettingsController; use OCA\TwoFactorBackupCodes\Controller\SettingsController;
use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage; use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest; use OCP\IRequest;
use OCP\IUser; use OCP\IUser;
use OCP\IUserSession; use OCP\IUserSession;
@ -89,7 +90,9 @@ class SettingsControllerTest extends TestCase {
'codes' => $codes, 'codes' => $codes,
'state' => 'state', 'state' => 'state',
]; ];
$this->assertEquals($expected, $this->controller->createCodes()); $response = $this->controller->createCodes();
$this->assertInstanceOf(JSONResponse::class, $response);
$this->assertEquals($expected, $response->getData());
} }
} }

4
tests/Settings/Controller/AuthSettingsControllerTest.php
View File

@ -153,7 +153,9 @@ class AuthSettingsControllerTest extends TestCase {
'deviceToken' => ['dummy' => 'dummy', 'canDelete' => true], 'deviceToken' => ['dummy' => 'dummy', 'canDelete' => true],
'loginName' => 'User13', 'loginName' => 'User13',
]; ];
$this->assertEquals($expected, $this->controller->create($name)); $response = $this->controller->create($name);
$this->assertInstanceOf(JSONResponse::class, $response);
$this->assertEquals($expected, $response->getData());
} }
public function testCreateSessionNotAvailable() { public function testCreateSessionNotAvailable() {

5
tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
View File

@ -49,6 +49,7 @@ use OCP\IConfig;
use OCP\ILogger; use OCP\ILogger;
use OCP\INavigationManager; use OCP\INavigationManager;
use OCP\IRequest; use OCP\IRequest;
use OCP\ISession;
use OCP\IURLGenerator; use OCP\IURLGenerator;
use OCP\Security\ISecureRandom; use OCP\Security\ISecureRandom;
@ -63,6 +64,8 @@ class SecurityMiddlewareTest extends \Test\TestCase {
private $secException; private $secException;
/** @var SecurityException */ /** @var SecurityException */
private $secAjaxException; private $secAjaxException;
/** @var ISession|\PHPUnit_Framework_MockObject_MockObject */
private $session;
/** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */ /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
private $request; private $request;
/** @var ControllerMethodReflector */ /** @var ControllerMethodReflector */
@ -88,6 +91,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
$this->logger = $this->createMock(ILogger::class); $this->logger = $this->createMock(ILogger::class);
$this->navigationManager = $this->createMock(INavigationManager::class); $this->navigationManager = $this->createMock(INavigationManager::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class); $this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->session = $this->createMock(ISession::class);
$this->request = $this->createMock(IRequest::class); $this->request = $this->createMock(IRequest::class);
$this->contentSecurityPolicyManager = $this->createMock(ContentSecurityPolicyManager::class); $this->contentSecurityPolicyManager = $this->createMock(ContentSecurityPolicyManager::class);
$this->csrfTokenManager = $this->createMock(CsrfTokenManager::class); $this->csrfTokenManager = $this->createMock(CsrfTokenManager::class);
@ -109,6 +113,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
$this->navigationManager, $this->navigationManager,
$this->urlGenerator, $this->urlGenerator,
$this->logger, $this->logger,
$this->session,
'files', 'files',
$isLoggedIn, $isLoggedIn,
$isAdminUser, $isAdminUser,