This commit is contained in:
Thomas Leonard 2022-03-20 22:48:54 +01:00
parent c4aa139ff1
commit ca555293a4
6 changed files with 8 additions and 13 deletions

View File

@ -120,10 +120,7 @@ def test_array_field_filter_schema_type(Query):
"randomField": "[Boolean!]", "randomField": "[Boolean!]",
} }
filters_str = ", ".join( filters_str = ", ".join(
[ [f"{filter_field}: {gql_type}" for filter_field, gql_type in filters.items()]
f"{filter_field}: {gql_type} = null"
for filter_field, gql_type in filters.items()
]
) )
assert ( assert (
f"type Query {{\n events({filters_str}): EventTypeConnection\n}}" in schema_str f"type Query {{\n events({filters_str}): EventTypeConnection\n}}" in schema_str

View File

@ -152,9 +152,6 @@ def test_filter_enum_field_schema_type(schema):
"reporter_AChoice_In": "[TestsReporterAChoiceChoices]", "reporter_AChoice_In": "[TestsReporterAChoiceChoices]",
} }
filters_str = ", ".join( filters_str = ", ".join(
[ [f"{filter_field}: {gql_type}" for filter_field, gql_type in filters.items()]
f"{filter_field}: {gql_type} = null"
for filter_field, gql_type in filters.items()
]
) )
assert f" allArticles({filters_str}): ArticleTypeConnection\n" in schema_str assert f" allArticles({filters_str}): ArticleTypeConnection\n" in schema_str

View File

@ -1008,7 +1008,7 @@ def test_integer_field_filter_type():
assert str(schema) == dedent( assert str(schema) == dedent(
"""\ """\
type Query { type Query {
pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null): PetTypeConnection pets(offset: Int, before: String, after: String, first: Int, last: Int, age: Int): PetTypeConnection
} }
type PetTypeConnection { type PetTypeConnection {
@ -1077,7 +1077,7 @@ def test_other_filter_types():
assert str(schema) == dedent( assert str(schema) == dedent(
"""\ """\
type Query { type Query {
pets(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null, age: Int = null, age_Isnull: Boolean = null, age_Lt: Int = null): PetTypeConnection pets(offset: Int, before: String, after: String, first: Int, last: Int, age: Int, age_Isnull: Boolean, age_Lt: Int): PetTypeConnection
} }
type PetTypeConnection { type PetTypeConnection {

View File

@ -98,7 +98,7 @@ def test_typed_filter_schema(schema):
) )
for filter_field, gql_type in filters.items(): for filter_field, gql_type in filters.items():
assert "{}: {} = null".format(filter_field, gql_type) in all_articles_filters assert "{}: {}".format(filter_field, gql_type) in all_articles_filters
def test_typed_filters_work(schema): def test_typed_filters_work(schema):

View File

@ -183,7 +183,7 @@ def test_schema_representation():
pets: [Reporter!]! pets: [Reporter!]!
aChoice: TestsReporterAChoiceChoices aChoice: TestsReporterAChoiceChoices
reporterType: TestsReporterReporterTypeChoices reporterType: TestsReporterReporterTypeChoices
articles(offset: Int = null, before: String = null, after: String = null, first: Int = null, last: Int = null): ArticleConnection! articles(offset: Int, before: String, after: String, first: Int, last: Int): ArticleConnection!
} }
\"""An enumeration.\""" \"""An enumeration.\"""

View File

@ -60,7 +60,8 @@ setup(
keywords="api graphql protocol rest relay graphene", keywords="api graphql protocol rest relay graphene",
packages=find_packages(exclude=["tests", "examples", "examples.*"]), packages=find_packages(exclude=["tests", "examples", "examples.*"]),
install_requires=[ install_requires=[
"graphene>=3.0,<4", # "graphene>=3.0,<4",
"graphene @ git+https://github.com/loft-orbital/graphene.git@loft-v3-1.0#egg=graphene",
"graphql-core>=3.1.0,<4", "graphql-core>=3.1.0,<4",
"graphql-relay>=3.1.1,<4", "graphql-relay>=3.1.1,<4",
"Django>=2.2", "Django>=2.2",