diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-11-29 17:21:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 17:21:43 +0100 |
| commit | d86b29b42b93ba535b242bd8949fcf3fee52ce1e (patch) | |
| tree | 3ac660f453e7f67eedad1af4947e0aa9e1889bdd /tests/lib/AppFramework/Middleware | |
| parent | 7780e45348e9a45f081bb199e4679d69e0b5336c (diff) | |
| parent | 0ebffa4a5fb8f3fe1f220fd4c5bf3897a45557dd (diff) | |
| download | nextcloud-server-d86b29b42b93ba535b242bd8949fcf3fee52ce1e.tar.gz nextcloud-server-d86b29b42b93ba535b242bd8949fcf3fee52ce1e.zip | |
Merge pull request #2066 from nextcloud/fix-redirect-double-encoding
do not double encode the redirect url
Diffstat (limited to 'tests/lib/AppFramework/Middleware')
| -rw-r--r-- | tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php index 480bff5f59f..5a988751070 100644 --- a/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php +++ b/tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php @@ -459,7 +459,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { 'server' => [ 'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', - 'REQUEST_URI' => 'owncloud/index.php/apps/specialapp' + 'REQUEST_URI' => 'nextcloud/index.php/apps/specialapp' ] ], $this->createMock(ISecureRandom::class), @@ -472,10 +472,10 @@ class SecurityMiddlewareTest extends \Test\TestCase { ->with( 'core.login.showLoginForm', [ - 'redirect_url' => 'owncloud%2Findex.php%2Fapps%2Fspecialapp', + 'redirect_url' => 'nextcloud/index.php/apps/specialapp', ] ) - ->will($this->returnValue('http://localhost/index.php/login?redirect_url=owncloud%2Findex.php%2Fapps%2Fspecialapp')); + ->will($this->returnValue('http://localhost/nextcloud/index.php/login?redirect_url=nextcloud/index.php/apps/specialapp')); $this->logger ->expects($this->once()) ->method('debug') @@ -485,7 +485,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { 'test', new NotLoggedInException() ); - $expected = new RedirectResponse('http://localhost/index.php/login?redirect_url=owncloud%2Findex.php%2Fapps%2Fspecialapp'); + $expected = new RedirectResponse('http://localhost/nextcloud/index.php/login?redirect_url=nextcloud/index.php/apps/specialapp'); $this->assertEquals($expected , $response); } @@ -494,7 +494,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { [ 'server' => [ 'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', - 'REQUEST_URI' => 'owncloud/index.php/apps/specialapp', + 'REQUEST_URI' => 'nextcloud/index.php/apps/specialapp', ], ], $this->createMock(ISecureRandom::class), @@ -540,7 +540,7 @@ class SecurityMiddlewareTest extends \Test\TestCase { 'server' => [ 'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', - 'REQUEST_URI' => 'owncloud/index.php/apps/specialapp' + 'REQUEST_URI' => 'nextcloud/index.php/apps/specialapp' ] ], $this->createMock(ISecureRandom::class), |