diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-02-07 15:57:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-07 15:57:14 +0100 |
| commit | 0e9903c420aee76648e61c4c14b750ea01125bb1 (patch) | |
| tree | 4869d5a2df8054b416103855fe951989aaf03afd /tests/Core | |
| parent | 6dc21fff45abbb2bde2611a82c746f873389bfd7 (diff) | |
| parent | b68567e9ba5b4b081378061bf938b5b505638fb3 (diff) | |
| download | nextcloud-server-0e9903c420aee76648e61c4c14b750ea01125bb1.tar.gz nextcloud-server-0e9903c420aee76648e61c4c14b750ea01125bb1.zip | |
Merge pull request #13969 from nextcloud/enh/additional_scripts_no_on_public_pages
No need to emit additonalscript event on public pages
Diffstat (limited to 'tests/Core')
| -rw-r--r-- | tests/Core/Controller/ClientFlowLoginControllerTest.php | 10 | ||||
| -rw-r--r-- | tests/Core/Controller/TwoFactorChallengeControllerTest.php | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/Core/Controller/ClientFlowLoginControllerTest.php b/tests/Core/Controller/ClientFlowLoginControllerTest.php index 9230cfb4af2..eddcc1bbdb9 100644 --- a/tests/Core/Controller/ClientFlowLoginControllerTest.php +++ b/tests/Core/Controller/ClientFlowLoginControllerTest.php @@ -30,7 +30,7 @@ use OCA\OAuth2\Db\AccessTokenMapper; use OCA\OAuth2\Db\Client; use OCA\OAuth2\Db\ClientMapper; use OCP\AppFramework\Http; -use OCP\AppFramework\Http\TemplateResponse; +use OCP\AppFramework\Http\StandaloneTemplateResponse; use OCP\Defaults; use OCP\IL10N; use OCP\IRequest; @@ -108,7 +108,7 @@ class ClientFlowLoginControllerTest extends TestCase { } public function testShowAuthPickerPageNoClientOrOauthRequest() { - $expected = new TemplateResponse( + $expected = new StandaloneTemplateResponse( 'core', 'error', [ @@ -166,7 +166,7 @@ class ClientFlowLoginControllerTest extends TestCase { ->method('getServerProtocol') ->willReturn('https'); - $expected = new TemplateResponse( + $expected = new StandaloneTemplateResponse( 'core', 'loginflow/authpicker', [ @@ -225,7 +225,7 @@ class ClientFlowLoginControllerTest extends TestCase { ->method('getServerProtocol') ->willReturn('https'); - $expected = new TemplateResponse( + $expected = new StandaloneTemplateResponse( 'core', 'loginflow/authpicker', [ @@ -253,7 +253,7 @@ class ClientFlowLoginControllerTest extends TestCase { ->method('remove') ->with('client.flow.state.token'); - $expected = new TemplateResponse( + $expected = new StandaloneTemplateResponse( 'core', '403', [ diff --git a/tests/Core/Controller/TwoFactorChallengeControllerTest.php b/tests/Core/Controller/TwoFactorChallengeControllerTest.php index 6a01c510ed2..a405914cc47 100644 --- a/tests/Core/Controller/TwoFactorChallengeControllerTest.php +++ b/tests/Core/Controller/TwoFactorChallengeControllerTest.php @@ -27,7 +27,7 @@ use OC\Authentication\TwoFactorAuth\ProviderSet; use OC\Core\Controller\TwoFactorChallengeController; use OC_Util; use OCP\AppFramework\Http\RedirectResponse; -use OCP\AppFramework\Http\TemplateResponse; +use OCP\AppFramework\Http\StandaloneTemplateResponse; use OCP\Authentication\TwoFactorAuth\IProvider; use OCP\Authentication\TwoFactorAuth\TwoFactorException; use OCP\IRequest; @@ -100,7 +100,7 @@ class TwoFactorChallengeControllerTest extends TestCase { ->with($user) ->will($this->returnValue($providerSet)); - $expected = new TemplateResponse('core', 'twofactorselectchallenge', [ + $expected = new StandaloneTemplateResponse('core', 'twofactorselectchallenge', [ 'providers' => [ $p1, ], @@ -151,7 +151,7 @@ class TwoFactorChallengeControllerTest extends TestCase { ->method('fetchPage') ->will($this->returnValue('<html/>')); - $expected = new TemplateResponse('core', 'twofactorshowchallenge', [ + $expected = new StandaloneTemplateResponse('core', 'twofactorshowchallenge', [ 'error' => true, 'provider' => $provider, 'backupProvider' => $backupProvider, |