From 665988e846008d1edaf7f36a8b2b349b2de000a0 Mon Sep 17 00:00:00 2001 From: Saihajpreet Singh Date: Wed, 14 Apr 2021 10:03:54 -0500 Subject: [PATCH 1/4] simplify predicate-test --- src/type/__tests__/predicate-test.js | 30 ++++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/type/__tests__/predicate-test.js b/src/type/__tests__/predicate-test.js index 73400f6294..2558c9f485 100644 --- a/src/type/__tests__/predicate-test.js +++ b/src/type/__tests__/predicate-test.js @@ -1,7 +1,11 @@ import { expect } from 'chai'; import { describe, it } from 'mocha'; -import type { GraphQLArgument, GraphQLInputField } from '../definition'; +import type { + GraphQLArgument, + GraphQLInputField, + GraphQLInputType, +} from '../definition'; import { GraphQLDirective, GraphQLSkipDirective, @@ -503,7 +507,7 @@ describe('Type predicates', () => { describe('getNullableType', () => { it('returns undefined for no type', () => { - expect(getNullableType()).to.equal(undefined); + expect(getNullableType(undefined)).to.equal(undefined); expect(getNullableType(null)).to.equal(undefined); }); @@ -536,7 +540,7 @@ describe('Type predicates', () => { describe('getNamedType', () => { it('returns undefined for no type', () => { - expect(getNamedType()).to.equal(undefined); + expect(getNamedType(undefined)).to.equal(undefined); expect(getNamedType(null)).to.equal(undefined); }); @@ -559,15 +563,18 @@ describe('Type predicates', () => { }); describe('isRequiredArgument', () => { - function buildArg(config: $Shape): GraphQLArgument { + function buildArg(config: { + type: GraphQLInputType, + defaultValue: mixed, + }): GraphQLArgument { return { name: 'someArg', + type: config.type, description: undefined, - defaultValue: undefined, + defaultValue: config.defaultValue, deprecationReason: null, extensions: undefined, astNode: undefined, - ...config, }; } @@ -604,17 +611,18 @@ describe('Type predicates', () => { }); describe('isRequiredInputField', () => { - function buildInputField( - config: $Shape, - ): GraphQLInputField { + function buildInputField(config: { + type: GraphQLInputType, + defaultValue: mixed, + }): GraphQLInputField { return { name: 'someInputField', + type: config.type, description: undefined, - defaultValue: undefined, + defaultValue: config.defaultValue, deprecationReason: null, extensions: undefined, astNode: undefined, - ...config, }; } From f70c5c942b08627f30f551847044d91da432e52c Mon Sep 17 00:00:00 2001 From: Saihajpreet Singh Date: Wed, 14 Apr 2021 11:01:38 -0500 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: Ivan Goncharov --- src/type/__tests__/predicate-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/type/__tests__/predicate-test.js b/src/type/__tests__/predicate-test.js index 2558c9f485..9c011a240c 100644 --- a/src/type/__tests__/predicate-test.js +++ b/src/type/__tests__/predicate-test.js @@ -565,7 +565,7 @@ describe('Type predicates', () => { describe('isRequiredArgument', () => { function buildArg(config: { type: GraphQLInputType, - defaultValue: mixed, + defaultValue?: mixed, }): GraphQLArgument { return { name: 'someArg', @@ -613,7 +613,7 @@ describe('Type predicates', () => { describe('isRequiredInputField', () => { function buildInputField(config: { type: GraphQLInputType, - defaultValue: mixed, + defaultValue?: mixed, }): GraphQLInputField { return { name: 'someInputField', From 6ae22351bab5fb4046c11439ec1ed665556e0ecb Mon Sep 17 00:00:00 2001 From: Saihajpreet Singh Date: Wed, 14 Apr 2021 11:52:11 -0500 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: Ivan Goncharov --- src/type/__tests__/predicate-test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/type/__tests__/predicate-test.js b/src/type/__tests__/predicate-test.js index 9c011a240c..b146225dd7 100644 --- a/src/type/__tests__/predicate-test.js +++ b/src/type/__tests__/predicate-test.js @@ -566,7 +566,7 @@ describe('Type predicates', () => { function buildArg(config: { type: GraphQLInputType, defaultValue?: mixed, - }): GraphQLArgument { + |}): GraphQLArgument { return { name: 'someArg', type: config.type, @@ -611,10 +611,10 @@ describe('Type predicates', () => { }); describe('isRequiredInputField', () => { - function buildInputField(config: { + function buildInputField(config: {| type: GraphQLInputType, defaultValue?: mixed, - }): GraphQLInputField { + |}): GraphQLInputField { return { name: 'someInputField', type: config.type, From e1272e3a87a135a55fa0133421408a73e515f06e Mon Sep 17 00:00:00 2001 From: Saihajpreet Singh Date: Wed, 14 Apr 2021 11:52:19 -0500 Subject: [PATCH 4/4] Update src/type/__tests__/predicate-test.js Co-authored-by: Ivan Goncharov --- src/type/__tests__/predicate-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/type/__tests__/predicate-test.js b/src/type/__tests__/predicate-test.js index b146225dd7..f94bed1030 100644 --- a/src/type/__tests__/predicate-test.js +++ b/src/type/__tests__/predicate-test.js @@ -563,7 +563,7 @@ describe('Type predicates', () => { }); describe('isRequiredArgument', () => { - function buildArg(config: { + function buildArg(config: {| type: GraphQLInputType, defaultValue?: mixed, |}): GraphQLArgument {