krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes tests

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-12-17 16:27:17 +01:00
parent bbc47f5e00
commit 18c49493e0
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/api-legacy/api-helper.js
View File

@@ -6,6 +6,8 @@ superagentDefaults = require("superagent-defaults");
global.request = superagentDefaults(); global.request = superagentDefaults();
global.mongoose = require("mongoose"); global.mongoose = require("mongoose");
var Q = require('q');
mongoose.Promise = Q.Promise;
global.moment = require("moment"); global.moment = require("moment");

2
test/helpers/common.helper.js
View File

@@ -1,4 +1,6 @@
import mongoose from 'mongoose'; import mongoose from 'mongoose';
import Q from 'q';
mongoose.Promise = Q.Promise;
import { wrap as wrapUser } from '../../common/script/index'; import { wrap as wrapUser } from '../../common/script/index';
import { model as User } from '../../website/src/models/user'; import { model as User } from '../../website/src/models/user';

4
website/src/models/group.js
View File

@@ -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 // we use process.nextTick because at this point the model is not yet avalaible
process.nextTick(() => { process.nextTick(() => {
mongoose.model('Group') model // eslint-disable-line no-use-before-define
.findOne(tavernQ).exec() .findOne(tavernQ).exec()
.then(tavern => { .then(tavern => {
if (!tavern) return; // No tavern quest if (!tavern) return; // No tavern quest
@@ -485,7 +485,7 @@ schema.methods.leave = function leaveGroup (user, keep = 'keep-all') {
} }
update.$inc = {memberCount: -1}; 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(() => { ]).then(() => {
firebase.removeUserFromGroup(group._id, user._id); firebase.removeUserFromGroup(group._id, user._id);