From 6dace7f6adf7721ee043c3a03fc7091eb5a7e82f Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 15 Sep 2016 12:12:30 +0200 Subject: Add tests --- .../AppFramework/Controller/OCSControllerTest.php | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'tests/lib/AppFramework/Controller/OCSControllerTest.php') diff --git a/tests/lib/AppFramework/Controller/OCSControllerTest.php b/tests/lib/AppFramework/Controller/OCSControllerTest.php index c1f8e4a6574..0d379a8822c 100644 --- a/tests/lib/AppFramework/Controller/OCSControllerTest.php +++ b/tests/lib/AppFramework/Controller/OCSControllerTest.php @@ -26,6 +26,7 @@ namespace Test\AppFramework\Controller; use OC\AppFramework\Http\Request; use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\Http\EmptyContentSecurityPolicy; use OCP\AppFramework\OCSController; use OCP\IConfig; use OCP\Security\ISecureRandom; @@ -92,8 +93,9 @@ class OCSControllerTest extends \Test\TestCase { $params = new DataResponse(['test' => 'hi']); - $out = $controller->buildResponse($params, 'xml')->render(); - $this->assertEquals($expected, $out); + $response = $controller->buildResponse($params, 'xml'); + $this->assertSame(EmptyContentSecurityPolicy::class, get_class($response->getContentSecurityPolicy())); + $this->assertEquals($expected, $response->render()); } public function testJSON() { @@ -111,8 +113,10 @@ class OCSControllerTest extends \Test\TestCase { '"totalitems":"","itemsperpage":""},"data":{"test":"hi"}}}'; $params = new DataResponse(['test' => 'hi']); - $out = $controller->buildResponse($params, 'json')->render(); - $this->assertEquals($expected, $out); + $response = $controller->buildResponse($params, 'json'); + $this->assertSame(EmptyContentSecurityPolicy::class, get_class($response->getContentSecurityPolicy())); + $this->assertEquals($expected, $response->render()); + $this->assertEquals($expected, $response->render()); } public function testXMLV2() { @@ -141,8 +145,9 @@ class OCSControllerTest extends \Test\TestCase { $params = new DataResponse(['test' => 'hi']); - $out = $controller->buildResponse($params, 'xml')->render(); - $this->assertEquals($expected, $out); + $response = $controller->buildResponse($params, 'xml'); + $this->assertSame(EmptyContentSecurityPolicy::class, get_class($response->getContentSecurityPolicy())); + $this->assertEquals($expected, $response->render()); } public function testJSONV2() { @@ -159,7 +164,8 @@ class OCSControllerTest extends \Test\TestCase { $expected = '{"ocs":{"meta":{"status":"ok","statuscode":200,"message":"OK"},"data":{"test":"hi"}}}'; $params = new DataResponse(['test' => 'hi']); - $out = $controller->buildResponse($params, 'json')->render(); - $this->assertEquals($expected, $out); + $response = $controller->buildResponse($params, 'json'); + $this->assertSame(EmptyContentSecurityPolicy::class, get_class($response->getContentSecurityPolicy())); + $this->assertEquals($expected, $response->render()); } } -- cgit v1.2.3