switch from Q to Bluebird

test/helpers/api-integration/v2/object-generators.js

@@ -2,7 +2,7 @@ import {
   times,
   map,
 } from 'lodash';
-import Q from 'q';
+import Bluebird from 'bluebird';
 import { v4 as generateUUID } from 'uuid';
 import { ApiUser, ApiGroup, ApiChallenge } from '../api-classes';
 import { requester } from '../requester';
@@ -57,7 +57,7 @@ export async function generateGroup (leader, details = {}, update = {}) {
     guild: { guilds: [group._id] },
   };
 
-  await Q.all(
+  await Bluebird.all(
     map(members, (member) => {
       return member.update(groupMembershipTypes[group.type]);
     })
@@ -96,7 +96,7 @@ export async function createAndPopulateGroup (settings = {}) {
     guild: { guilds: [group._id] },
   };
 
-  let members = await Q.all(
+  let members = await Bluebird.all(
     times(numberOfMembers, () => {
       return generateUser(groupMembershipTypes[group.type]);
     })
@@ -104,7 +104,7 @@ export async function createAndPopulateGroup (settings = {}) {
 
   await group.update({ memberCount: numberOfMembers + 1});
 
-  let invitees = await Q.all(
+  let invitees = await Bluebird.all(
     times(numberOfInvites, () => {
       return generateUser();
     })
@@ -116,7 +116,7 @@ export async function createAndPopulateGroup (settings = {}) {
     });
   });
 
-  await Q.all(invitationPromises);
+  await Bluebird.all(invitationPromises);
 
   return {
     groupLeader,

test/helpers/api-integration/v3/object-generators.js

@@ -1,7 +1,7 @@
 import {
   times,
 } from 'lodash';
-import Q from 'q';
+import Bluebird from 'bluebird';
 import { v4 as generateUUID } from 'uuid';
 import { ApiUser, ApiGroup, ApiChallenge } from '../api-classes';
 import { requester } from '../requester';
@@ -106,7 +106,7 @@ export async function createAndPopulateGroup (settings = {}) {
     guild: { guilds: [group._id] },
   };
 
-  let members = await Q.all(
+  let members = await Bluebird.all(
     times(numberOfMembers, () => {
       return generateUser(groupMembershipTypes[group.type]);
     })
@@ -114,7 +114,7 @@ export async function createAndPopulateGroup (settings = {}) {
 
   await group.update({ memberCount: numberOfMembers + 1});
 
-  let invitees = await Q.all(
+  let invitees = await Bluebird.all(
     times(numberOfInvites, () => {
       return generateUser();
     })
@@ -126,7 +126,7 @@ export async function createAndPopulateGroup (settings = {}) {
     });
   });
 
-  await Q.all(invitationPromises);
+  await Bluebird.all(invitationPromises);
 
   return {
     groupLeader,

test/helpers/globals.helper.js

@@ -1,10 +1,12 @@
 /* eslint-disable no-undef */
 /* eslint-disable global-require */
 /* eslint-disable no-process-env */
+
+import Bluebird from 'bluebird';
+
 //------------------------------
 // Global modules
 //------------------------------
-
 global._ = require('lodash');
 global.chai = require('chai');
 chai.use(require('sinon-chai'));
@@ -12,10 +14,10 @@ chai.use(require('chai-as-promised'));
 global.expect = chai.expect;
 global.sinon = require('sinon');
 global.sandbox = sinon.sandbox.create();
+global.Promise = Bluebird;
 
 import nconf from 'nconf';
 import mongoose from 'mongoose';
-import Q from 'q';
 
 //------------------------------
 // Load nconf for unit tests
@@ -23,7 +25,7 @@ import Q from 'q';
 if (process.env.LOAD_SERVER === '0') { // when the server is in a different process we simply connect to mongoose
   require('../../website/src/libs/api-v3/setupNconf')('./config.json');
   // Use Q promises instead of mpromise in mongoose
-  mongoose.Promise = Q.Promise;
+  mongoose.Promise = Bluebird;
   mongoose.connect(nconf.get('NODE_DB_URI'));
 } else { // When running tests and the server in the same process
   require('../../website/src/libs/api-v3/setupNconf')('./config.json.example');