Fix tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud · Feb 13, 2019 · fa0315a · fa0315a
1 parent a6722de
commit fa0315a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 44 deletions.
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -31,7 +31,6 @@
 class PageController extends Controller {
 
 	protected $appName;
-	private $userId;
 
 	/**
 	 * @var IConfig
@@ -40,11 +39,10 @@ class PageController extends Controller {
 
 	public function __construct(string $AppName,
 								IRequest $request,
-								string $UserId = null,
 								IConfig $config) {
 		parent::__construct($AppName, $request);
+
 		$this->appName = $AppName;
-		$this->userId = $UserId;
 		$this->config = $config;
 	}
 

diff --git a/tests/integration/AppTest.php b/tests/integration/AppTest.php
diff --git a/tests/unit/ContactsMenu/Provider/DetailsProviderTest.php b/tests/unit/ContactsMenu/Provider/DetailsProviderTest.php
@@ -56,7 +56,7 @@ class DetailsProviderTest extends Base {
 	/** @var DetailsProvider */
 	private $provider;
 
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->urlGenerator  = $this->createMock(IURLGenerator::class);

diff --git a/tests/unit/Controller/PageControllerTest.php b/tests/unit/Controller/PageControllerTest.php
@@ -18,21 +18,22 @@
 class PageControllerTest extends Base {
 
 	private $controller;
-	private $userId = 'john';
 
-	public function setUp() {
+	public function setUp(): void {
+		$config = $this->getMockBuilder('OCP\IConfig')->getMock();
 		$request = $this->getMockBuilder('OCP\IRequest')->getMock();
 
 		$this->controller = new PageController(
-			'contacts', $request, $this->userId
+			'contacts',
+			$request,
+			$config
 		);
 	}
 
 
 	public function testIndex() {
 		$result = $this->controller->index();
 
-		$this->assertEquals(['user' => 'john'], $result->getParams());
 		$this->assertEquals('main', $result->getTemplateName());
 		$this->assertEquals('user', $result->getRenderAs());
 		$this->assertTrue($result instanceof TemplateResponse);