Fixed Variable Default Value Handling. (ChilliCream#4357)

rvanheest · Oct 29, 2021 · ad2b4c5 · ad2b4c5
1 parent 81ed1e3
commit ad2b4c5
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 8 deletions.
diff --git a/src/HotChocolate/Core/src/Execution/Processing/VariableCoercionHelper.cs b/src/HotChocolate/Core/src/Execution/Processing/VariableCoercionHelper.cs
@@ -56,7 +56,8 @@ public void CoerceVariableValues(
 
                 if (!hasValue && variableDefinition.DefaultValue is { } defaultValue)
                 {
-                    value = defaultValue.Kind == SyntaxKind.NullValue ? null : defaultValue;
+                    value = defaultValue.Kind is SyntaxKind.NullValue ? null : defaultValue;
+                    hasValue = true;
                 }
 
                 if (!hasValue || value is null || value is NullValueNode)

diff --git a/...ocolate/Core/test/Execution.Tests/Integration/StarWarsCodeFirst/StarWarsCodeFirstTests.cs b/...ocolate/Core/test/Execution.Tests/Integration/StarWarsCodeFirst/StarWarsCodeFirstTests.cs
@@ -566,7 +566,7 @@ await executor.ExecuteAsync(@"
                 await foreach (IQueryResult queryResult in
                     subscriptionResult.ReadResultsAsync().WithCancellation(cts.Token))
                 {
-                    var item = (IReadOnlyQueryResult) queryResult;
+                    var item = (IReadOnlyQueryResult)queryResult;
                     eventResult = item;
                     break;
                 }
@@ -610,7 +610,7 @@ await executor.ExecuteAsync(@"
                 await foreach (IQueryResult queryResult in
                     subscriptionResult.ReadResultsAsync().WithCancellation(cts.Token))
                 {
-                    var item = (IReadOnlyQueryResult) queryResult;
+                    var item = (IReadOnlyQueryResult)queryResult;
                     eventResult = item;
                     break;
                 }
@@ -656,7 +656,7 @@ await executor.ExecuteAsync(@"
                 await foreach (IQueryResult queryResult in
                     subscriptionResult.ReadResultsAsync().WithCancellation(cts.Token))
                 {
-                    var item = (IReadOnlyQueryResult) queryResult;
+                    var item = (IReadOnlyQueryResult)queryResult;
                     eventResult = item;
                     break;
                 }
@@ -700,7 +700,7 @@ await executor.ExecuteAsync(@"
                 await foreach (IQueryResult queryResult in
                     subscriptionResult.ReadResultsAsync().WithCancellation(cts.Token))
                 {
-                    var item = (IReadOnlyQueryResult) queryResult;
+                    var item = (IReadOnlyQueryResult)queryResult;
                     eventResult = item;
                     break;
                 }
@@ -827,7 +827,7 @@ name @skip(if: $if)
                         height
                     }
                 }",
-                request: r=> r.SetVariableValue("if", ifValue))
+                request: r => r.SetVariableValue("if", ifValue))
                 .MatchSnapshotAsync();
         }
 
@@ -847,6 +847,36 @@ await ExpectValid(@"
                 .MatchSnapshotAsync();
         }
 
+        [Fact]
+        public async Task SkipAll_Default_False()
+        {
+            Snapshot.FullName();
+
+            await ExpectValid(@"
+                query ($if: Boolean! = false) {
+                    human(id: ""1000"") @skip(if: $if) {
+                        name
+                        height
+                    }
+                }")
+                .MatchSnapshotAsync();
+        }
+
+        [Fact]
+        public async Task SkipAll_Default_True()
+        {
+            Snapshot.FullName();
+
+            await ExpectValid(@"
+                query ($if: Boolean! = true) {
+                    human(id: ""1000"") @skip(if: $if) {
+                        name
+                        height
+                    }
+                }")
+                .MatchSnapshotAsync();
+        }
+
         [Fact]
         public async Task SkipAllSecondLevelFields()
         {
@@ -858,7 +888,7 @@ await ExpectValid(@"
                         name @skip(if: $if)
                     }
                 }",
-                request: r=> r.SetVariableValue("if", true))
+                request: r => r.SetVariableValue("if", true))
                 .MatchSnapshotAsync();
         }
 

diff --git a/...gration/StarWarsCodeFirst/__snapshots__/StarWarsCodeFirstTests.SkipAll_Default_False.snap b/...gration/StarWarsCodeFirst/__snapshots__/StarWarsCodeFirstTests.SkipAll_Default_False.snap
@@ -0,0 +1,8 @@
+{
+  "data": {
+    "human": {
+      "name": "Luke Skywalker",
+      "height": 1.72
+    }
+  }
+}
diff --git a/...egration/StarWarsCodeFirst/__snapshots__/StarWarsCodeFirstTests.SkipAll_Default_True.snap b/...egration/StarWarsCodeFirst/__snapshots__/StarWarsCodeFirstTests.SkipAll_Default_True.snap
@@ -0,0 +1,3 @@
+{
+  "data": {}
+}
diff --git a/src/HotChocolate/Core/test/Execution.Tests/Processing/VariableCoercionHelperTests.cs b/src/HotChocolate/Core/test/Execution.Tests/Processing/VariableCoercionHelperTests.cs
@@ -137,9 +137,44 @@ public void Coerce_Nullable_String_Variable_With_Default_Where_Value_Is_Not_Prov
             helper.CoerceVariableValues(schema, variableDefinitions, variableValues, coercedValues);
 
             // assert
-            Assert.Empty(coercedValues);
+            Assert.Collection(coercedValues,
+                t =>
+                {
+                    Assert.Equal("abc", t.Key);
+                    Assert.Equal("String", Assert.IsType<StringType>(t.Value.Type).Name);
+                    Assert.Equal("def", t.Value.Value);
+                    Assert.Equal("def", Assert.IsType<StringValueNode>(t.Value.ValueLiteral).Value);
+                });
         }
 
+         [Fact]
+                public void Coerce_Nullable_String_Variable_Where_Value_Is_Not_Provided()
+                {
+                    // arrange
+                    ISchema schema = SchemaBuilder.New().AddStarWarsTypes().Create();
+
+                    var variableDefinitions = new List<VariableDefinitionNode>
+                    {
+                        new VariableDefinitionNode(
+                            null,
+                            new VariableNode("abc"),
+                            new NamedTypeNode("String"),
+                            null,
+                            Array.Empty<DirectiveNode>())
+                    };
+
+                    var variableValues = new Dictionary<string, object>();
+                    var coercedValues = new Dictionary<string, VariableValueOrLiteral>();
+
+                    var helper = new VariableCoercionHelper(new(), new(new DefaultTypeConverter()));
+
+                    // act
+                    helper.CoerceVariableValues(schema, variableDefinitions, variableValues, coercedValues);
+
+                    // assert
+                    Assert.Empty(coercedValues);
+                }
+
         [Fact]
         public void Coerce_Nullable_String_Variable_With_Default_Where_Value_Is_Provided()
         {