From f9c5b3b0ae95e1c70bee067a7d6455ddcc10b52f Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Mon, 29 Dec 2014 21:23:30 -0600 Subject: [PATCH 1/5] Updated quest test to only check on item drops if item drops exist (Basi list was causing it to fail) --- test/algos.mocha.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/algos.mocha.coffee b/test/algos.mocha.coffee index 52cb572b11..ec110b9986 100644 --- a/test/algos.mocha.coffee +++ b/test/algos.mocha.coffee @@ -320,7 +320,8 @@ describe 'User', -> expect(quest.value).to.be.greaterThan 0 if quest.canBuy expect(quest.drop.gp).to.not.be.lessThan 0 expect(quest.drop.exp).to.not.be.lessThan 0 - expect(quest.drop.items).to.be.an(Array) + if quest.drop.items + expect(quest.drop.items).to.be.an(Object) if quest.boss expect(quest.boss.name()).to.be.an('string') expect(quest.boss.hp).to.be.greaterThan 0 From a4d68431d462d0db9ba43661f0d1bbdf1568da40 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Mon, 29 Dec 2014 21:40:35 -0600 Subject: [PATCH 2/5] User must have 0 HP for revive function to work --- test/algos.mocha.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/algos.mocha.coffee b/test/algos.mocha.coffee index ec110b9986..b0ce249a81 100644 --- a/test/algos.mocha.coffee +++ b/test/algos.mocha.coffee @@ -185,7 +185,7 @@ describe 'User', -> user = undefined it 'revives correctly', -> user = newUser() - user.stats = { gp: 10, exp: 100, lvl: 2, hp: 1 } + user.stats = { gp: 10, exp: 100, lvl: 2, hp: 0 } user.ops.revive() expect(user).toHaveGP 0 expect(user).toHaveExp 0 From 5279a81033e5bcb7e0749938c2dd9b32037d12ec Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Mon, 29 Dec 2014 21:46:41 -0600 Subject: [PATCH 3/5] Again, user needs to have hp = 0 for revive function to work correctly --- test/algos.mocha.coffee | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/algos.mocha.coffee b/test/algos.mocha.coffee index b0ce249a81..9769816a53 100644 --- a/test/algos.mocha.coffee +++ b/test/algos.mocha.coffee @@ -202,10 +202,13 @@ describe 'User', -> user.items.gear.owned['shield_rogue_1'] = true user.items.gear.owned['head_special_nye'] = true expect(ce user.items.gear.owned).to.be 4 + user.stats.hp = 0 user.ops.revive() expect(ce(user.items.gear.owned)).to.be 3 + user.stats.hp = 0 user.ops.revive() expect(ce(user.items.gear.owned)).to.be 2 + user.stats.hp = 0 user.ops.revive() expect(ce(user.items.gear.owned)).to.be 2 expect(user.items.gear.owned).to.eql { weapon_warrior_0: false, shield_warrior_1: false, shield_rogue_1: true, head_special_nye: true } From 953302c008f59031348783661d24e9297d4b5708 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Mon, 29 Dec 2014 21:54:13 -0600 Subject: [PATCH 4/5] Corrected type --- test/algos.mocha.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/algos.mocha.coffee b/test/algos.mocha.coffee index 9769816a53..997f42f671 100644 --- a/test/algos.mocha.coffee +++ b/test/algos.mocha.coffee @@ -324,7 +324,7 @@ describe 'User', -> expect(quest.drop.gp).to.not.be.lessThan 0 expect(quest.drop.exp).to.not.be.lessThan 0 if quest.drop.items - expect(quest.drop.items).to.be.an(Object) + expect(quest.drop.items).to.be.an(Array) if quest.boss expect(quest.boss.name()).to.be.an('string') expect(quest.boss.hp).to.be.greaterThan 0 From 0e266f917ef20f245a514dc25090e7a7905512c6 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Tue, 30 Dec 2014 11:43:25 +0100 Subject: [PATCH 5/5] fix(tests) --- test/algos.mocha.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/algos.mocha.coffee b/test/algos.mocha.coffee index 997f42f671..7bd4864744 100644 --- a/test/algos.mocha.coffee +++ b/test/algos.mocha.coffee @@ -185,7 +185,7 @@ describe 'User', -> user = undefined it 'revives correctly', -> user = newUser() - user.stats = { gp: 10, exp: 100, lvl: 2, hp: 0 } + user.stats = { gp: 10, exp: 100, lvl: 2, hp: 0, class: 'warrior' } user.ops.revive() expect(user).toHaveGP 0 expect(user).toHaveExp 0