add NullValue field validation

Author: jaemk

graphql/utils/is_valid_literal_value.py

@@ -9,8 +9,8 @@
 def is_valid_literal_value(type, value_ast):
     if isinstance(type, GraphQLNonNull):
         of_type = type.of_type
-        if not value_ast:
-            return [u'Expected "{}", found null.'.format(type)]
+        if not value_ast or isinstance(value_ast, ast.NullValue):
+            return [u'Expected type "{}", found null.'.format(type)]
 
         return is_valid_literal_value(of_type, value_ast)
 
@@ -60,6 +60,9 @@ def get_field_ast_value(field_name):
 
     assert isinstance(type, (GraphQLScalarType, GraphQLEnumType)), 'Must be input type'
 
+    if isinstance(value_ast, ast.NullValue):
+        return _empty_list
+
     parse_result = type.parse_literal(value_ast)
     if parse_result is None:
         return [u'Expected type "{}", found {}.'.format(type.name, print_ast(value_ast))]

graphql/validation/tests/test_arguments_of_correct_type.py

@@ -89,6 +89,15 @@ def test_good_enum_value(self):
         }
         ''')
 
+    def test_null_nullable_int_value(self):
+        expect_passes_rule(ArgumentsOfCorrectType, '''
+        {
+            complicatedArgs {
+                intArgField(intArg: null)
+            }
+        }
+        ''')
+
 
 # noinspection PyMethodMayBeStatic
 class TestInvalidStringValues(object):
@@ -196,6 +205,17 @@ def test_float_into_int(self):
             bad_value('intArg', 'Int', '3.333', 4, 37)
         ])
 
+    def test_null_into_non_null_int(self):
+        expect_fails_rule(ArgumentsOfCorrectType, '''
+        {
+            complicatedArgs {
+                nonNullIntArgField(nonNullIntArg: null)
+            }
+        }
+        ''', [
+            bad_value('nonNullIntArg', 'Int!', 'null', 4, 51)
+        ])
+
 
 # noinspection PyMethodMayBeStatic
 class TestInvalidFloatValues(object):
@@ -642,7 +662,7 @@ def test_partial_object_missing_required(self):
         }
         ''', [
             bad_value('complexArg', 'ComplexInput', '{intField: 4}', 4, 45, [
-                'In field "requiredField": Expected "Boolean!", found null.'
+                'In field "requiredField": Expected type "Boolean!", found null.'
             ])
         ])
 

graphql/validation/tests/test_default_values_of_correct_type.py

@@ -87,7 +87,7 @@ def test_variables_missing_required_field():
     }
     ''', [
         bad_value('a', 'ComplexInput', '{intField: 3}', 2, 51, [
-            'In field "requiredField": Expected "Boolean!", found null.'
+            'In field "requiredField": Expected type "Boolean!", found null.'
         ])
     ])
 

graphql/validation/tests/utils.py

@@ -229,11 +229,16 @@ def expect_invalid(schema, rules, query, expected_errors, sort_list=True):
             for loc in error['locations']
         ]
 
+    errors = list(map(format_error, errors))
     if sort_list:
-        assert sort_lists(list(map(format_error, errors))) == sort_lists(expected_errors)
+        expected_errors = sort_lists(expected_errors)
+        errors = sort_lists(errors)
+        msg = 'expected errors: %s, got errors: %s' % (expected_errors, errors)
+        assert errors == expected_errors, msg
 
     else:
-        assert list(map(format_error, errors)) == expected_errors
+        msg = 'expected errors: %s, got errors: %s' % (expected_errors, errors)
+        assert errors == expected_errors, msg
 
 
 def expect_passes_rule(rule, query):