Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix issue with language being undefined, refactoring auth middleware, new tests

Browse Source
This commit is contained in:
Matteo Pagliazzi
2019-05-15 16:54:55 +02:00
parent 8cce38ede1
commit eff8db0afd
7 changed files with 143 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/api/unit/middlewares/auth.test.js
+26 -3
View File
@@ -16,7 +16,7 @@ describe('auth middleware', () => {
describe('auth with headers', () => {
it('allows to specify a list of user field that we do not want to load', (done) => {
const authWithHeaders = authWithHeadersFactory({
userFieldsToExclude: ['items', 'flags', 'auth.timestamps'],
userFieldsToExclude: ['items'],
});
req.headers['x-api-user'] = user._id;
@@ -27,11 +27,34 @@ describe('auth middleware', () => {
const userToJSON = res.locals.user.toJSON();
expect(userToJSON.items).to.not.exist;
expect(userToJSON.flags).to.not.exist;
expect(userToJSON.auth.timestamps).to.not.exist;
expect(userToJSON.auth).to.exist;
done();
});
});
it('makes sure some fields are always included', (done) => {
const authWithHeaders = authWithHeadersFactory({
userFieldsToExclude: [
'items', 'auth.timestamps',
'preferences', 'notifications', '_id', 'flags', 'auth', // these are always loaded
],
});
req.headers['x-api-user'] = user._id;
req.headers['x-api-key'] = user.apiToken;
authWithHeaders(req, res, (err) => {
if (err) return done(err);
const userToJSON = res.locals.user.toJSON();
expect(userToJSON.items).to.not.exist;
expect(userToJSON.auth.timestamps).to.exist;
expect(userToJSON.auth).to.exist;
expect(userToJSON.notifications).to.exist;
expect(userToJSON.preferences).to.exist;
expect(userToJSON._id).to.exist;
expect(userToJSON.flags).to.exist;
done();
});
test/api/unit/models/group.test.js
+71 -48
View File
@@ -769,7 +769,7 @@ describe('Group Model', () => {
});
describe('translateSystemMessages', () => {
it('translate quest_start', () => {
it('translate quest_start', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -777,12 +777,11 @@ describe('Group Model', () => {
quest: 'basilist',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate boss_damage', () => {
it('translate boss_damage', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -793,12 +792,11 @@ describe('Group Model', () => {
bossDamage: 3.7,
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate boss_dont_attack', () => {
it('translate boss_dont_attack', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -808,12 +806,11 @@ describe('Group Model', () => {
userDamage: 15.3,
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate boss_rage', () => {
it('translate boss_rage', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -821,12 +818,11 @@ describe('Group Model', () => {
quest: 'lostMasterclasser3',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate boss_defeated', () => {
it('translate boss_defeated', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -834,12 +830,11 @@ describe('Group Model', () => {
quest: 'lostMasterclasser3',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate user_found_items', () => {
it('translate user_found_items', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -853,24 +848,22 @@ describe('Group Model', () => {
},
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate all_items_found', () => {
it('translate all_items_found', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
type: 'all_items_found',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate spell_cast_party', () => {
it('translate spell_cast_party', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -880,12 +873,11 @@ describe('Group Model', () => {
spell: 'earth',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate spell_cast_user', () => {
it('translate spell_cast_user', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -896,12 +888,11 @@ describe('Group Model', () => {
target: participatingMember.profile.name,
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate quest_cancel', () => {
it('translate quest_cancel', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -910,12 +901,11 @@ describe('Group Model', () => {
quest: 'basilist',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate quest_abort', () => {
it('translate quest_abort', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -924,12 +914,11 @@ describe('Group Model', () => {
quest: 'basilist',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate tavern_quest_completed', () => {
it('translate tavern_quest_completed', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -937,12 +926,11 @@ describe('Group Model', () => {
quest: 'stressbeast',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate tavern_boss_rage_tired', () => {
it('translate tavern_boss_rage_tired', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -950,12 +938,11 @@ describe('Group Model', () => {
quest: 'stressbeast',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate tavern_boss_rage', () => {
it('translate tavern_boss_rage', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -964,12 +951,11 @@ describe('Group Model', () => {
scene: 'market',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate tavern_boss_desperation', () => {
it('translate tavern_boss_desperation', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -977,12 +963,11 @@ describe('Group Model', () => {
quest: 'stressbeast',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
it('translate claim_task', () => {
it('translate claim_task', async () => {
questLeader.preferences.language = 'en';
party.chat = [{
info: {
@@ -991,11 +976,49 @@ describe('Group Model', () => {
task: 'Feed the pet',
},
}];
let toJSON = party.toJSON();
Group.translateSystemMessages(toJSON, questLeader);
let toJSON = await Group.toJSONCleanChat(party, questLeader);
translationCheck(toJSON.chat[0].text);
});
});
describe('toJSONCleanChat', () => {
it('shows messages with 1 flag to non-admins', async () => {
party.chat = [{
flagCount: 1,
info: {
type: 'quest_start',
quest: 'basilist',
},
}];
let toJSON = await Group.toJSONCleanChat(party, questLeader);
expect(toJSON.chat.length).to.equal(1);
});
it('shows messages with >= 2 flag to admins', async () => {
party.chat = [{
flagCount: 3,
info: {
type: 'quest_start',
quest: 'basilist',
},
}];
const admin = new User({'contributor.admin': true});
let toJSON = await Group.toJSONCleanChat(party, admin);
expect(toJSON.chat.length).to.equal(1);
});
it('doesn\'t show flagged messages to non-admins', async () => {
party.chat = [{
flagCount: 3,
info: {
type: 'quest_start',
quest: 'basilist',
},
}];
let toJSON = await Group.toJSONCleanChat(party, questLeader);
expect(toJSON.chat.length).to.equal(0);
});
});
});
context('Instance Methods', () => {