Fixes variable values of non-null type with default value (#2192)

Fixes #2190 Port of #2191 from `14.x.x` branch
graphql · Sep 20, 2019 · 98e5233 · 98e5233
1 parent 3d86489
commit 98e5233
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/execution/__tests__/variables-test.js b/src/execution/__tests__/variables-test.js
@@ -577,6 +577,20 @@ describe('Execute: Handles inputs', () => {
   });
 
   describe('Handles non-nullable scalars', () => {
+    it('allows non-nullable variable to be omitted given a default', () => {
+      const result = executeQuery(`
+        query ($value: String! = "default") {
+          fieldWithNullableStringInput(input: $value)
+        }
+      `);
+
+      expect(result).to.deep.equal({
+        data: {
+          fieldWithNullableStringInput: '"default"',
+        },
+      });
+    });
+
     it('allows non-nullable inputs to be omitted given a default', () => {
       const result = executeQuery(`
         query ($value: String = "default") {

diff --git a/src/execution/values.js b/src/execution/values.js
@@ -96,9 +96,7 @@ function coerceVariableValues(
     if (!hasOwnProperty(inputs, varName)) {
       if (varDefNode.defaultValue) {
         coercedValues[varName] = valueFromAST(varDefNode.defaultValue, varType);
-      }
-
-      if (isNonNullType(varType)) {
+      } else if (isNonNullType(varType)) {
         const varTypeStr = inspect(varType);
         onError(
           new GraphQLError(