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

Reverted changes related to multiple messages and changed handleTwoHanded to send single, clearer, messages.

Browse Source
This commit is contained in:
Oliver Eyton-Williams
2015-12-02 13:13:45 +01:00
parent da35eb6067
commit dcd7cae312
4 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/common/user.ops.equip.test.js
View File

@@ -78,10 +78,8 @@ describe('user.ops.equip', () => {
// equipping two-hander
user.ops.equip({params: {key: 'weapon_wizard_1'}}, spy);
let weapon = content.gear.flat.weapon_wizard_1;
let message = [i18n.t('messageTwoHandled', {gearText: weapon.text(null)})];
let item = content.gear.flat.shield_warrior_1;
message.push(i18n.t('messageUnEquipped', {itemText: item.text(null)}));
let message = i18n.t('messageTwoHandedEquip', {twoHandedText: weapon.text(null), offHandedText: item.text(null)});
assert.calledOnce(spy);
assert.calledWith(spy, {code: 200, message});
@@ -90,13 +88,12 @@ describe('user.ops.equip', () => {
it('should send messages if equipping an off-hand item causes a two-handed weapon to be unequipped', () => {
// equipping two-hander
user.ops.equip({params: {key: 'weapon_wizard_1'}});
let item = content.gear.flat.weapon_wizard_1;
let weapon = content.gear.flat.weapon_wizard_1;
let shield = content.gear.flat.shield_warrior_1;
user.ops.equip({params: {key: 'shield_warrior_1'}}, spy);
let message = [i18n.t('messageTwoHandled', {gearText: item.text(null)})];
message.push(i18n.t('messageUnEquipped', {itemText: item.text(null)}));
let message = i18n.t('messageTwoHandedUnequip', {twoHandedText: weapon.text(null), offHandedText: shield.text(null)});
assert.calledOnce(spy);
assert.calledWith(spy, {code: 200, message});