ns may not exists in mongo db, so for any result complete with success before hook

Author: nodkz

src/resolvers/__tests__/findById-test.js

@@ -12,7 +12,9 @@ describe('findById() ->', () => {
   let user;
 
   before('clear UserModel collection', (done) => {
-    UserModel.collection.drop(done);
+    UserModel.collection.drop(() => {
+      done();
+    });
   });
 
   before('add test user document to mongoDB', (done) => {
@@ -26,7 +28,7 @@ describe('findById() ->', () => {
   });
 
   describe('Resolver.args', () => {
-    it('should have non-null `id` arg', () => {
+    it('should have non-null `_id` arg', () => {
       const resolver = findById(UserModel);
       expect(resolver.hasArg('_id')).to.be.true;
       const argConfig = resolver.getArg('_id');

src/resolvers/__tests__/findByIds-test.js

@@ -18,7 +18,9 @@ describe('findByIds() ->', () => {
   let user3;
 
   before('clear UserModel collection', (done) => {
-    UserModel.collection.drop(done);
+    UserModel.collection.drop(() => {
+      done();
+    });
   });
 
   before('add test users documents to mongoDB', (done) => {

src/resolvers/__tests__/findMany-test.js

@@ -16,7 +16,9 @@ describe('findMany() ->', () => {
   let user2;
 
   before('clear UserModel collection', (done) => {
-    UserModel.collection.drop(done);
+    UserModel.collection.drop(() => {
+      done();
+    });
   });
 
   before('add test user document to mongoDB', () => {

src/resolvers/__tests__/findOne-test.js

@@ -15,7 +15,9 @@ describe('findOne() ->', () => {
   let user2;
 
   before('clear UserModel collection', (done) => {
-    UserModel.collection.drop(done);
+    UserModel.collection.drop(() => {
+      done();
+    });
   });
 
   before('add test user document to mongoDB', () => {

src/resolvers/__tests__/removeById-test.js

@@ -15,7 +15,9 @@ describe('removeById() ->', () => {
   let user;
 
   before('clear UserModel collection', (done) => {
-    UserModel.collection.drop(done);
+    UserModel.collection.drop(() => {
+      done();
+    });
   });
 
   beforeEach('add test user document to mongoDB', () => {

src/resolvers/__tests__/updateById-test.js

@@ -21,7 +21,9 @@ describe('updateById() ->', () => {
   let user2;
 
   before('clear UserModel collection', (done) => {
-    UserModel.collection.drop(done);
+    UserModel.collection.drop(() => {
+      done();
+    });
   });
 
   before('add test user document to mongoDB', () => {

src/resolvers/__tests__/updateMany-test.js

@@ -15,7 +15,9 @@ describe('updateMany() ->', () => {
   let user2;
 
   before('clear UserModel collection', (done) => {
-    UserModel.collection.drop(done);
+    UserModel.collection.drop(() => {
+      done();
+    });
   });
 
   before('add test user document to mongoDB', () => {

src/resolvers/__tests__/updateOne-test.js

@@ -7,6 +7,7 @@ import Resolver from '../../../../graphql-compose/src/resolver/resolver';
 import TypeComposer from '../../../../graphql-compose/src/typeComposer';
 import { convertModelToGraphQL } from '../../fieldsConverter';
 import { GraphQLString } from 'graphql';
+import GraphQLMongoID from '../../types/mongoid';
 
 const UserType = convertModelToGraphQL(UserModel, 'User');
 
@@ -15,7 +16,9 @@ describe('updateOne() ->', () => {
   let user2;
 
   before('clear UserModel collection', (done) => {
-    UserModel.collection.drop(done);
+    UserModel.collection.drop(() => {
+      done();
+    });
   });
 
   before('add test user document to mongoDB', () => {
@@ -155,21 +158,19 @@ describe('updateOne() ->', () => {
   describe('Resolver.getOutputType()', () => {
     it('should have correct output type name', () => {
       const outputType = updateOne(UserModel, UserType).getOutputType();
-      expect(outputType.name).to.equal(`UpdateOne${UserType.name}Payload`);
+      expect(outputType).property('name').to.equal(`UpdateOne${UserType.name}Payload`);
     });
 
     it('should have recordId field', () => {
       const outputType = updateOne(UserModel, UserType).getOutputType();
-      const typeComposer = new TypeComposer(outputType);
-      expect(typeComposer.hasField('recordId')).to.be.true;
-      expect(typeComposer.getField('recordId').type).to.equal(GraphQLString);
+      const recordIdField = new TypeComposer(outputType).getField('recordId');
+      expect(recordIdField).property('type').to.equal(GraphQLMongoID);
     });
 
     it('should have record field', () => {
       const outputType = updateOne(UserModel, UserType).getOutputType();
-      const typeComposer = new TypeComposer(outputType);
-      expect(typeComposer.hasField('record')).to.be.true;
-      expect(typeComposer.getField('record').type).to.equal(UserType);
+      const recordField = new TypeComposer(outputType).getField('record');
+      expect(recordField).property('type').to.equal(UserType);
     });
   });
 });

src/types/mongoid.js

@@ -4,10 +4,10 @@ import { Kind } from 'graphql/language';
 const GraphQLMongoID = new GraphQLScalarType({
   name: 'MongoID',
   description:
-    'The `ID` scalar type represents a unique MongoDB identifier in collection.' +
+    'The `ID` scalar type represents a unique MongoDB identifier in collection. ' +
     'MongoDB by default use 12-byte ObjectId value ' +
-    '(https://docs.mongodb.com/manual/reference/bson-types/#objectid).' +
-    'But also it accepts string or integer as correct values for _id field.',
+    '(https://docs.mongodb.com/manual/reference/bson-types/#objectid). ' +
+    'But MongoDB also may accepts string or integer as correct values for _id field.',
   serialize: String,
   parseValue: String,
   parseLiteral(ast) {