Return errors as promise when return_promise=True (#5)

Author: Cito

graphql_server/__init__.py

@@ -12,12 +12,14 @@
 from collections import namedtuple
 
 import six
+
+from promise import promisify, is_thenable
+
 from graphql import get_default_backend
 from graphql.error import format_error as default_format_error
 from graphql.execution import ExecutionResult
 from graphql.execution.executors.sync import SyncExecutor
 from graphql.type import GraphQLSchema
-from promise import Promise, is_thenable
 
 from .error import HttpQueryError
 
@@ -304,6 +306,11 @@ def execute_graphql_request(
         return ExecutionResult(errors=[e], invalid=True)
 
 
+@promisify
+def execute_graphql_request_as_promise(*args, **kwargs):
+    return execute_graphql_request(*args, **kwargs)
+
+
 def get_response(
     schema,  # type: GraphQLSchema
     params,  # type: RequestParams
@@ -318,10 +325,13 @@ def get_response(
     that belong to an exception class that you need to pass as a parameter.
     """
     # noinspection PyBroadException
+    execute = (
+        execute_graphql_request_as_promise
+        if kwargs.get("return_promise", False)
+        else execute_graphql_request
+    )
     try:
-        execution_result = execute_graphql_request(
-            schema, params, allow_only_query, **kwargs
-        )
+        execution_result = execute(schema, params, allow_only_query, **kwargs)
     except catch_exc:
         return None
 

tests/test_query.py

@@ -1,8 +1,12 @@
 import json
 
-from graphql.error import GraphQLError
+from pytest import raises
+
 from promise import Promise
 
+from graphql.error import GraphQLError, GraphQLSyntaxError
+from graphql.execution import ExecutionResult
+
 from graphql_server import (
     HttpQueryError,
     RequestParams,
@@ -13,7 +17,6 @@
     load_json_body,
     run_http_query,
 )
-from pytest import raises
 
 from .schema import schema
 from .utils import as_dicts
@@ -529,7 +532,7 @@ def test_batch_allows_post_with_operation_name():
     ]
 
 
-def test_get_reponses_using_executor():
+def test_get_responses_using_executor():
     class TestExecutor(object):
         called = False
         waited = False
@@ -550,14 +553,18 @@ def execute(self, fn, *args, **kwargs):
         schema, "get", {}, dict(query=query), executor=TestExecutor(),
     )
 
+    assert isinstance(results, list)
+    assert len(results) == 1
+    assert isinstance(results[0], ExecutionResult)
+
     assert as_dicts(results) == [{"data": {"test": "Hello World"}}]
     assert params == [RequestParams(query=query, variables=None, operation_name=None)]
     assert TestExecutor.called
     assert TestExecutor.waited
     assert not TestExecutor.cleaned
 
 
-def test_get_reponses_using_executor_return_promise():
+def test_get_responses_using_executor_return_promise():
     class TestExecutor(object):
         called = False
         waited = False
@@ -583,10 +590,61 @@ def execute(self, fn, *args, **kwargs):
         return_promise=True,
     )
 
+    assert isinstance(result_promises, list)
+    assert len(result_promises) == 1
+    assert isinstance(result_promises[0], Promise)
     results = Promise.all(result_promises).get()
 
     assert as_dicts(results) == [{"data": {"test": "Hello World"}}]
     assert params == [RequestParams(query=query, variables=None, operation_name=None)]
     assert TestExecutor.called
     assert not TestExecutor.waited
     assert TestExecutor.cleaned
+
+
+def test_syntax_error_using_executor_return_promise():
+    class TestExecutor(object):
+        called = False
+        waited = False
+        cleaned = False
+
+        def wait_until_finished(self):
+            TestExecutor.waited = True
+
+        def clean(self):
+            TestExecutor.cleaned = True
+
+        def execute(self, fn, *args, **kwargs):
+            TestExecutor.called = True
+            return fn(*args, **kwargs)
+
+    query = "this is a syntax error"
+    result_promises, params = run_http_query(
+        schema,
+        "get",
+        {},
+        dict(query=query),
+        executor=TestExecutor(),
+        return_promise=True,
+    )
+
+    assert isinstance(result_promises, list)
+    assert len(result_promises) == 1
+    assert isinstance(result_promises[0], Promise)
+    results = Promise.all(result_promises).get()
+
+    assert isinstance(results, list)
+    assert len(results) == 1
+    result = results[0]
+    assert isinstance(result, ExecutionResult)
+
+    assert result.data is None
+    assert isinstance(result.errors, list)
+    assert len(result.errors) == 1
+    error = result.errors[0]
+    assert isinstance(error, GraphQLSyntaxError)
+
+    assert params == [RequestParams(query=query, variables=None, operation_name=None)]
+    assert not TestExecutor.called
+    assert not TestExecutor.waited
+    assert not TestExecutor.cleaned