prepared responses are now Response objects and not built on call

Moritz Pein · Moritz Pein · commit b8c174298c33 · 2017-01-09T15:39:11.000+01:00
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -22,22 +22,24 @@ def __init__(self, *args, **kwargs):
     @Request.application
     def __call__(self, request):
         try:
-            status, content = self.responses[len(self.queries)]
+            response = self.responses[len(self.queries)]
         except IndexError:
             response = Response("No prepared response")
             response.status_code = httplib.NOT_IMPLEMENTED
             return response
 
         self.queries.append(request)
+        return response
 
-        response = Response(json.dumps(content))
+    def add_response(self, data=None, status=httplib.NO_CONTENT, headers=None):
+        response = Response(data)
         response.status_code = status
-        response.headers['content-type'] = 'application/json'
-
-        return response
+        response.headers = headers or {'Content-Type': 'text/html'}
+        self.responses.append(response)
 
-    def add_response(self, data, status=httplib.OK):
-        self.responses.append((status, data))
+    def add_json_response(self, data, status=httplib.OK):
+        headers = {'Content-Type': 'application/json'}
+        self.add_response(json.dumps(data), status=status, headers=headers)
 
     @property
     def json_queries(self):
diff --git a/tests/test_dbapi.py b/tests/test_dbapi.py
@@ -53,7 +53,7 @@ def prepare_responses(self, festung):
         if not self.responses:
             return
         for response in self.responses:
-            festung.add_response(response)
+            festung.add_json_response(response)
 
     @property
     def data(self):
@@ -111,7 +111,8 @@ class TestMultipleResponses(object):
 
     def test_executemany(self, festung, cursor):
         for _ in range(3):
-            festung.add_response({'data': [], 'headers': [], 'last_row_id': 0, 'rows_changed': 3})
+            festung.add_json_response(
+                {'data': [], 'headers': [], 'last_row_id': 0, 'rows_changed': 3})
 
         query = 'UPDATE TABLE foo SET foo=?, bar=?, baz=?'
         params_list = [
@@ -125,7 +126,7 @@ def test_executemany(self, festung, cursor):
             assert data['params'] == params
 
     def test_executemany_with_result(self, festung, cursor):
-        festung.add_response({
+        festung.add_json_response({
             'data': [[1]],
             'headers': [{'name': 'foo', 'type': 'int'}],
             'last_row_id': 0,
@@ -143,7 +144,7 @@ def test_executemany_with_result(self, festung, cursor):
         ('dynamic', Type.UNKNOWN),
     ])
     def test_types(self, festung, cursor, given, expected):
-        festung.add_response({
+        festung.add_json_response({
             'data': [],
             'headers': [{'name': 'foo', 'type': given}],
             'last_row_id': 0,
