Adjust headers for JSON response.

dereuromark · Jun 1, 2019 · 2e9e179 · 2e9e179
1 parent 71af4c4
commit 2e9e179
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/Middleware/AjaxMiddleware.php b/src/Middleware/AjaxMiddleware.php
@@ -105,7 +105,7 @@ protected function _redirect(ServerRequest $request, Response $response) {
 
 		$response = $response->withStatus(200)
 			->withoutHeader('Location')
-			->withHeader('Content-Type', 'application/json; charset=' . $response->getCharset())
+			->withHeader('Content-Type', 'application/json')
 			->withStringBody($json);
 
 		return $response;

diff --git a/tests/TestCase/Controller/Component/AjaxComponentTest.php b/tests/TestCase/Controller/Component/AjaxComponentTest.php
@@ -87,7 +87,7 @@ public function testDefaults() {
 		$this->Controller->redirect('/');
 		$expected = [
 			'Content-Type' => [
-				'application/json; charset=UTF-8',
+				'application/json',
 			],
 		];
 		$this->assertSame($expected, $this->Controller->response->getHeaders());
@@ -205,7 +205,7 @@ public function testSetVarsWithRedirect() {
 		$this->Controller->redirect('/', 301);
 		$expected = [
 			'Content-Type' => [
-				'application/json; charset=UTF-8',
+				'application/json',
 			],
 		];
 		$this->assertSame($expected, $this->Controller->response->getHeaders());

diff --git a/tests/TestCase/Middleware/AjaxMiddlewareTest.php b/tests/TestCase/Middleware/AjaxMiddlewareTest.php
@@ -106,7 +106,7 @@ public function testDefaultsRender() {
 
 		$expectedHeaders = [
 			'Content-Type' => [
-				'application/json; charset=UTF-8',
+				'application/json',
 			],
 		];
 		$this->assertSame($expectedHeaders, $result->getHeaders());
@@ -137,7 +137,7 @@ public function testDefaultsRedirect() {
 
 		$expectedHeaders = [
 			'Content-Type' => [
-				'application/json; charset=UTF-8',
+				'application/json',
 			],
 		];
 		$this->assertSame($expectedHeaders, $result->getHeaders());
@@ -230,7 +230,7 @@ public function testActions() {
 
 		$expectedHeaders = [
 			'Content-Type' => [
-				'application/json; charset=UTF-8',
+				'application/json',
 			],
 		];
 		$this->assertSame($expectedHeaders, $result->getHeaders());
@@ -288,7 +288,7 @@ public function testSetVars() {
 
 		$expectedHeaders = [
 			'Content-Type' => [
-				'application/json; charset=UTF-8',
+				'application/json',
 			],
 		];
 		$this->assertSame($expectedHeaders, $result->getHeaders());