Merge pull request #858 from nextcloud/stable10-when-logged-in-then-just-redirect...

[stable10] when logged in then just redirect to redirected page

diff --cc tests/Core/Controller/LoginControllerTest.php
index 0439b5b7de073b7731e85cb30f30fb3999b8c4bd,a322289d20013434280f3da0e5180769bc9aba66..0f3945efd48f1fc059d79005ea7937572fd88398
--- 1/tests/Core/Controller/LoginControllerTest.php
--- 2/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@@ -325,9 -326,9 +329,9 @@@ class LoginControllerTest extends TestC
  
        public function testLoginWithValidCredentials() {
                /** @var IUser | \PHPUnit_Framework_MockObject_MockObject $user */
-               $user = $this->getMock('\OCP\IUser');
+               $user = $this->createMock('\OCP\IUser');
                $password = 'secret';
 -              $indexPageUrl = 'some url';
 +              $indexPageUrl = \OC_Util::getDefaultPageUrl();
  
                $this->request
                        ->expects($this->exactly(2))