Spec compliant @skip/@include

Related GraphQL-js commits: graphql/graphql-js@d6da0bf graphql/graphql-js@47f87fa

Author: syrusakbary

graphql/execution/base.py

@@ -199,7 +199,8 @@ def should_include_node(ctx, directives):
                 skip_ast.arguments,
                 ctx.variable_values,
             )
-            return not args.get('if')
+            if args.get('if') is True:
+                return False
 
         include_ast = None
 
@@ -215,7 +216,8 @@ def should_include_node(ctx, directives):
                 ctx.variable_values,
             )
 
-            return bool(args.get('if'))
+            if args.get('if') is False:
+                return False
 
     return True
 

graphql/execution/tests/test_directives.py

@@ -295,3 +295,21 @@ def test_include_on_inline_anonymous_fragment_does_not_omit_field():
     result = execute_test_query(q)
     assert not result.errors
     assert result.data == {'a': 'a', 'b': 'b'}
+
+
+def test_works_directives_include_and_no_skip():
+    result = execute_test_query('{ a, b @include(if: true) @skip(if: false) }')
+    assert not result.errors
+    assert result.data == {'a': 'a', 'b': 'b'}
+
+
+def test_works_directives_include_and_skip():
+    result = execute_test_query('{ a, b @include(if: true) @skip(if: true) }')
+    assert not result.errors
+    assert result.data == {'a': 'a'}
+
+
+def test_works_directives_no_include_or_skip():
+    result = execute_test_query('{ a, b @include(if: false) @skip(if: false) }')
+    assert not result.errors
+    assert result.data == {'a': 'a'}