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

Add translated gear name to open-mystery-item call (#11306)

Browse Source 
* Add translated gear name to open-mystery-item call

* Fix test

* fix mystery item text language
This commit is contained in:
Phillip Thelen
2019-08-16 19:40:49 +02:00
committed by Matteo Pagliazzi
parent c8466eec98
commit 6784d23a7c
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/api/v3/integration/user/POST-user_open_mystery_item.test.js
View File

@@ -9,6 +9,7 @@ describe('POST /user/open-mystery-item', () => {
let mysteryItemKey = 'eyewear_special_summerRogue'; let mysteryItemKey = 'eyewear_special_summerRogue';
let mysteryItemIndex = content.gear.flat[mysteryItemKey].index; let mysteryItemIndex = content.gear.flat[mysteryItemKey].index;
let mysteryItemType = content.gear.flat[mysteryItemKey].type; let mysteryItemType = content.gear.flat[mysteryItemKey].type;
let mysteryItemText = content.gear.flat[mysteryItemKey].text();
beforeEach(async () => { beforeEach(async () => {
user = await generateUser({ user = await generateUser({
@@ -32,5 +33,6 @@ describe('POST /user/open-mystery-item', () => {
expect(response.data.key).to.eql(mysteryItemKey); expect(response.data.key).to.eql(mysteryItemKey);
expect(response.data.index).to.eql(mysteryItemIndex); expect(response.data.index).to.eql(mysteryItemIndex);
expect(response.data.type).to.eql(mysteryItemType); expect(response.data.type).to.eql(mysteryItemType);
expect(response.data.text).to.eql(mysteryItemText);
}); });
}); });

4
test/common/ops/openMysteryItem.js
View File

@@ -36,7 +36,9 @@ describe('shared.ops.openMysteryItem', () => {
expect(user.items.gear.owned[mysteryItemKey]).to.be.true; expect(user.items.gear.owned[mysteryItemKey]).to.be.true;
expect(message).to.equal(i18n.t('mysteryItemOpened')); expect(message).to.equal(i18n.t('mysteryItemOpened'));
expect(data).to.eql(content.gear.flat[mysteryItemKey]); let item = _.cloneDeep(content.gear.flat[mysteryItemKey]);
item.text = content.gear.flat[mysteryItemKey].text();
expect(data).to.eql(item);
expect(user.notifications.length).to.equal(0); expect(user.notifications.length).to.equal(0);
}); });
}); });

1
website/common/script/ops/openMysteryItem.js
View File

@@ -24,6 +24,7 @@ module.exports = function openMysteryItem (user, req = {}, analytics) {
if (mysteryItems.length === 0) markNotificationAsRead(user); if (mysteryItems.length === 0) markNotificationAsRead(user);
item = cloneDeep(content.gear.flat[item]); item = cloneDeep(content.gear.flat[item]);
item.text = content.gear.flat[item.key].text(user.preferences.language);
user.items.gear.owned[item.key] = true; user.items.gear.owned[item.key] = true;
if (user.markModified) { if (user.markModified) {