From 984e815cdf4118122b0e1f383666d1efeccf826e Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Fri, 25 Jun 2021 10:14:06 -0400
Subject: [PATCH] Clean up GraphQL tests

---
 netbox/circuits/graphql/__init__.py |  0
 netbox/circuits/graphql/types.py    | 36 +++++++++++++----------------
 netbox/netbox/graphql/schema.py     |  2 ++
 netbox/utilities/testing/api.py     |  4 ++--
 4 files changed, 20 insertions(+), 22 deletions(-)
 create mode 100644 netbox/circuits/graphql/__init__.py

diff --git a/netbox/circuits/graphql/__init__.py b/netbox/circuits/graphql/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/netbox/circuits/graphql/types.py b/netbox/circuits/graphql/types.py
index 51ef8082b..bde25a09f 100644
--- a/netbox/circuits/graphql/types.py
+++ b/netbox/circuits/graphql/types.py
@@ -1,33 +1,21 @@
 from circuits import filtersets, models
-from netbox.graphql.types import *
+from netbox.graphql.types import BaseObjectType, ObjectType, TaggedObjectType
 
 __all__ = (
-    'CircuitType',
     'CircuitTerminationType',
+    'CircuitType',
     'CircuitTypeType',
     'ProviderType',
     'ProviderNetworkType',
 )
 
 
-#
-# Object types
-#
-
-class ProviderType(TaggedObjectType):
+class CircuitTerminationType(BaseObjectType):
 
     class Meta:
-        model = models.Provider
+        model = models.CircuitTermination
         fields = '__all__'
-        filterset_class = filtersets.ProviderFilterSet
-
-
-class ProviderNetworkType(TaggedObjectType):
-
-    class Meta:
-        model = models.ProviderNetwork
-        fields = '__all__'
-        filterset_class = filtersets.ProviderNetworkFilterSet
+        filterset_class = filtersets.CircuitTerminationFilterSet
 
 
 class CircuitType(TaggedObjectType):
@@ -46,9 +34,17 @@ class CircuitTypeType(ObjectType):
         filterset_class = filtersets.CircuitTypeFilterSet
 
 
-class CircuitTerminationType(BaseObjectType):
+class ProviderType(TaggedObjectType):
 
     class Meta:
-        model = models.CircuitTermination
+        model = models.Provider
         fields = '__all__'
-        filterset_class = filtersets.CircuitTerminationFilterSet
+        filterset_class = filtersets.ProviderFilterSet
+
+
+class ProviderNetworkType(TaggedObjectType):
+
+    class Meta:
+        model = models.ProviderNetwork
+        fields = '__all__'
+        filterset_class = filtersets.ProviderNetworkFilterSet
diff --git a/netbox/netbox/graphql/schema.py b/netbox/netbox/graphql/schema.py
index 04d836988..ff64416bb 100644
--- a/netbox/netbox/graphql/schema.py
+++ b/netbox/netbox/graphql/schema.py
@@ -1,10 +1,12 @@
 import graphene
 
 from circuits.graphql.schema import CircuitsQuery
+from ipam.graphql.schema import IPAMQuery
 
 
 class Query(
     CircuitsQuery,
+    IPAMQuery,
     graphene.ObjectType
 ):
     pass
diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
index ad14c2fdc..eff5b9c05 100644
--- a/netbox/utilities/testing/api.py
+++ b/netbox/utilities/testing/api.py
@@ -428,7 +428,7 @@ class APIViewTestCases:
         @override_settings(LOGIN_REQUIRED=True)
         def test_graphql_get_object(self):
             url = reverse('graphql')
-            object_type = self.model._meta.verbose_name.replace(' ', '_')
+            object_type = self.model._meta.verbose_name.lower().replace(' ', '_')
             object_id = self._get_queryset().first().pk
             query = f"""
             {{
@@ -459,7 +459,7 @@ class APIViewTestCases:
         @override_settings(LOGIN_REQUIRED=True)
         def test_graphql_list_objects(self):
             url = reverse('graphql')
-            object_type = self.model._meta.verbose_name_plural.replace(' ', '_')
+            object_type = self.model._meta.verbose_name_plural.lower().replace(' ', '_')
             query = f"""
             {{
                 {object_type} {{