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

fix tests failures (#8422)

Browse Source 
* fix tests failures

* make sure _meta is not public

* fix typo

* fix typo
This commit is contained in:
Matteo Pagliazzi
2017-01-18 20:17:56 +01:00
committed by GitHub
parent 4bf4c3a6c2
commit 68f4275c44
8 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/api/v3/integration/quests/POST-groups_groupId_quests_accept.test.js
View File

@@ -158,6 +158,10 @@ describe('POST /groups/:groupId/quests/accept', () => {
await questingGroup.sync();
expect(questingGroup.chat[0].text).to.exist;
expect(questingGroup.chat[0]._meta).to.exist;
expect(questingGroup.chat[0]._meta).to.have.all.keys(['participatingMembers']);
let returnedGroup = await leader.get(`/groups/${questingGroup._id}`);
expect(returnedGroup.chat[0]._meta).to.be.undefined;
});
});
});

4
test/api/v3/integration/quests/POST-groups_groupId_quests_force-start.test.js
View File

@@ -243,6 +243,10 @@ describe('POST /groups/:groupId/quests/force-start', () => {
expect(questingGroup.chat[0].text).to.exist;
expect(questingGroup.chat[0]._meta).to.exist;
expect(questingGroup.chat[0]._meta).to.have.all.keys(['participatingMembers']);
let returnedGroup = await leader.get(`/groups/${questingGroup._id}`);
expect(returnedGroup.chat[0]._meta).to.be.undefined;
});
});
});

4
test/api/v3/integration/quests/POST-groups_groupId_quests_invite.test.js
View File

@@ -203,6 +203,10 @@ describe('POST /groups/:groupId/quests/invite/:questKey', () => {
expect(group.chat[0].text).to.exist;
expect(group.chat[0]._meta).to.exist;
expect(group.chat[0]._meta).to.have.all.keys(['participatingMembers']);
let returnedGroup = await groupLeader.get(`/groups/${group._id}`);
expect(returnedGroup.chat[0]._meta).to.be.undefined;
});
});
});

6
test/api/v3/integration/quests/POST-groups_groupid_quests_abort.test.js
View File

@@ -86,11 +86,12 @@ describe('POST /groups/:groupId/quests/abort', () => {
});
it('aborts a quest', async () => {
sandbox.stub(Group.prototype, 'sendChat');
await leader.post(`/groups/${questingGroup._id}/quests/invite/${PET_QUEST}`);
await partyMembers[0].post(`/groups/${questingGroup._id}/quests/accept`);
await partyMembers[1].post(`/groups/${questingGroup._id}/quests/accept`);
let stub = sandbox.stub(Group.prototype, 'sendChat');
let res = await leader.post(`/groups/${questingGroup._id}/quests/abort`);
await Promise.all([
leader.sync(),
@@ -127,6 +128,7 @@ describe('POST /groups/:groupId/quests/abort', () => {
});
expect(Group.prototype.sendChat).to.be.calledOnce;
expect(Group.prototype.sendChat).to.be.calledWithMatch(/aborted the party quest Wail of the Whale.`/);
Group.prototype.sendChat.restore();
stub.restore();
});
});

4
test/api/v3/integration/quests/POST-groups_groupid_quests_reject.test.js
View File

@@ -189,6 +189,10 @@ describe('POST /groups/:groupId/quests/reject', () => {
expect(questingGroup.chat[0].text).to.exist;
expect(questingGroup.chat[0]._meta).to.exist;
expect(questingGroup.chat[0]._meta).to.have.all.keys(['participatingMembers']);
let returnedGroup = await leader.get(`/groups/${questingGroup._id}`);
expect(returnedGroup.chat[0]._meta).to.be.undefined;
});
});
});

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

@@ -170,15 +170,19 @@ describe('Group Model', () => {
});
context('Boss Quests', () => {
let sendChatStub;
beforeEach(async () => {
party.quest.key = 'whale';
await party.startQuest(questLeader);
await party.save();
sandbox.stub(Group.prototype, 'sendChat');
sendChatStub = sandbox.stub(Group.prototype, 'sendChat');
});
afterEach(() => sendChatStub.restore());
it('applies user\'s progress to quest boss hp', async () => {
await Group.processQuestProgress(participatingMember, progress);
@@ -322,15 +326,19 @@ describe('Group Model', () => {
});
context('Collection Quests', () => {
let sendChatStub;
beforeEach(async () => {
party.quest.key = 'atom1';
await party.startQuest(questLeader);
await party.save();
sandbox.stub(Group.prototype, 'sendChat');
sendChatStub = sandbox.stub(Group.prototype, 'sendChat');
});
afterEach(() => sendChatStub.restore());
it('applies user\'s progress to found quest items', async () => {
await Group.processQuestProgress(participatingMember, progress);

2
website/client/components/inventory/index.vue
View File

@@ -2,7 +2,7 @@
.row
.sixteen.wide.column
.ui.secondary.menu
router-link.item(:to="{name: 'inventory'}")
router-link.item(:to="{name: 'inventory'}", exact)
span(v-once) {{ $t('inventory') }}
router-link.item(:to="{name: 'equipment'}")
span(v-once) {{ $t('equipment') }}

5
website/server/models/group.js
View File

@@ -268,12 +268,14 @@ schema.statics.getGroups = async function getGroups (options = {}) {
// When converting to json remove chat messages with more than 1 flag and remove all flags info
// unless the user is an admin
// Not putting into toJSON because there we can't access user
// It also removes the _meta field that can be stored inside a chat message
schema.statics.toJSONCleanChat = function groupToJSONCleanChat (group, user) {
let toJSON = group.toJSON();
if (!user.contributor.admin) {
_.remove(toJSON.chat, chatMsg => {
chatMsg.flags = {};
if (chatMsg._meta) chatMsg._meta = undefined;
return chatMsg.flagCount >= 2;
});
}
@@ -391,6 +393,9 @@ export function chatDefaults (msg, user) {
schema.methods.sendChat = function sendChat (message, user, metaData) {
let newMessage = chatDefaults(message, user);
// Optional data stored in the chat message but not returned
// to the users that can be stored for debugging purposes
if (metaData) {
newMessage._meta = metaData;
}