graphql-java
diff --git a/‎src/test/groovy/graphql/execution/ConditionalNodesTest.groovy‎
Lines changed: 30 additions & 1 deletion b/‎src/test/groovy/graphql/execution/ConditionalNodesTest.groovy‎
Lines changed: 30 additions & 1 deletion
@@ -111,10 +111,18 @@ class ConditionalNodesTest extends Specification {
             type Query {
                 in : String
                 out : String
+                pet : Pet
+            }
+            
+            type Pet {
+                name: String
+                favouriteSnack: String
             }
         """
         DataFetcher df = { DataFetchingEnvironment env -> env.getFieldDefinition().name }
-        def graphQL = TestUtil.graphQL(sdl, [Query: ["in": df, "out": df]]).build()
+        def graphQL = TestUtil.graphQL(sdl, [
+                Query: ["in": df, "out": df, "pet": (DataFetcher<Map>) { [ : ] } ],
+                Pet: ["name": df, "favouriteSnack": df]]).build()
         ConditionalNodeDecision customDecision = new ConditionalNodeDecision() {
             @Override
             boolean shouldInclude(ConditionalNodeDecisionEnvironment env) {
@@ -183,6 +191,27 @@ class ConditionalNodesTest extends Specification {
 
         then:
         er["data"] == ["in": "in", "out": "out"]
+
+        // TODO: this test demonstrates that the GraphQLContext is missing for Pet
+        // and therefore, fields are being incorrectly included
+        when:
+        ei = ExecutionInput.newExecutionInput()
+                .graphQLContext(contextMap)
+                .query("""
+            query q {
+                in
+                pet {
+                  name
+                  favouriteSnack @featureFlag(flagName : "OFF")
+                } 
+            }
+        """
+                ).build()
+        er = graphQL.execute(ei)
+
+        then:
+        // TODO: favouriteSnack should not appear in the data
+        er["data"] == ["in": "in", "pet": ["name": "name"]]
     }
 
     private ArrayList<Directive> directive(String name, Argument argument) {