Fixed response encoding in tests

Author: Joel Collins

labthings/server/default_views/extensions.py

@@ -17,4 +17,4 @@ def get(self):
         Returns a list of Extension representations, including basic documentation.
         Describes server methods, web views, and other relevant Lab Things metadata.
         """
-        return registered_extensions().values()
+        return registered_extensions().values() or []

labthings/server/view/__init__.py

@@ -1,5 +1,5 @@
 from flask.views import MethodView
-from flask import request
+from flask import request, make_response
 from werkzeug.wrappers import Response as ResponseBase
 from werkzeug.exceptions import MethodNotAllowed
 
@@ -58,9 +58,7 @@ def dispatch_request(self, *args, **kwargs):
         representations = self.representations or OrderedDict()
 
         # noinspection PyUnresolvedReferences
-        mediatype = request.accept_mimetypes.best_match(
-            representations, default="application/json"
-        )
+        mediatype = request.accept_mimetypes.best_match(representations, default=None)
         if mediatype in representations:
             data, code, headers = unpack(resp)
             resp = representations[mediatype](data, code, headers)

tests/conftest.py

@@ -6,6 +6,18 @@
 from labthings.server.labthing import LabThing
 from labthings.server.view import View
 
+from flask.testing import FlaskClient
+
+
+class JsonClient(FlaskClient):
+    def open(self, *args, **kwargs):
+        kwargs.setdefault(
+            "headers",
+            {"Content-Type": "application/json", "Accept": "application/json"},
+        )
+        kwargs.setdefault("content_type", "application/json")
+        return super().open(*args, **kwargs)
+
 
 @pytest.fixture
 def view_cls():
@@ -111,11 +123,13 @@ def req_ctx(app):
 
 @pytest.fixture
 def client(app):
+    app.test_client_class = JsonClient
     return app.test_client()
 
 
 @pytest.fixture
 def thing_client(thing):
+    thing.app.test_client_class = JsonClient
     return thing.app.test_client()
 
 

tests/test_server_decorators.py

@@ -180,9 +180,9 @@ def put(self, args):
     app.add_url_rule("/", view_func=WrappedCls.as_view("index"))
 
     with client as c:
-        assert c.get("/").data == b'{"integer":1}\n'
-        assert c.post("/", json={"integer": 5}).data == b'{"integer":5}\n'
-        assert c.put("/", json={"integer": 5}).data == b'{"integer":5}\n'
+        assert c.get("/").json == {"integer": 1}
+        assert c.post("/", json={"integer": 5}).json == {"integer": 5}
+        assert c.put("/", json={"integer": 5}).json == {"integer": 5}
 
 
 def test_property_schema_empty_class(empty_cls):
@@ -205,7 +205,7 @@ def post(self, data):
     app.add_url_rule("/", view_func=Index.as_view("index"))
 
     with client as c:
-        assert c.post("/", data=b"5\n").data == b"5"
+        assert c.post("/", data=b"5\n").data == b'"5"\n'
 
 
 def test_use_body_required_no_data(app, client):
@@ -254,7 +254,7 @@ def post(self, data):
     app.add_url_rule("/", view_func=Index.as_view("index"))
 
     with client as c:
-        assert c.post("/").data == b"5"
+        assert c.post("/").data == b'"5"\n'
 
 
 def test_use_body_malformed(app, client):
@@ -276,7 +276,7 @@ def post(self, data):
 def test_use_args(app, client):
     class Index(View):
         def post(self, data):
-            return str(data)
+            return data
 
     schema = _Schema.from_dict({"integer": fields.Int()})()
     Index.post = decorators.use_args(schema)(Index.post)
@@ -286,7 +286,7 @@ def post(self, data):
     app.add_url_rule("/", view_func=Index.as_view("index"))
 
     with client as c:
-        assert c.post("/", json={"integer": 5}).data == b"{'integer': 5}"
+        assert c.post("/", json={"integer": 5}).json == {"integer": 5}
 
 
 def test_use_args_field(app, client):
@@ -302,7 +302,7 @@ def post(self, data):
     app.add_url_rule("/", view_func=Index.as_view("index"))
 
     with client as c:
-        assert c.post("/").data == b"5"
+        assert c.post("/").data == b'"5"\n'
 
 
 def test_doc(empty_cls):

tests/test_server_view_builder.py

@@ -10,9 +10,9 @@ def test_property_of(app, client):
     app.add_url_rule("/", view_func=GeneratedClass.as_view("index"))
 
     with client as c:
-        assert c.get("/").data == b"propertyValue"
-        assert c.post("/", data=b"newPropertyValue").data == b"newPropertyValue"
-        assert c.get("/").data == b"newPropertyValue"
+        assert c.get("/").data == b'"propertyValue"\n'
+        assert c.post("/", data=b"newPropertyValue").data == b'"newPropertyValue"\n'
+        assert c.get("/").data == b'"newPropertyValue"\n'
 
 
 def test_property_of_dict(app, client):
@@ -31,18 +31,17 @@ def test_property_of_dict(app, client):
     app.add_url_rule("/", view_func=GeneratedClass.as_view("index"))
 
     with client as c:
-        assert (
-            c.get("/").data
-            == b'{"property_name":"propertyValue","property_name_2":"propertyValue2"}\n'
-        )
-        assert (
-            c.put("/", json={"property_name": "newPropertyValue"}).data
-            == b'{"property_name":"newPropertyValue","property_name_2":"propertyValue2"}\n'
-        )
-        assert (
-            c.post("/", json={"property_name": "newPropertyValue"}).data
-            == b'{"property_name":"newPropertyValue"}\n'
-        )
+        assert c.get("/").json == {
+            "property_name": "propertyValue",
+            "property_name_2": "propertyValue2",
+        }
+        assert c.put("/", json={"property_name": "newPropertyValue"}).json == {
+            "property_name": "newPropertyValue",
+            "property_name_2": "propertyValue2",
+        }
+        assert c.post("/", json={"property_name": "newPropertyValue"}).json == {
+            "property_name": "newPropertyValue"
+        }
 
 
 def test_property_of_readonly():
@@ -72,7 +71,7 @@ def f(arg: int, kwarg: str = "default"):
     app.add_url_rule("/", view_func=GeneratedClass.as_view("index"))
 
     with client as c:
-        assert c.post("/", json={"arg": 5}).data == b'{"arg":5,"kwarg":"default"}\n'
+        assert c.post("/", json={"arg": 5}).json == {"arg": 5, "kwarg": "default"}
 
 
 def test_action_from_task(app, client):