Merge pull request #382 from patrickw276/content-type

fix content-type header bug

connexion/decorators/decorator.py

@@ -174,8 +174,8 @@ def flask_response_object(self):
         :rtype: flask.Response
         """
         self._response = flask.current_app.response_class(
-            self.data, mimetype=self.mimetype)  # type: flask.Response
+            self.data, mimetype=self.mimetype, content_type=self.headers.get('content-type'),
+            headers=self.headers)  # type: flask.Response
         self._response.status_code = self.status_code
-        self._response.headers.extend(self.headers)
 
         return self._response

tests/decorators/test_decorators.py

@@ -0,0 +1,15 @@
+import flask
+from connexion.decorators.decorator import ResponseContainer
+
+
+def test_response_container_content_type():
+    app = flask.Flask(__name__)
+    response = flask.Response(response='test response', content_type='text/plain')
+    container = ResponseContainer(mimetype='application/json', response=response)
+
+    with app.app_context():
+        headers = container.flask_response_object().headers
+
+    content_types = [value for key, value in headers.items() if key == 'Content-Type']
+    assert len(content_types) == 1
+    assert content_types[0] == 'text/plain'

tests/test_validation.py

@@ -12,7 +12,7 @@ def test_parameter_validator(monkeypatch):
     request.params = {}
     app = MagicMock(name='app')
 
-    def _response_class(data, mimetype):
+    def _response_class(data, mimetype, content_type, headers):
         response = MagicMock(name='response')
         response.detail = json.loads(''.join(data))['detail']
         response.headers = MagicMock()