From bfd56b35e170669e97b3df6ce4712648296f5194 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Thu, 23 Jul 2015 08:42:27 -0500 Subject: [PATCH] Revert armoire counting code back to old system @TODO: work out why it's hpapening and unpend test for new system --- common/script/count.js | 2 +- test/common/count.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/script/count.js b/common/script/count.js index 8832d6379f..21d9bd93f5 100644 --- a/common/script/count.js +++ b/common/script/count.js @@ -41,7 +41,7 @@ function mountMasterProgress(mounts) { function remainingGearInSet(userGear, set) { var gear = _.filter(content.gear.flat, function(item) { var setMatches = item.klass === set; - var hasItem = _.has(userGear, item.key); + var hasItem = userGear[item.key]; return setMatches && !hasItem; }); diff --git a/test/common/count.js b/test/common/count.js index d02c3b665c..71038177fe 100644 --- a/test/common/count.js +++ b/test/common/count.js @@ -100,7 +100,7 @@ describe('count', function() { expect(armoireCount).to.eql(20); }); - it('includes previously owned items in count', function() { + it.skip('includes previously owned items in count (https://github.com/HabitRPG/habitrpg/issues/5624#issuecomment-124018717)', function() { var gear = { 'weapon_warrior_0':false, 'weapon_warrior_1':false,