From da9f41c295df7ab4640e96907700494660f5941b Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Thu, 6 Aug 2020 20:44:33 +0100 Subject: [PATCH] Rename get_resolver -> wrap_resolve and fix tests --- graphene_django/fields.py | 4 ++-- graphene_django/filter/tests/test_fields.py | 4 ++++ graphene_django/tests/test_query.py | 3 +++ graphene_django/tests/test_utils.py | 6 +++--- setup.py | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/graphene_django/fields.py b/graphene_django/fields.py index 98b9d89..75dc718 100644 --- a/graphene_django/fields.py +++ b/graphene_django/fields.py @@ -58,7 +58,7 @@ class DjangoListField(Field): return queryset - def get_resolver(self, parent_resolver): + def wrap_resolve(self, parent_resolver): _type = self.type if isinstance(_type, NonNull): _type = _type.of_type @@ -217,7 +217,7 @@ class DjangoConnectionField(ConnectionField): return on_resolve(iterable) - def get_resolver(self, parent_resolver): + def wrap_resolve(self, parent_resolver): return partial( self.connection_resolver, parent_resolver, diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py index 0f5f024..331527a 100644 --- a/graphene_django/filter/tests/test_fields.py +++ b/graphene_django/filter/tests/test_fields.py @@ -417,12 +417,14 @@ def test_global_id_field_relation_with_filter(): class Meta: model = Reporter interfaces = (Node,) + fields = "__all__" filter_fields = ["first_name", "articles"] class ArticleFilterNode(DjangoObjectType): class Meta: model = Article interfaces = (Node,) + fields = "__all__" filter_fields = ["headline", "reporter"] class Query(ObjectType): @@ -472,12 +474,14 @@ def test_global_id_field_relation_with_filter_not_valid_id(): class Meta: model = Reporter interfaces = (Node,) + fields = "__all__" filter_fields = ["first_name", "articles"] class ArticleFilterNode(DjangoObjectType): class Meta: model = Article interfaces = (Node,) + fields = "__all__" filter_fields = ["headline", "reporter"] class Query(ObjectType): diff --git a/graphene_django/tests/test_query.py b/graphene_django/tests/test_query.py index 9edf889..44a2333 100644 --- a/graphene_django/tests/test_query.py +++ b/graphene_django/tests/test_query.py @@ -1122,6 +1122,7 @@ def test_connection_should_limit_after_to_list_length(): class Meta: model = Reporter interfaces = (Node,) + fields = "__all__" class Query(graphene.ObjectType): all_reporters = DjangoConnectionField(ReporterType) @@ -1166,6 +1167,7 @@ def test_should_return_max_limit(graphene_settings): class Meta: model = Reporter interfaces = (Node,) + fields = "__all__" class Query(graphene.ObjectType): all_reporters = DjangoConnectionField(ReporterType) @@ -1198,6 +1200,7 @@ def test_should_have_next_page(graphene_settings): class Meta: model = Reporter interfaces = (Node,) + fields = "__all__" class Query(graphene.ObjectType): all_reporters = DjangoConnectionField(ReporterType) diff --git a/graphene_django/tests/test_utils.py b/graphene_django/tests/test_utils.py index 844c656..766032e 100644 --- a/graphene_django/tests/test_utils.py +++ b/graphene_django/tests/test_utils.py @@ -39,7 +39,7 @@ def test_camelize(): @pytest.mark.django_db @patch("graphene_django.utils.testing.Client.post") -def test_graphql_test_case_op_name(post_mock): +def test_graphql_test_case_operation_name(post_mock): """ Test that `GraphQLTestCase.query()`'s `operation_name` argument produces an `operationName` field. """ @@ -63,8 +63,8 @@ def test_graphql_test_case_op_name(post_mock): @pytest.mark.django_db @patch("graphene_django.utils.testing.Client.post") -def test_graphql_query_case_op_name(post_mock): - graphql_query("query { }", op_name="QueryName") +def test_graphql_query_case_operation_name(post_mock): + graphql_query("query { }", operation_name="QueryName") body = json.loads(post_mock.call_args.args[1]) # `operationName` field from https://graphql.org/learn/serving-over-http/#post-request assert ( diff --git a/setup.py b/setup.py index 2ddbe08..01c438b 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ setup( keywords="api graphql protocol rest relay graphene", packages=find_packages(exclude=["tests"]), install_requires=[ - "graphene>=3.0.0b1,<4", + "graphene>=3.0.0b5,<4", "graphql-core>=3.1.0,<4", "Django>=2.2", "promise>=2.1",