Merge remote-tracking branch 'mainline/develop' into MQE-2601

Author: zakdma

ReCaptchaUser/Test/Integration/LoginFormTest.php

@@ -179,6 +179,11 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         $this->getRequest()->setUri($this->backendUrl->getUrl('admin'));
 
         $this->dispatch('backend/admin/auth/login');
+
+        if ($this->getResponse()->getHeader('Location')) {
+            $this->dispatch($this->getResponse()->getHeader('Location')->uri()->getPath());
+        }
+
         $content = $this->getResponse()->getBody();
 
         self::assertNotEmpty($content);

TwoFactorAuth/Test/Integration/ControllerActionPredispatchTest.php

@@ -91,7 +91,7 @@ public function testUnauthenticated(): void
         $this->dispatch('backend/admin/index/index');
         //Login controller redirects to full start-up URL
         $this->assertRedirect($this->stringContains('index'));
-        $properUrl = $this->getResponse()->getHeader('Location')->getFieldValue();
+        $properUrl = $this->getResponse()->getHeader('Location')->uri()->getPath();
 
         //Login page must be rendered without redirects
         $this->getRequest()->setDispatched(false);