Skip to content

Commit b4f7df3

Browse files
committed
Fixed argument getter in django filters tests
1 parent 689db2c commit b4f7df3

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

graphene/contrib/django/tests/filter/test_fields.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ class PetNode(DjangoNode):
3535
class Meta:
3636
model = Pet
3737

38+
schema = Schema()
3839

3940
def assert_arguments(field, *arguments):
4041
ignore = ('after', 'before', 'first', 'last', 'orderBy')
4142
actual = [
4243
name
43-
for name in field.arguments.arguments.keys()
44+
for name in schema.T(field.arguments)
4445
if name not in ignore and not name.startswith('_')
4546
]
4647
assert set(arguments) == set(actual), \
@@ -51,12 +52,12 @@ def assert_arguments(field, *arguments):
5152

5253

5354
def assert_orderable(field):
54-
assert 'orderBy' in field.arguments.arguments.keys(), \
55+
assert 'orderBy' in schema.T(field.arguments), \
5556
'Field cannot be ordered'
5657

5758

5859
def assert_not_orderable(field):
59-
assert 'orderBy' not in field.arguments.arguments.keys(), \
60+
assert 'orderBy' not in schema.T(field.arguments), \
6061
'Field can be ordered'
6162

6263

graphene/contrib/django/tests/test_query.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import pytest
12
from py.test import raises
23

34
import graphene
@@ -7,6 +8,9 @@
78
from .models import Article, Reporter
89

910

11+
pytestmark = pytest.mark.django_db
12+
13+
1014
def test_should_query_only_fields():
1115
with raises(Exception):
1216
class ReporterType(DjangoObjectType):

graphene/contrib/django/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def get_filtering_args_from_filterset(filterset_class, type):
6666

6767
# Also add the 'order_by' field
6868
if filterset_class._meta.order_by:
69-
args[filterset_class.order_by_field] = Argument(String)
69+
args[filterset_class.order_by_field] = Argument(String())
7070
return args
7171

7272

0 commit comments

Comments
 (0)