wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix broken tests

Browse source 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-09-04 14:17:03 +02:00
parent e9a58f8579
commit 0326c2c54f
No known key found for this signature in database
GPG key ID: FE03C3A163FEDE68
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/Controller/LoginController.php
View file

@ -74,6 +74,7 @@ class LoginController extends Controller {
* @param IURLGenerator $urlGenerator * @param IURLGenerator $urlGenerator
* @param ILogger $logger * @param ILogger $logger
* @param Manager $twoFactorManager * @param Manager $twoFactorManager
* @param Defaults $defaults
*/ */
public function __construct($appName, public function __construct($appName,
IRequest $request, IRequest $request,

7
tests/Core/Controller/LoginControllerTest.php
View file

@ -26,6 +26,7 @@ use OC\Core\Controller\LoginController;
use OC\User\Session; use OC\User\Session;
use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\Defaults;
use OCP\IConfig; use OCP\IConfig;
use OCP\ILogger; use OCP\ILogger;
use OCP\IRequest; use OCP\IRequest;
@ -54,6 +55,8 @@ class LoginControllerTest extends TestCase {
private $logger; private $logger;
/** @var Manager|\PHPUnit_Framework_MockObject_MockObject */ /** @var Manager|\PHPUnit_Framework_MockObject_MockObject */
private $twoFactorManager; private $twoFactorManager;
/** @var Defaults|\PHPUnit_Framework_MockObject_MockObject */
private $defaults;
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
@ -65,6 +68,7 @@ class LoginControllerTest extends TestCase {
$this->urlGenerator = $this->createMock(IURLGenerator::class); $this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->logger = $this->createMock(ILogger::class); $this->logger = $this->createMock(ILogger::class);
$this->twoFactorManager = $this->createMock(Manager::class); $this->twoFactorManager = $this->createMock(Manager::class);
$this->defaults = $this->createMock(Defaults::class);
$this->loginController = new LoginController( $this->loginController = new LoginController(
'core', 'core',
@ -75,7 +79,8 @@ class LoginControllerTest extends TestCase {
$this->userSession, $this->userSession,
$this->urlGenerator, $this->urlGenerator,
$this->logger, $this->logger,
$this->twoFactorManager $this->twoFactorManager,
$this->defaults
); );
} }