Fix bug where @include directive is ignored if @Skip is present.

Commit:
d6da0bff7f877e6a4fb66119796809f9c207f841 [d6da0bf]
Parents:
136630f8fd
Author:
Dylan Thacker-Smith <[email protected]>
Date:
5 April 2016 at 12:56:27 PM SGT
Committer:
Lee Byron <[email protected]>
Labels:
HEAD

directives_test.go

@@ -515,3 +515,66 @@ func TestDirectivesWorksOnFragmentUnlessTrueOmitsFragment(t *testing.T) {
 		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
 	}
 }
+
+func TestDirectivesWorksWithSkipAndIncludeDirectives_IncludeAndNoSkip(t *testing.T) {
+	query := `{ a, b @include(if: true) @skip(if: false) }`
+	expected := &graphql.Result{
+		Data: map[string]interface{}{
+			"a": "a",
+			"b": "b",
+		},
+	}
+	result := executeDirectivesTestQuery(t, query)
+	if len(result.Errors) != 0 {
+		t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
+	}
+	if !reflect.DeepEqual(expected, result) {
+		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
+	}
+}
+
+func TestDirectivesWorksWithSkipAndIncludeDirectives_IncludeAndSkip(t *testing.T) {
+	query := `{ a, b @include(if: true) @skip(if: true) }`
+	expected := &graphql.Result{
+		Data: map[string]interface{}{
+			"a": "a",
+		},
+	}
+	result := executeDirectivesTestQuery(t, query)
+	if len(result.Errors) != 0 {
+		t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
+	}
+	if !reflect.DeepEqual(expected, result) {
+		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
+	}
+}
+func TestDirectivesWorksWithSkipAndIncludeDirectives_NoIncludeAndSkip(t *testing.T) {
+	query := `{ a, b @include(if: false) @skip(if: true) }`
+	expected := &graphql.Result{
+		Data: map[string]interface{}{
+			"a": "a",
+		},
+	}
+	result := executeDirectivesTestQuery(t, query)
+	if len(result.Errors) != 0 {
+		t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
+	}
+	if !reflect.DeepEqual(expected, result) {
+		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
+	}
+}
+func TestDirectivesWorksWithSkipAndIncludeDirectives_NoIncludeOrSkip(t *testing.T) {
+	query := `{ a, b @include(if: false) @skip(if: false) }`
+	expected := &graphql.Result{
+		Data: map[string]interface{}{
+			"a": "a",
+		},
+	}
+	result := executeDirectivesTestQuery(t, query)
+	if len(result.Errors) != 0 {
+		t.Fatalf("wrong result, unexpected errors: %v", result.Errors)
+	}
+	if !reflect.DeepEqual(expected, result) {
+		t.Fatalf("Unexpected result, Diff: %v", testutil.Diff(expected, result))
+	}
+}

executor.go

@@ -371,12 +371,11 @@ func shouldIncludeNode(eCtx *ExecutionContext, directives []*ast.Directive) bool
 		if err != nil {
 			return defaultReturnValue
 		}
-		if skipIf, ok := argValues["if"]; ok {
-			if boolSkipIf, ok := skipIf.(bool); ok {
-				return !boolSkipIf
+		if skipIf, ok := argValues["if"].(bool); ok {
+			if skipIf {
+				return false
 			}
 		}
-		return defaultReturnValue
 	}
 	for _, directive := range directives {
 		if directive == nil || directive.Name == nil {