Skip to content

Commit 0725058

Browse files
authored
Merge pull request #12 from ekampf/patch-1
Fix graphql-server-core dependency
2 parents 36a9403 + 5187d6b commit 0725058

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from setuptools import setup, find_packages
22

33
required_packages = [
4-
'graphql-core>=1.0',
5-
'graphql-server-core>=1.0.dev',
4+
'graphql-core>=2.1',
5+
'graphql-server-core>=1.1.1',
66
'sanic>=0.5.1',
77
'pytest-runner'
88
]

tests/schema.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ def resolve_raises(*_):
1515
fields={
1616
'thrower': GraphQLField(GraphQLNonNull(GraphQLString), resolver=resolve_raises),
1717
'request': GraphQLField(GraphQLNonNull(GraphQLString),
18-
resolver=lambda obj, args, context, info: context['request'].args.get('q')),
18+
resolver=lambda obj, info: info.context['request'].args.get('q')),
1919
'context': GraphQLField(GraphQLNonNull(GraphQLString),
20-
resolver=lambda obj, args, context, info: context),
20+
resolver=lambda obj, info: info.context),
2121
'test': GraphQLField(
2222
type=GraphQLString,
2323
args={
2424
'who': GraphQLArgument(GraphQLString)
2525
},
26-
resolver=lambda obj, args, context, info: 'Hello %s' % (args.get('who') or 'World')
26+
resolver=lambda obj, info, who=None: 'Hello %s' % (who or 'World')
2727
)
2828
}
2929
)
@@ -42,17 +42,20 @@ def resolve_raises(*_):
4242

4343

4444
# Schema with async methods
45-
async def resolver(context, *_):
45+
async def resolver(context, *_, **__):
4646
await asyncio.sleep(0.001)
4747
return 'hey'
4848

49-
async def resolver_2(context, *_):
49+
50+
async def resolver_2(context, *_, **__):
5051
await asyncio.sleep(0.003)
5152
return 'hey2'
5253

53-
def resolver_3(context, *_):
54+
55+
def resolver_3(context, *_, **__):
5456
return 'hey3'
5557

58+
5659
AsyncQueryType = GraphQLObjectType('AsyncQueryType', {
5760
'a': GraphQLField(GraphQLString, resolver=resolver),
5861
'b': GraphQLField(GraphQLString, resolver=resolver_2),

tests/test_graphqlview.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ def test_handles_field_errors_caught_by_graphql(app):
385385
assert response.status == 200
386386
assert response_json(response) == {
387387
'data': None,
388-
'errors': [{'locations': [{'column': 2, 'line': 1}], 'message': 'Throws!'}]
388+
'errors': [{'locations': [{'column': 2, 'line': 1}], 'message': 'Throws!', 'path': ['thrower']}]
389389
}
390390

391391

@@ -394,9 +394,12 @@ def test_handles_syntax_errors_caught_by_graphql(app):
394394
_, response = app.client.get(uri=url_string(query='syntaxerror'))
395395
assert response.status == 400
396396
assert response_json(response) == {
397-
'errors': [{'locations': [{'column': 1, 'line': 1}],
398-
'message': 'Syntax Error GraphQL request (1:1) '
399-
'Unexpected Name "syntaxerror"\n\n1: syntaxerror\n ^\n'}]
397+
'errors': [
398+
{
399+
'locations': [{'column': 1, 'line': 1}],
400+
'message': 'Syntax Error GraphQL (1:1) Unexpected Name "syntaxerror"\n\n1: syntaxerror\n ^\n'
401+
}
402+
]
400403
}
401404

402405

@@ -482,10 +485,9 @@ def test_passes_request_into_request_context(app):
482485
def test_supports_pretty_printing(app):
483486
_, response = app.client.get(uri=url_string(query='{context}'))
484487

485-
486488
assert response.status == 200
487489
assert 'data' in response_json(response)
488-
assert response_json(response)['data']['context'] == "{'request': {}}"
490+
assert response_json(response)['data']['context'] == "{'request': <Request: GET /graphql>}"
489491

490492

491493
@parametrize_sync_async_app_test('app')

0 commit comments

Comments
 (0)