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

fix linting and correctly save collect quests progress

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-04-13 20:03:26 +02:00
parent 471657c013
commit 2458f92e1b
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/api/v3/unit/libs/email.test.js
View File

@@ -61,7 +61,7 @@ describe('emails', () => {
sandbox.stub(logger, 'error'); sandbox.stub(logger, 'error');
let attachEmail = require(pathToEmailLib); let attachEmail = require(pathToEmailLib);
let promise = attachEmail.send(); attachEmail.send();
expect(sendMailSpy).to.be.calledOnce; expect(sendMailSpy).to.be.calledOnce;
deferred.reject(); deferred.reject();

6
test/api/v3/unit/models/group.test.js
View File

@@ -141,7 +141,7 @@ describe('Group Model', () => {
expect(participatingMember.party.quest.key).to.eql('whale'); expect(participatingMember.party.quest.key).to.eql('whale');
expect(participatingMember.party.quest.progress.down).to.eql(0); expect(participatingMember.party.quest.progress.down).to.eql(0);
expect(participatingMember.party.quest.collect).to.eql({}); expect(participatingMember.party.quest.progress.collect).to.eql({});
expect(participatingMember.party.quest.completed).to.eql(null); expect(participatingMember.party.quest.completed).to.eql(null);
}); });
@@ -250,7 +250,7 @@ describe('Group Model', () => {
$set: { $set: {
'party.quest.key': 'whale', 'party.quest.key': 'whale',
'party.quest.progress.down': 0, 'party.quest.progress.down': 0,
'party.quest.collect': {}, 'party.quest.progress.collect': {},
'party.quest.completed': null, 'party.quest.completed': null,
}, },
} }
@@ -279,7 +279,7 @@ describe('Group Model', () => {
expect(userQuest.key).to.eql('whale'); expect(userQuest.key).to.eql('whale');
expect(userQuest.progress.down).to.eql(0); expect(userQuest.progress.down).to.eql(0);
expect(userQuest.collect).to.eql({}); expect(userQuest.progress.collect).to.eql({});
expect(userQuest.completed).to.eql(null); expect(userQuest.completed).to.eql(null);
}); });

5
website/src/middlewares/api-v3/cron.js
View File

@@ -233,7 +233,10 @@ function cron (options = {}) {
// After all is said and done, progress up user's effect on quest, return those values & reset the user's // After all is said and done, progress up user's effect on quest, return those values & reset the user's
let progress = user.party.quest.progress; let progress = user.party.quest.progress;
let _progress = _.cloneDeep(progress); let _progress = _.cloneDeep(progress);
_.merge(progress, {down: 0, up: 0});
progress.down = 0;
progress.up = 0;
progress.collect = _.transform(progress.collect, (m, v, k) => m[k] = 0); progress.collect = _.transform(progress.collect, (m, v, k) => m[k] = 0);
// Clean PMs - keep 200 for subscribers and 50 for free users // Clean PMs - keep 200 for subscribers and 50 for free users

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

@@ -327,7 +327,7 @@ schema.methods.startQuest = async function startQuest (user) {
if (userIsParticipating) { if (userIsParticipating) {
user.party.quest.key = this.quest.key; user.party.quest.key = this.quest.key;
user.party.quest.progress.down = 0; user.party.quest.progress.down = 0;
user.party.quest.collect = collected; user.party.quest.progress.collect = collected;
user.party.quest.completed = null; user.party.quest.completed = null;
user.markModified('party.quest'); user.markModified('party.quest');
} }
@@ -351,7 +351,7 @@ schema.methods.startQuest = async function startQuest (user) {
$set: { $set: {
'party.quest.key': this.quest.key, 'party.quest.key': this.quest.key,
'party.quest.progress.down': 0, 'party.quest.progress.down': 0,
'party.quest.collect': collected, 'party.quest.progress.collect': collected,
'party.quest.completed': null, 'party.quest.completed': null,
}, },
}, { multi: true }).exec(); }, { multi: true }).exec();