Explorar o código

10472 graphene 3 (#10473)

* update to Graphene 3.0.0

* 10472 exempt view permissions on tests

* 10472 exempt permission check on graphql tests
Arthur Hanson %!s(int64=3) %!d(string=hai) anos
pai
achega
24ba840be7

+ 1 - 1
netbox/netbox/graphql/scalars.py

@@ -1,6 +1,6 @@
 from graphene import Scalar
 from graphql.language import ast
-from graphql.type.scalars import MAX_INT, MIN_INT
+from graphene.types.scalars import MAX_INT, MIN_INT
 
 
 class BigInt(Scalar):

+ 1 - 1
netbox/netbox/graphql/schema.py

@@ -12,12 +12,12 @@ from wireless.graphql.schema import WirelessQuery
 
 
 class Query(
+    UsersQuery,
     CircuitsQuery,
     DCIMQuery,
     ExtrasQuery,
     IPAMQuery,
     TenancyQuery,
-    UsersQuery,
     VirtualizationQuery,
     WirelessQuery,
     *registry['plugins']['graphql_schemas'],  # Append plugin schemas

+ 2 - 0
netbox/utilities/testing/api.py

@@ -467,6 +467,7 @@ class APIViewTestCases:
             return query
 
         @override_settings(LOGIN_REQUIRED=True)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*', 'auth.user'])
         def test_graphql_get_object(self):
             url = reverse('graphql')
             field_name = self._get_graphql_base_name()
@@ -492,6 +493,7 @@ class APIViewTestCases:
             self.assertNotIn('errors', data)
 
         @override_settings(LOGIN_REQUIRED=True)
+        @override_settings(EXEMPT_VIEW_PERMISSIONS=['*', 'auth.user'])
         def test_graphql_list_objects(self):
             url = reverse('graphql')
             field_name = f'{self._get_graphql_base_name()}_list'

+ 1 - 1
requirements.txt

@@ -15,7 +15,7 @@ django-taggit==3.0.0
 django-timezone-field==5.0
 djangorestframework==3.14.0
 drf-yasg[validation]==1.21.4
-graphene-django==2.15.0
+graphene-django==3.0.0
 gunicorn==20.1.0
 Jinja2==3.1.2
 Markdown==3.3.7