Updated tests for view tags as sets

Author: Joel Collins

tests/test_server_decorators.py

@@ -123,8 +123,7 @@ def func():
 
 def test_thing_action(empty_cls):
     wrapped_cls = decorators.thing_action(empty_cls)
-    assert wrapped_cls.__apispec__["tags"] == ["actions"]
-    assert wrapped_cls.__apispec__["_groups"] == ["actions"]
+    assert wrapped_cls.__apispec__["tags"] == set(["actions"])
 
 
 def test_safe(empty_cls):
@@ -139,14 +138,12 @@ def test_idempotent(empty_cls):
 
 def test_thing_property(view_cls):
     wrapped_cls = decorators.thing_property(view_cls)
-    assert wrapped_cls.__apispec__["tags"] == ["properties"]
-    assert wrapped_cls.__apispec__["_groups"] == ["properties"]
+    assert wrapped_cls.__apispec__["tags"] == set(["properties"])
 
 
 def test_thing_property_empty_class(empty_cls, app_ctx):
     wrapped_cls = decorators.thing_property(empty_cls)
-    assert wrapped_cls.__apispec__["tags"] == ["properties"]
-    assert wrapped_cls.__apispec__["_groups"] == ["properties"]
+    assert wrapped_cls.__apispec__["tags"] == set(["properties"])
 
 
 def test_thing_property_property_notify(view_cls, app_ctx):
@@ -312,12 +309,12 @@ def test_doc(empty_cls):
 
 def test_tag(empty_cls):
     wrapped_cls = decorators.tag(["tag", "tag2"])(empty_cls)
-    assert wrapped_cls.__apispec__["tags"] == ["tag", "tag2"]
+    assert wrapped_cls.__apispec__["tags"] == set(["tag", "tag2"])
 
 
 def test_tag_single(empty_cls):
     wrapped_cls = decorators.tag("tag")(empty_cls)
-    assert wrapped_cls.__apispec__["tags"] == ["tag"]
+    assert wrapped_cls.__apispec__["tags"] == set(["tag"])
 
 
 def test_tag_invalid(empty_cls):

tests/test_server_default_views.py

@@ -3,9 +3,13 @@
 import gevent
 
 
-def test_docs(thing, thing_client):
+def test_docs(thing, thing_client, schemas_path):
+
     with thing_client as c:
-        assert c.get("/docs/swagger").json == thing.spec.to_dict()
+        json_out = c.get("/docs/swagger").json
+        assert "openapi" in json_out
+        assert "paths" in json_out
+        assert "info" in json_out
         assert c.get("/docs/swagger-ui").status_code == 200
 
 

tests/test_server_labthing.py

@@ -61,13 +61,13 @@ def get(self):
 
 
 def test_add_view_action(thing, view_cls, client):
-    view_cls.__apispec__ = {"_groups": ["actions"]}
+    view_cls.__apispec__ = {"tags": set(["actions"])}
     thing.add_view(view_cls, "/index", endpoint="index")
     assert view_cls in thing._action_views.values()
 
 
 def test_add_view_property(thing, view_cls, client):
-    view_cls.__apispec__ = {"_groups": ["properties"]}
+    view_cls.__apispec__ = {"tags": set(["properties"])}
     thing.add_view(view_cls, "/index", endpoint="index")
     assert view_cls in thing._property_views.values()
 

tests/test_server_spec_apispec.py

@@ -94,13 +94,13 @@ def post(self):
         "post": {
             "description": None,
             "summary": None,
-            "tags": [],
+            "tags": set(),
             "responses": {200: {"description": "OK"}},
         },
         "get": {
             "description": None,
             "summary": None,
-            "tags": [],
+            "tags": set(),
             "responses": {200: {"description": "OK"}},
         },
     }
@@ -122,19 +122,19 @@ def post(self):
             "get": {
                 "description": None,
                 "summary": None,
-                "tags": [],
+                "tags": set(),
                 "responses": {200: {"description": "OK"}},
             },
             "post": {
                 "description": None,
                 "summary": None,
-                "tags": [],
+                "tags": set(),
                 "responses": {200: {"description": "OK"}},
             },
         },
         "description": None,
         "summary": None,
-        "tags": [],
+        "tags": set(),
     }
 
 
@@ -154,7 +154,7 @@ def post(self):
             "get": {
                 "description": None,
                 "summary": None,
-                "tags": [],
+                "tags": set(),
                 "responses": {200: {"description": "OK"}},
                 "parameters": [
                     {
@@ -168,7 +168,7 @@ def post(self):
             "post": {
                 "description": None,
                 "summary": None,
-                "tags": [],
+                "tags": set(),
                 "responses": {200: {"description": "OK"}},
                 "parameters": [
                     {
@@ -182,7 +182,7 @@ def post(self):
         },
         "description": None,
         "summary": None,
-        "tags": [],
+        "tags": set(),
     }
 
 
@@ -202,13 +202,13 @@ def get(self):
             "get": {
                 "description": None,
                 "summary": "A class summary",
-                "tags": [],
+                "tags": set(),
                 "responses": {200: {"description": "OK"}},
             }
         },
         "description": None,
         "summary": "A class summary",
-        "tags": [],
+        "tags": set(),
     }
 
 
@@ -228,11 +228,11 @@ def get(self):
             "get": {
                 "description": None,
                 "summary": "A GET summary",
-                "tags": [],
+                "tags": set(),
                 "responses": {200: {"description": "OK"}},
             }
         },
         "description": None,
         "summary": None,
-        "tags": [],
+        "tags": set(),
     }