From 57ba5e71f97090170527029afedede1abd2e49b1 Mon Sep 17 00:00:00 2001 From: Jake Date: Fri, 13 Nov 2015 17:15:42 -0500 Subject: [PATCH] Remove redundant tests & fix tox. --- graphene/contrib/django/tests/test_views.py | 72 +-------------------- tox.ini | 3 +- 2 files changed, 3 insertions(+), 72 deletions(-) diff --git a/graphene/contrib/django/tests/test_views.py b/graphene/contrib/django/tests/test_views.py index 28fec258..f82be99f 100644 --- a/graphene/contrib/django/tests/test_views.py +++ b/graphene/contrib/django/tests/test_views.py @@ -5,68 +5,6 @@ def format_response(response): return json.loads(response.content.decode()) -def test_client_get_no_query(settings, client): - settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls' - response = client.get('/graphql') - json_response = format_response(response) - assert json_response == {'errors': [ - {'message': 'Must provide query string.'}]} - - -def test_client_post_no_query(settings, client): - settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls' - response = client.post('/graphql', {}) - json_response = format_response(response) - assert json_response == {'errors': [ - {'message': 'Must provide query string.'}]} - - -def test_client_post_malformed_json(settings, client): - settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls' - response = client.post('/graphql', 'MALFORMED', 'application/json') - json_response = format_response(response) - assert json_response == {'errors': [ - {'message': 'POST body sent invalid JSON.'}]} - - -def test_client_post_empty_query_json(settings, client): - settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls' - response = client.post( - '/graphql', json.dumps({'query': ''}), 'application/json') - json_response = format_response(response) - assert json_response == {'errors': [ - {'message': 'Must provide query string.'}]} - - -def test_client_post_empty_query_graphql(settings, client): - settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls' - response = client.post( - '/graphql', '', 'application/graphql') - json_response = format_response(response) - assert json_response == {'errors': [ - {'message': 'Must provide query string.'}]} - - -def test_client_post_bad_query_json(settings, client): - settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls' - response = client.post( - '/graphql', json.dumps({'query': '{ MALFORMED'}), 'application/json') - json_response = format_response(response) - assert 'errors' in json_response - assert len(json_response['errors']) == 1 - assert 'Syntax Error GraphQL' in json_response['errors'][0]['message'] - - -def test_client_post_bad_query_graphql(settings, client): - settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls' - response = client.post( - '/graphql', '{ MALFORMED', 'application/graphql') - json_response = format_response(response) - assert 'errors' in json_response - assert len(json_response['errors']) == 1 - assert 'Syntax Error GraphQL' in json_response['errors'][0]['message'] - - def test_client_get_good_query(settings, client): settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls' response = client.get('/graphql', {'query': '{ headline }'}) @@ -83,8 +21,7 @@ def test_client_get_good_query_with_raise(settings, client): settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls' response = client.get('/graphql', {'query': '{ raises }'}) json_response = format_response(response) - assert json_response['errors'][0][ - 'message'] == 'This field should raise exception' + assert json_response['errors'][0]['message'] == 'This field should raise exception' assert json_response['data']['raises'] is None @@ -112,10 +49,3 @@ def test_client_post_good_query_graphql(settings, client): } } assert json_response == expected_json - - -# def test_client_get_bad_query(settings, client): -# settings.ROOT_URLCONF = 'graphene.contrib.django.tests.test_urls' -# response = client.get('/graphql') -# json_response = format_response(response) -# assert json_response == {'errors': [{'message': 'Must provide query string.'}]} diff --git a/tox.ini b/tox.ini index 81aa60fa..45cf7fdd 100644 --- a/tox.ini +++ b/tox.ini @@ -13,10 +13,11 @@ deps= six blinker singledispatch + mock setenv = PYTHONPATH = .:{envdir} commands= - py.test tests/ examples/ + py.test [testenv:flake8] deps = flake8