mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-18 07:07:35 +01:00
fixes tests
This commit is contained in:
@@ -6,6 +6,8 @@ superagentDefaults = require("superagent-defaults");
|
||||
global.request = superagentDefaults();
|
||||
|
||||
global.mongoose = require("mongoose");
|
||||
var Q = require('q');
|
||||
mongoose.Promise = Q.Promise;
|
||||
|
||||
global.moment = require("moment");
|
||||
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import mongoose from 'mongoose';
|
||||
import Q from 'q';
|
||||
mongoose.Promise = Q.Promise;
|
||||
|
||||
import { wrap as wrapUser } from '../../common/script/index';
|
||||
import { model as User } from '../../website/src/models/user';
|
||||
|
||||
@@ -305,7 +305,7 @@ let tavernQ = {_id: 'habitrpg', 'quest.key': {$ne: null}};
|
||||
|
||||
// we use process.nextTick because at this point the model is not yet avalaible
|
||||
process.nextTick(() => {
|
||||
mongoose.model('Group')
|
||||
model // eslint-disable-line no-use-before-define
|
||||
.findOne(tavernQ).exec()
|
||||
.then(tavern => {
|
||||
if (!tavern) return; // No tavern quest
|
||||
@@ -485,7 +485,7 @@ schema.methods.leave = function leaveGroup (user, keep = 'keep-all') {
|
||||
}
|
||||
|
||||
update.$inc = {memberCount: -1};
|
||||
return mongoose.model('Group').update({_id: group._id}, update);
|
||||
return model.update({_id: group._id}, update); // eslint-disable-line no-use-before-define
|
||||
})(),
|
||||
]).then(() => {
|
||||
firebase.removeUserFromGroup(group._id, user._id);
|
||||
|
||||
Reference in New Issue
Block a user