diff --git a/graphene/contrib/django/tests/data.py b/graphene/contrib/django/tests/data.py deleted file mode 100644 index c5edbb06..00000000 --- a/graphene/contrib/django/tests/data.py +++ /dev/null @@ -1,19 +0,0 @@ -from datetime import date - -from .models import Article, Reporter - -r = Reporter(first_name='John', last_name='Smith', email='john@example.com') -r.save() - -r2 = Reporter(first_name='Paul', last_name='Jones', email='paul@example.com') -r2.save() - -a = Article(id=None, headline="This is a test", - pub_date=date(2005, 7, 27), reporter=r) -a.save() - -new_article = r.articles.create( - headline="John's second story", pub_date=date(2005, 7, 29)) - -new_article2 = Article(headline="Paul's story", pub_date=date(2006, 1, 17)) -r.articles.add(new_article2) diff --git a/graphene/contrib/django/tests/test_types.py b/graphene/contrib/django/tests/test_types.py index ddc1f2ee..9c914cc5 100644 --- a/graphene/contrib/django/tests/test_types.py +++ b/graphene/contrib/django/tests/test_types.py @@ -1,3 +1,5 @@ +from mock import patch + from graphql.core.type import GraphQLInterfaceType, GraphQLObjectType from graphene import Schema @@ -24,9 +26,6 @@ class Human(DjangoNode): pub_date = Int() - def get_node(self, id): - pass - class Meta: model = Article @@ -35,6 +34,12 @@ def test_django_interface(): assert DjangoNode._meta.is_interface is True +@patch('graphene.contrib.django.tests.models.Article.objects.filter') +def test_django_get_node(objects): + Human.get_node(1) + objects.assert_called_with(id=1) + + def test_pseudo_interface_registered(): object_type = schema.T(Character) assert Character._meta.is_interface is True diff --git a/graphene/core/types/field.py b/graphene/core/types/field.py index f9e33a5b..fa0876cc 100644 --- a/graphene/core/types/field.py +++ b/graphene/core/types/field.py @@ -51,10 +51,6 @@ class Field(OrderedType): def resolver(self): return self.resolver_fn or self.get_resolver_fn() - @resolver.setter - def resolver(self, value): - self.resolver_fn = value - def get_resolver_fn(self): resolve_fn_name = 'resolve_%s' % self.attname if hasattr(self.object_type, resolve_fn_name): diff --git a/graphene/core/types/tests/test_field.py b/graphene/core/types/tests/test_field.py index c9c21586..c32aa56d 100644 --- a/graphene/core/types/tests/test_field.py +++ b/graphene/core/types/tests/test_field.py @@ -66,6 +66,13 @@ def test_field_self(): assert schema.T(field).type == schema.T(MyObjectType) +def test_field_eq(): + field = Field('self', name='my_customName') + field2 = Field('self', name='my_customName') + assert field == field + assert field2 != field + + def test_field_mounted(): field = Field(List('MyObjectType'), name='my_customName')