test: refactor test due api changes

nodkz · nodkz · commit b4b43fb101cb · 2019-04-29T01:33:05.000+06:00
diff --git a/src/__tests__/composeWithMongoose-test.js b/src/__tests__/composeWithMongoose-test.js
@@ -138,9 +138,9 @@ describe('composeWithMongoose ->', () => {
           },
         }).getInputTypeComposer();
 
-        expect(itc.isRequired('name')).toBe(true);
-        expect(itc.isRequired('gender')).toBe(true);
-        expect(itc.isRequired('age')).toBe(false);
+        expect(itc.isFieldNonNull('name')).toBe(true);
+        expect(itc.isFieldNonNull('gender')).toBe(true);
+        expect(itc.isFieldNonNull('age')).toBe(false);
       });
     });
 
@@ -208,9 +208,8 @@ describe('composeWithMongoose ->', () => {
           },
         },
       });
-      const filterArgInFindOne: any = typeComposer.getResolver('findOne').getArg('filter');
-      const itc = schemaComposer.createInputTC(filterArgInFindOne.type);
-      expect(itc.isRequired('age')).toBe(true);
+      const filterArgInFindOne = typeComposer.getResolver('findOne').getArgITC('filter');
+      expect(filterArgInFindOne.isFieldNonNull('age')).toBe(true);
     });
 
     it('should use cached type to avoid maximum call stack size exceeded', () => {
diff --git a/src/__tests__/fieldConverter-test.js b/src/__tests__/fieldConverter-test.js
@@ -1,7 +1,7 @@
 /* @flow */
 /* eslint-disable no-unused-expressions, no-template-curly-in-string */
 
-import { EnumTypeComposer, schemaComposer } from 'graphql-compose';
+import { EnumTypeComposer, schemaComposer, ListComposer } from 'graphql-compose';
 import { UserModel } from '../__mocks__/userModel';
 import {
   deriveComplexType,
@@ -125,19 +125,20 @@ describe('fieldConverter', () => {
         instance: 'ObjectID',
       };
       expect(convertFieldToGraphQL(mongooseField, '', schemaComposer)).toBe('MongoID');
-      expect(schemaComposer.get('MongoID')).toBe(GraphQLMongoID);
+      expect(schemaComposer.get('MongoID').getType()).toBe(GraphQLMongoID);
     });
 
     it('should use existed GraphQLMongoID in schemaComposer', () => {
       schemaComposer.clear();
       expect(schemaComposer.has('MongoID')).toBeFalsy();
-      schemaComposer.set('MongoID', ('MockGraphQLType': any));
+      const customType = schemaComposer.createScalarTC('MyMongoId');
+      schemaComposer.set('MongoID', customType);
       const mongooseField = {
         path: 'strFieldName',
         instance: 'ObjectID',
       };
       expect(convertFieldToGraphQL(mongooseField, '', schemaComposer)).toBe('MongoID');
-      expect(schemaComposer.get('MongoID')).toBe('MockGraphQLType');
+      expect(schemaComposer.get('MongoID')).toBe(customType);
       schemaComposer.delete('MongoID');
     });
   });
@@ -199,11 +200,11 @@ describe('fieldConverter', () => {
     it('test object with field as array', () => {
       const someDeepTC = embeddedToGraphQL(fields.someDeep, '', schemaComposer);
       expect(someDeepTC.getTypeName()).toBe('SomeDeep');
-      const periodsType = (someDeepTC.getField('periods'): any).type;
-      expect(Array.isArray(periodsType)).toBeTruthy();
-      expect(periodsType[0].getTypeName()).toBe('SomeDeepPeriods');
-      expect(periodsType[0].hasField('from')).toBeTruthy();
-      expect(periodsType[0].hasField('to')).toBeTruthy();
+      expect(someDeepTC.getField('periods').type).toBeInstanceOf(ListComposer);
+      const tc = someDeepTC.getFieldOTC('periods');
+      expect(tc.getTypeName()).toBe('SomeDeepPeriods');
+      expect(tc.hasField('from')).toBeTruthy();
+      expect(tc.hasField('to')).toBeTruthy();
     });
   });
 
diff --git a/src/__tests__/github_issues/117-test.js b/src/__tests__/github_issues/117-test.js
@@ -29,7 +29,6 @@ describe('issue #117', () => {
       surname: {
         type: String,
         required: true,
-        default: [],
       },
       sex: {
         type: String,
diff --git a/src/__tests__/github_issues/120-test.js b/src/__tests__/github_issues/120-test.js
diff --git a/src/__tests__/github_issues/135-test.js b/src/__tests__/github_issues/135-test.js
@@ -65,7 +65,6 @@ describe('issue #135 - Mongoose virtuals', () => {
       schema,
       source: 'query { findMany { id title virtualField123 } }',
     });
-
     expect(res).toEqual({
       data: {
         findMany: [
diff --git a/src/__tests__/github_issues/136-test.js b/src/__tests__/github_issues/136-test.js
@@ -35,7 +35,7 @@ describe('issue #136 - Mongoose virtuals', () => {
   const CommentTC = composeWithMongoose(Comment);
 
   CommentTC.wrapResolverAs('createManyFiltered', 'createMany', updateManyFiltered => {
-    const recordsTC = CommentTC.getResolver('createMany').getArgTC('records');
+    const recordsTC = CommentTC.getResolver('createMany').getArgITC('records');
     const clonedRecordTC = recordsTC.clone('createManyFilteredInput');
     clonedRecordTC.removeField('links').addFields({ hi: 'String' });
     updateManyFiltered.extendArg('records', { type: clonedRecordTC.getTypePlural() });
diff --git a/src/__tests__/github_issues/157-test.js b/src/__tests__/github_issues/157-test.js
diff --git a/src/__tests__/github_issues/78-test.js b/src/__tests__/github_issues/78-test.js
diff --git a/src/__tests__/github_issues/92-test.js b/src/__tests__/github_issues/92-test.js
diff --git a/src/__tests__/github_issues/93-test.js b/src/__tests__/github_issues/93-test.js
diff --git a/src/resolvers/__tests__/connection-test.js b/src/resolvers/__tests__/connection-test.js
@@ -135,7 +135,8 @@ describe('connection() resolver', () => {
         relocation: false,
       });
 
-      await Promise.all([user1.save(), user2.save()]);
+      await user1.save();
+      await user2.save();
     });
 
     it('should return Resolver object', () => {
diff --git a/src/resolvers/__tests__/count-test.js b/src/resolvers/__tests__/count-test.js
@@ -37,7 +37,8 @@ describe('count() ->', () => {
       relocation: false,
     });
 
-    await Promise.all([user1.save(), user2.save()]);
+    await user1.save();
+    await user2.save();
   });
 
   it('should return Resolver object', () => {
diff --git a/src/resolvers/__tests__/findMany-test.js b/src/resolvers/__tests__/findMany-test.js
@@ -36,7 +36,8 @@ describe('findMany() ->', () => {
       relocation: false,
     });
 
-    await Promise.all([user1.save(), user2.save()]);
+    await user1.save();
+    await user2.save();
   });
 
   it('should return Resolver object', () => {
diff --git a/src/resolvers/__tests__/findOne-test.js b/src/resolvers/__tests__/findOne-test.js
@@ -33,7 +33,8 @@ beforeEach(async () => {
     relocation: false,
   });
 
-  await Promise.all([user1.save(), user2.save()]);
+  await user1.save();
+  await user2.save();
 });
 
 describe('findOne() ->', () => {
@@ -52,7 +53,7 @@ describe('findOne() ->', () => {
       const resolver = findOne(UserModel, UserTC, {
         filter: { onlyIndexed: true, operators: false },
       });
-      expect(resolver.getArgTC('filter').getFieldNames()).toEqual(
+      expect(resolver.getArgITC('filter').getFieldNames()).toEqual(
         expect.arrayContaining(['_id', 'name', 'employment'])
       );
     });
@@ -61,7 +62,7 @@ describe('findOne() ->', () => {
       const resolver = findOne(UserModel, UserTC, {
         filter: { requiredFields: 'name' },
       });
-      expect(resolver.getArgTC('filter').getFieldType('name')).toBeInstanceOf(GraphQLNonNull);
+      expect(resolver.getArgITC('filter').getFieldType('name')).toBeInstanceOf(GraphQLNonNull);
     });
 
     it('should have `skip` arg', () => {
diff --git a/src/resolvers/__tests__/pagination-test.js b/src/resolvers/__tests__/pagination-test.js
@@ -40,7 +40,8 @@ describe('pagination() ->', () => {
       relocation: false,
     });
 
-    await Promise.all([user1.save(), user2.save()]);
+    await user1.save();
+    await user2.save();
   });
 
   it('should return Resolver object', () => {
diff --git a/src/resolvers/__tests__/updateById-test.js b/src/resolvers/__tests__/updateById-test.js
@@ -44,7 +44,8 @@ describe('updateById() ->', () => {
       relocation: true,
     });
 
-    await Promise.all([user1.save(), user2.save()]);
+    await user1.save();
+    await user2.save();
   });
 
   it('should return Resolver object', () => {
diff --git a/src/resolvers/__tests__/updateMany-test.js b/src/resolvers/__tests__/updateMany-test.js
@@ -38,7 +38,8 @@ describe('updateMany() ->', () => {
       relocation: true,
     });
 
-    await Promise.all([user1.save(), user2.save()]);
+    await user1.save();
+    await user2.save();
   });
 
   it('should return Resolver object', () => {
diff --git a/src/resolvers/__tests__/updateOne-test.js b/src/resolvers/__tests__/updateOne-test.js
@@ -40,7 +40,8 @@ describe('updateOne() ->', () => {
       relocation: true,
     });
 
-    await Promise.all([user1.save(), user2.save()]);
+    await user1.save();
+    await user2.save();
   });
 
   it('should return Resolver object', () => {
diff --git a/src/resolvers/helpers/__tests__/filter-test.js b/src/resolvers/helpers/__tests__/filter-test.js
@@ -1,10 +1,14 @@
 /* @flow */
 
-import { schemaComposer, type ObjectTypeComposer } from 'graphql-compose';
-import { GraphQLInputObjectType, GraphQLNonNull, GraphQLList } from 'graphql-compose/lib/graphql';
+import {
+  schemaComposer,
+  ObjectTypeComposer,
+  InputTypeComposer,
+  NonNullComposer,
+  ListComposer,
+} from 'graphql-compose';
 import { filterHelperArgs, filterHelper } from '../filter';
 import { OPERATORS_FIELDNAME } from '../filterOperators';
-import GraphQLMongoID from '../../../types/mongoid';
 import { UserModel } from '../../../__mocks__/userModel';
 import { convertModelToGraphQL } from '../../../fieldsConverter';
 
@@ -41,33 +45,33 @@ describe('Resolver helper `filter` ->', () => {
       const args: any = filterHelperArgs(UserTC, UserModel, {
         filterTypeName: 'FilterUserType',
       });
-      expect(args.filter.type).toBeInstanceOf(GraphQLInputObjectType);
+      expect(args.filter.type).toBeInstanceOf(InputTypeComposer);
     });
 
     it('should return filter with field _ids', () => {
       const args: any = filterHelperArgs(UserTC, UserModel, {
         filterTypeName: 'FilterUserType',
       });
-      const itc = schemaComposer.createInputTC(args.filter.type);
-      const ft: any = itc.getFieldType('_ids');
-      expect(ft).toBeInstanceOf(GraphQLList);
-      expect(ft.ofType).toBe(GraphQLMongoID);
+      const itc = args.filter.type;
+      const ft = itc.getField('_ids').type;
+      expect(ft).toBeInstanceOf(ListComposer);
+      expect(ft.ofType.getTypeName()).toBe('MongoID');
     });
 
     it('should for opts.isRequired=true return GraphQLNonNull', () => {
       const args: any = filterHelperArgs(UserTC, UserModel, {
         filterTypeName: 'FilterUserType',
         isRequired: true,
       });
-      expect(args.filter.type).toBeInstanceOf(GraphQLNonNull);
+      expect(args.filter.type).toBeInstanceOf(NonNullComposer);
     });
 
     it('should remove fields via opts.removeFields', () => {
       const args: any = filterHelperArgs(UserTC, UserModel, {
         filterTypeName: 'FilterUserType',
         removeFields: ['name', 'age'],
       });
-      const itc = schemaComposer.createInputTC(args.filter.type);
+      const itc = args.filter.type;
       expect(itc.hasField('name')).toBe(false);
       expect(itc.hasField('age')).toBe(false);
       expect(itc.hasField('gender')).toBe(true);
@@ -78,10 +82,10 @@ describe('Resolver helper `filter` ->', () => {
         filterTypeName: 'FilterUserType',
         requiredFields: ['name', 'age'],
       });
-      const itc = schemaComposer.createInputTC(args.filter.type);
-      expect(itc.getFieldType('name')).toBeInstanceOf(GraphQLNonNull);
-      expect(itc.getFieldType('age')).toBeInstanceOf(GraphQLNonNull);
-      expect(itc.getFieldType('gender')).not.toBeInstanceOf(GraphQLNonNull);
+      const itc = args.filter.type;
+      expect(itc.getField('name').type).toBeInstanceOf(NonNullComposer);
+      expect(itc.getField('age').type).toBeInstanceOf(NonNullComposer);
+      expect(itc.getField('gender').type).not.toBeInstanceOf(NonNullComposer);
     });
 
     it('should leave only indexed fields if opts.onlyIndexed=true', () => {
@@ -90,7 +94,7 @@ describe('Resolver helper `filter` ->', () => {
         onlyIndexed: true,
         model: UserModel,
       });
-      const itc = schemaComposer.createInputTC(args.filter.type);
+      const itc = args.filter.type;
       expect(itc.hasField('_id')).toBe(true);
       expect(itc.hasField('name')).toBe(true);
       expect(itc.hasField('age')).toBe(false);
@@ -104,7 +108,7 @@ describe('Resolver helper `filter` ->', () => {
         model: UserModel,
         removeFields: ['name'],
       });
-      const itc = schemaComposer.createInputTC(args.filter.type);
+      const itc = args.filter.type;
       expect(itc.hasField('_id')).toBe(true);
       expect(itc.hasField('name')).toBe(false);
       expect(itc.hasField('age')).toBe(false);
diff --git a/src/resolvers/helpers/__tests__/record-test.js b/src/resolvers/helpers/__tests__/record-test.js
@@ -1,7 +1,11 @@
 /* @flow */
 
-import { schemaComposer, type ObjectTypeComposer } from 'graphql-compose';
-import { GraphQLInputObjectType, GraphQLNonNull } from 'graphql-compose/lib/graphql';
+import {
+  schemaComposer,
+  NonNullComposer,
+  InputTypeComposer,
+  type ObjectTypeComposer,
+} from 'graphql-compose';
 import { recordHelperArgs } from '../record';
 import { UserModel } from '../../../__mocks__/userModel';
 import { convertModelToGraphQL } from '../../../fieldsConverter';
@@ -23,7 +27,7 @@ describe('Resolver helper `record` ->', () => {
       const args: any = recordHelperArgs(UserTC, {
         recordTypeName: 'RecordUserType',
       });
-      expect(args.record.type).toBeInstanceOf(GraphQLInputObjectType);
+      expect(args.record.type).toBeInstanceOf(InputTypeComposer);
     });
 
     it('should reuse existed inputType', () => {
@@ -35,23 +39,23 @@ describe('Resolver helper `record` ->', () => {
       const args: any = recordHelperArgs(UserTC, {
         recordTypeName: 'RecordUserType',
       });
-      expect(args.record.type).toBe(existedType.getType());
+      expect(args.record.type).toBe(existedType);
     });
 
-    it('should for opts.isRequired=true return GraphQLNonNull', () => {
+    it('should for opts.isRequired=true return NonNullComposer', () => {
       const args: any = recordHelperArgs(UserTC, {
         recordTypeName: 'RecordUserType',
         isRequired: true,
       });
-      expect(args.record.type).toBeInstanceOf(GraphQLNonNull);
+      expect(args.record.type).toBeInstanceOf(NonNullComposer);
     });
 
     it('should remove fields via opts.removeFields', () => {
       const args: any = recordHelperArgs(UserTC, {
         recordTypeName: 'RecordUserType',
         removeFields: ['name', 'age'],
       });
-      const inputTypeComposer = schemaComposer.createInputTC(args.record.type);
+      const inputTypeComposer = args.record.type;
       expect(inputTypeComposer.hasField('name')).toBe(false);
       expect(inputTypeComposer.hasField('age')).toBe(false);
       expect(inputTypeComposer.hasField('gender')).toBe(true);
@@ -62,10 +66,10 @@ describe('Resolver helper `record` ->', () => {
         recordTypeName: 'RecordUserType',
         requiredFields: ['name', 'age'],
       });
-      const inputTypeComposer = schemaComposer.createInputTC(args.record.type);
-      expect(inputTypeComposer.getFieldType('name')).toBeInstanceOf(GraphQLNonNull);
-      expect(inputTypeComposer.getFieldType('age')).toBeInstanceOf(GraphQLNonNull);
-      expect(inputTypeComposer.getFieldType('gender')).not.toBeInstanceOf(GraphQLNonNull);
+      const inputTypeComposer = args.record.type;
+      expect(inputTypeComposer.getField('name').type).toBeInstanceOf(NonNullComposer);
+      expect(inputTypeComposer.getField('age').type).toBeInstanceOf(NonNullComposer);
+      expect(inputTypeComposer.getField('gender').type).not.toBeInstanceOf(NonNullComposer);
     });
   });
 });
