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

misc fixes and run gulp lint when testing

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-01-24 12:38:20 +01:00
parent ba60604899
commit 198d2e6ab5
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -93,7 +93,7 @@
"npm": "^3.3.10" "npm": "^3.3.10"
}, },
"scripts": { "scripts": {
"test": "gulp test:nodemon & (sleep 20; mocha test/api/v3 --recursive; killall gulp; killall node;)", "test": "gulp lint && (gulp test:nodemon & (sleep 20; mocha test/api/v3 --recursive; killall gulp; killall node;))",
"test:api-v2:unit": "mocha test/server_side", "test:api-v2:unit": "mocha test/server_side",
"test:api-v2:integration": "mocha test/api/v2 --recursive", "test:api-v2:integration": "mocha test/api/v2 --recursive",
"test:api-v3": "mocha test/api/v3 --recursive", "test:api-v3": "mocha test/api/v3 --recursive",

4
test/api/v3/integration/chat/POST-chat_seen.test.js
View File

@@ -24,8 +24,6 @@ describe('POST /groups/:id/chat/seen', () => {
}); });
it('clears new messages for a guild', async () => { it('clears new messages for a guild', async () => {
let user = await guildMember.get('/user');
await guildMember.post(`/groups/${guild._id}/chat/seen`); await guildMember.post(`/groups/${guild._id}/chat/seen`);
let guildThatHasSeenChat = await guildMember.get('/user'); let guildThatHasSeenChat = await guildMember.get('/user');
@@ -55,8 +53,6 @@ describe('POST /groups/:id/chat/seen', () => {
}); });
it('clears new messages for a party', async () => { it('clears new messages for a party', async () => {
let user = await partyMember.get('/user');
await partyMember.post(`/groups/${party._id}/chat/seen`); await partyMember.post(`/groups/${party._id}/chat/seen`);
let partyMemberThatHasSeenChat = await partyMember.get('/user'); let partyMemberThatHasSeenChat = await partyMember.get('/user');

17
website/src/controllers/api-v3/chat.js
View File

@@ -330,12 +330,10 @@ api.seenChat = {
let group = await Group.getGroup({user, groupId}); let group = await Group.getGroup({user, groupId});
if (!group) throw new NotFound(res.t('groupNotFound')); if (!group) throw new NotFound(res.t('groupNotFound'));
// Skip the auth step, we want this to be fast. If !found with uuid/token, then it just doesn't save let update = {$unset: {}};
let update = { $unset: {} }; update.$unset[`newMessages.${groupId}`] = true;
update.$unset[`newMessages.${groupId}`] = '';
await User.update({_id: user._id}, update).exec(); await User.update({_id: user._id}, update).exec();
res.respond(200); res.respond(200);
}, },
}; };
@@ -382,17 +380,16 @@ api.deleteChat = {
await Group.update( await Group.update(
{_id: group._id}, {_id: group._id},
{$pull: {chat: {id: chatId} } } {$pull: {chat: {id: chatId}}}
); );
if (chatUpdated) { if (chatUpdated) {
group = group.toJSON(); group = group.toJSON();
_.remove(group.chat, function removeChat (chat) { let i = _.findIndex(group.chat, {id: chatId});
return chat.id === chatId; if (i !== -1) group.chat.splice(i, 1);
}); res.respond(200, group.chat);
res.json(group.chat);
} else { } else {
res.send(200, {}); res.respond(200, {});
} }
}, },
}; };