graphql-python/graphene-django
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene-django.git synced 2024-11-22 09:37:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Set first amount to max limit if not set (#993)

Browse Source
This commit is contained in:
Jonathan Kim 2020-06-25 15:10:56 +01:00 committed by GitHub
parent 3c229b619e
commit 3026181b28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphene_django/fields.py
View File

@ -146,6 +146,9 @@ class DjangoConnectionField(ConnectionField):
after = get_offset_with_default(args.get("after"), -1) + 1 after = get_offset_with_default(args.get("after"), -1) + 1
if max_limit is not None and "first" not in args:
args["first"] = max_limit
connection = connection_from_list_slice( connection = connection_from_list_slice(
iterable[after:], iterable[after:],
args, args,

7
graphene_django/tests/test_query.py
View File

@ -1127,7 +1127,7 @@ def test_should_return_max_limit(graphene_settings):
def test_should_have_next_page(graphene_settings): def test_should_have_next_page(graphene_settings):
graphene_settings.RELAY_CONNECTION_MAX_LIMIT = 6 graphene_settings.RELAY_CONNECTION_MAX_LIMIT = 4
reporters = [Reporter(**kwargs) for kwargs in REPORTERS] reporters = [Reporter(**kwargs) for kwargs in REPORTERS]
Reporter.objects.bulk_create(reporters) Reporter.objects.bulk_create(reporters)
db_reporters = Reporter.objects.all() db_reporters = Reporter.objects.all()
@ -1141,9 +1141,6 @@ def test_should_have_next_page(graphene_settings):
all_reporters = DjangoConnectionField(ReporterType) all_reporters = DjangoConnectionField(ReporterType)
schema = graphene.Schema(query=Query) schema = graphene.Schema(query=Query)
# Need first: 4 here to trigger the `has_next_page` logic in graphql-relay
# See `arrayconnection.py::connection_from_list_slice`:
# has_next_page=isinstance(first, int) and end_offset < upper_bound
query = """ query = """
query AllReporters($first: Int, $after: String) { query AllReporters($first: Int, $after: String) {
allReporters(first: $first, after: $after) { allReporters(first: $first, after: $after) {
@ -1160,7 +1157,7 @@ def test_should_have_next_page(graphene_settings):
} }
""" """
result = schema.execute(query, variable_values=dict(first=4)) result = schema.execute(query, variable_values={})
assert not result.errors assert not result.errors
assert len(result.data["allReporters"]["edges"]) == 4 assert len(result.data["allReporters"]["edges"]) == 4
assert result.data["allReporters"]["pageInfo"]["hasNextPage"] assert result.data["allReporters"]["pageInfo"]["hasNextPage"]