reorg tests; kill commented code blocks; detox;

Author: chrisbc

serverless.yml

@@ -151,26 +151,3 @@ functions:
     #       - test
     #       - prod
 
-# resources:
-#   Resources:
-#     ToshiBucket:
-#       Type: AWS::S3::Bucket
-#       Properties:
-#         BucketName: ${self:custom.s3_bucket}
-
-#     # following on from
-#     #   https://www.serverless.com/blog/build-geosearch-graphql-api-aws-appsync-elasticsearch
-#     ElasticSearchInstance:
-#       Type: AWS::Elasticsearch::Domain
-#       Properties:
-#         ElasticsearchVersion: 6.2
-#         DomainName: "${self:custom.esDomainName}"
-#         EBSOptions:
-#           EBSEnabled: true
-#           VolumeType: gp2
-#           VolumeSize: 10
-#         ElasticsearchClusterConfig:
-#           InstanceType: t2.small.elasticsearch
-#           InstanceCount: 1
-#           DedicatedMasterEnabled: false
-#           ZoneAwarenessEnabled: false

tests/test_schema_model_source_logic_tree.py

@@ -11,20 +11,6 @@ def client():
     return Client(schema.schema_root)
 
 
-def test_get_model_default(client):
-    QUERY = """
-        query {
-            get_model
-            {
-                version
-            }
-        }
-    """
-    executed = client.execute(QUERY)
-    print(executed)
-    assert executed["data"]["get_model"]["version"] == "NSHM_v1.0.4"
-
-
 @pytest.mark.parametrize(
     "model_version",
     ["NSHM_v1.0.0", "NSHM_v1.0.4"],

tests/test_schema_models.py

@@ -1,6 +1,5 @@
 import pytest
 from graphene.test import Client
-from graphql_relay import to_global_id
 
 from nshm_model_graphql_api import schema
 
@@ -23,6 +22,20 @@ def test_get_models(client):
     assert executed["data"]["get_models"][0]["version"] == "NSHM_v1.0.0"
 
 
+def test_get_model_default(client):
+    QUERY = """
+        query {
+            get_model
+            {
+                version
+            }
+        }
+    """
+    executed = client.execute(QUERY)
+    print(executed)
+    assert executed["data"]["get_model"]["version"] == "NSHM_v1.0.4"
+
+
 @pytest.mark.parametrize(
     "model_version",
     ["NSHM_v1.0.0", "NSHM_v1.0.4"],
@@ -47,30 +60,3 @@ def test_get_model(client, model_version):
     print(executed)
     assert executed["data"]["get_model"]["version"] == model_version
     assert executed["data"]["get_model"]["__typename"] == "NshmModel"
-
-
-@pytest.mark.parametrize(
-    "model_version",
-    ["NSHM_v1.0.0", "NSHM_v1.0.4"],
-)
-def test_get_model_as_node(client, model_version):
-    QUERY = """
-    query {
-        node(id: "%s")
-        {
-            ... on Node {
-                id
-            }
-            ... on NshmModel {
-                version
-            }
-
-        }
-    }
-    """ % to_global_id(
-        "NshmModel", model_version
-    )
-    executed = client.execute(QUERY)
-    print(executed)
-    assert executed["data"]["node"]["version"] == model_version
-    assert executed["data"]["node"]["id"] == to_global_id("NshmModel", model_version)