feat: add support for mongoose@5.0.0

Author: nodkz

src/__mocks__/mongooseCommon.js

@@ -14,7 +14,8 @@ mongoose.connect = async () => {
 
   const mongoUri = await mongoServer.getConnectionString(true);
 
-  originalConnect.bind(mongoose)(mongoUri, { useMongoClient: true });
+  // originalConnect.bind(mongoose)(mongoUri, { useMongoClient: true }); // mongoose 4
+  originalConnect.bind(mongoose)(mongoUri); // mongoose 5
 
   mongoose.connection.on('error', e => {
     if (e.message.code === 'ETIMEDOUT') {

src/__tests__/__snapshots__/integration-test.js.snap

@@ -1,26 +1,26 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`projection from all fields 1`] = `
+exports[`integration tests projection should request all fields to rawData field: projection from all fields 1`] = `
 Array [
+  "users",
+  "skills",
+  "employment",
+  "contacts",
+  "languages",
   "_id",
-  "updatedAt",
-  "createdAt",
   "name",
   "age",
   "gender",
   "relocation",
+  "createdAt",
+  "updatedAt",
   "__v",
-  "languages",
-  "contacts",
-  "employment",
-  "skills",
-  "users",
   "nameVirtual",
   "id",
 ]
 `;
 
-exports[`projection from query fields 1`] = `
+exports[`integration tests projection should request only fields from query: projection from query fields 1`] = `
 Object {
   "data": Object {
     "user": Object {

src/__tests__/fieldConverter-test.js

@@ -1,7 +1,13 @@
 /* @flow */
 /* eslint-disable no-unused-expressions, no-template-curly-in-string */
 
-import { GraphQLDate, GraphQLBuffer, GraphQLGeneric, GraphQLJSON } from 'graphql-compose';
+import {
+  GraphQLDate,
+  GraphQLBuffer,
+  GraphQLGeneric,
+  GraphQLJSON,
+  EnumTypeComposer,
+} from 'graphql-compose';
 import {
   GraphQLString,
   GraphQLFloat,
@@ -172,8 +178,9 @@ describe('fieldConverter', () => {
 
     it('should pass all enum values to GQ type', () => {
       const genderEnum: any = enumToGraphQL(fields.gender);
-      expect(genderEnum._values.length).toBe(fields.gender.enumValues.length);
-      expect(genderEnum._values[0].value).toBe(fields.gender.enumValues[0]);
+      const etc = EnumTypeComposer.create(genderEnum);
+      expect(etc.getFieldNames().length).toBe(fields.gender.enumValues.length);
+      expect(etc.getField('male').value).toBe(fields.gender.enumValues[0]);
     });
   });
 

src/__tests__/github-issues-test.js

@@ -9,7 +9,9 @@ import { composeWithMongoose } from '../index';
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000;
 
 let mongoServer;
-const opts = { useMongoClient: true };
+
+// const opts = { useMongoClient: true }; // Mongoose 4
+const opts = {}; // Mongoose 5
 
 beforeAll(async () => {
   mongoServer = new MongodbMemoryServer();

src/resolvers/helpers/__tests__/sort-test.js

@@ -1,5 +1,6 @@
 /* @flow */
 
+import { EnumTypeComposer } from 'graphql-compose';
 import { GraphQLEnumType } from 'graphql-compose/lib/graphql';
 import { sortHelperArgs, sortHelper, getSortTypeFromModel } from '../sort';
 import { UserModel } from '../../../__mocks__/userModel';
@@ -32,7 +33,8 @@ describe('Resolver helper `sort` ->', () => {
 
       // only indexed fields in enum
       const ascDescNum = indexedFields.length * 2;
-      expect(type._values).toHaveLength(ascDescNum);
+      const etc = EnumTypeComposer.create(type);
+      expect(etc.getFieldNames()).toHaveLength(ascDescNum);
 
       // should have ASC DESC keys
       const enumNames = type._values.map(enumConfig => enumConfig.name);

src/resolvers/removeMany.js

@@ -74,13 +74,19 @@ export default function removeMany(
           ? Promise.resolve(resolveParams.beforeQuery(resolveParams.query, resolveParams))
           : resolveParams.query.exec()
         ).then(res => {
-          if (res.result && res.result.ok) {
+          if (res.ok) {
+            // mongoose 5
+            return {
+              numAffected: res.n,
+            };
+          } else if (res.result && res.result.ok) {
+            // mongoose 4
             return {
               numAffected: res.result.n,
             };
           }
 
-          return Promise.reject(res);
+          return Promise.reject(new Error(JSON.stringify(res)));
         })
       );
     },