diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-11-02 11:39:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-02 11:39:40 +0300 |
| commit | 0f08f3cd41d05500abd50e9947e85f505c76fab6 (patch) | |
| tree | d8f404197d64d68912ff1875f662ae8411dec002 /tests | |
| parent | d836b853ea5b66c0094f3cad7d8665c446cbeb29 (diff) | |
| parent | 92582a350d295f123d08f16f09e06baa4bc4733c (diff) | |
Merge pull request #12177 from nextcloud/fix/apptoken_login_flow_proper_host
Use the proper server for the apptoken flow login
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Core/Controller/ClientFlowLoginControllerTest.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/Core/Controller/ClientFlowLoginControllerTest.php index 7fe87df026f..b54897ddc44 100644 --- a/tests/Core/Controller/ClientFlowLoginControllerTest.php +++ b/tests/Core/Controller/ClientFlowLoginControllerTest.php @@ -162,6 +162,9 @@ class ClientFlowLoginControllerTest extends TestCase { ->expects($this->once()) ->method('getServerHost') ->willReturn('example.com'); + $this->request + ->method('getServerProtocol') + ->willReturn('https'); $expected = new TemplateResponse( 'core', @@ -172,7 +175,7 @@ class ClientFlowLoginControllerTest extends TestCase { 'instanceName' => 'ExampleCloud', 'urlGenerator' => $this->urlGenerator, 'stateToken' => 'StateToken', - 'serverHost' => 'example.com', + 'serverHost' => 'https://example.com', 'oauthState' => 'OauthStateToken', ], 'guest' @@ -218,6 +221,9 @@ class ClientFlowLoginControllerTest extends TestCase { ->expects($this->once()) ->method('getServerHost') ->willReturn('example.com'); + $this->request + ->method('getServerProtocol') + ->willReturn('https'); $expected = new TemplateResponse( 'core', @@ -228,7 +234,7 @@ class ClientFlowLoginControllerTest extends TestCase { 'instanceName' => 'ExampleCloud', 'urlGenerator' => $this->urlGenerator, 'stateToken' => 'StateToken', - 'serverHost' => 'example.com', + 'serverHost' => 'https://example.com', 'oauthState' => 'OauthStateToken', ], 'guest' |