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

fix(tests): correct for new content, fix lint

Browse Source
This commit is contained in:
Sabe Jones
2018-05-29 22:54:00 +00:00
parent fa142e929f
commit 97b99c0550
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/common/ops/buy/buy.js
View File

@@ -69,6 +69,13 @@ describe('shared.ops.buy', () => {
eyewear_special_redTopFrame: true, eyewear_special_redTopFrame: true,
eyewear_special_whiteTopFrame: true, eyewear_special_whiteTopFrame: true,
eyewear_special_yellowTopFrame: true, eyewear_special_yellowTopFrame: true,
headAccessory_special_blackHeadband: true,
headAccessory_special_blueHeadband: true,
headAccessory_special_greenHeadband: true,
headAccessory_special_pinkHeadband: true,
headAccessory_special_redHeadband: true,
headAccessory_special_whiteHeadband: true,
headAccessory_special_yellowHeadband: true,
}); });
}); });

7
test/common/ops/buy/buyMarketGear.js
View File

@@ -64,6 +64,13 @@ describe('shared.ops.buyMarketGear', () => {
eyewear_special_redTopFrame: true, eyewear_special_redTopFrame: true,
eyewear_special_whiteTopFrame: true, eyewear_special_whiteTopFrame: true,
eyewear_special_yellowTopFrame: true, eyewear_special_yellowTopFrame: true,
headAccessory_special_blackHeadband: true,
headAccessory_special_blueHeadband: true,
headAccessory_special_greenHeadband: true,
headAccessory_special_pinkHeadband: true,
headAccessory_special_redHeadband: true,
headAccessory_special_whiteHeadband: true,
headAccessory_special_yellowHeadband: true,
}); });
expect(analytics.track).to.be.calledOnce; expect(analytics.track).to.be.calledOnce;
}); });

2
website/server/models/user/schema.js
View File

@@ -252,7 +252,7 @@ let schema = new Schema({
gear: { gear: {
owned: _.transform(shared.content.gear.flat, (m, v) => { owned: _.transform(shared.content.gear.flat, (m, v) => {
m[v.key] = {type: Boolean}; m[v.key] = {type: Boolean};
if (v.key.match(/(armor|head|shield)_warrior_0/) || v.gearSet === 'glasses' || v.gearSet === 'headband' ) { if (v.key.match(/(armor|head|shield)_warrior_0/) || v.gearSet === 'glasses' || v.gearSet === 'headband') {
m[v.key].default = true; m[v.key].default = true;
} }
}), }),