sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-04-14 19:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2018-05-29 22:54:31 +00:00
commit 3aca0343e8
3 changed files with 15 additions and 1 deletions
Show stats 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_whiteTopFrame: 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_whiteTopFrame: 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;
});

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

@ -252,7 +252,7 @@ let schema = new Schema({
gear: {
owned: _.transform(shared.content.gear.flat, (m, v) => {
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;
}
}),