From 7cc29810f3e08e0b40b9bafaeac600784d95e822 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 16 Sep 2015 16:01:13 -0400 Subject: [PATCH] fix(test): inject Content Also refactors to remove lodash where it's overkill. --- .../common/user.ops.hourglassPurchase.test.js | 1 - test/spec/controllers/inventoryCtrlSpec.js | 38 +++++++++---------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/test/common/user.ops.hourglassPurchase.test.js b/test/common/user.ops.hourglassPurchase.test.js index 3d57d63702..458029c6df 100644 --- a/test/common/user.ops.hourglassPurchase.test.js +++ b/test/common/user.ops.hourglassPurchase.test.js @@ -2,7 +2,6 @@ var sinon = require('sinon'); var chai = require("chai") chai.use(require("sinon-chai")) var expect = chai.expect -var _ = require('lodash'); require('coffee-script'); var shared = require('../../common/script/index.coffee'); diff --git a/test/spec/controllers/inventoryCtrlSpec.js b/test/spec/controllers/inventoryCtrlSpec.js index e4362db032..e7e3520ba5 100644 --- a/test/spec/controllers/inventoryCtrlSpec.js +++ b/test/spec/controllers/inventoryCtrlSpec.js @@ -1,7 +1,5 @@ 'use strict'; -var _ = require('lodash'); - describe('Inventory Controller', function() { var scope, ctrl, user, rootScope; @@ -230,17 +228,17 @@ describe('Inventory Controller', function() { expect(scope.hasAllTimeTravelerItems).to.eql(false); }); - it('returns true if no more items remain for purchase with Mystic Hourglasses', function() { + it('returns true if there are no items left to purchase', inject(function(Content) { sandbox.stub(Content, 'timeTravelerStore').returns({}); - _.forEach(Content.timeTravelStable.pets, function(v,k) { - user.items.pets[k] = 5; - }); - _.forEach(Content.timeTravelStable.mounts, function(v,k) { - user.items.mounts[k] = true; - }); + for (var pet in Content.timeTravelStable.pets) { + user.items.pets[pet] = 5; + } + for (var mount in Content.timeTravelStable.mounts) { + user.items.mounts[mount] = true; + } expect(scope.hasAllTimeTravelerItems).to.eql(true); - }); + })); }); describe('#hasAllTimeTravelerItemsOfType', function() { @@ -258,24 +256,24 @@ describe('Inventory Controller', function() { expect(scope.hasAllTimeTravelerItemsOfType('pets')).to.eql(false); }); - it('returns true for pets if user owns all pets in the Time Travel Stable', function() { - _.forEach(Content.timeTravelStable.pets, function(v,k) { - user.items.pets[k] = 5; - }); + it('returns true for pets if user owns all pets in the Time Travel Stable', inject(function(Content) { + for (var pet in Content.timeTravelStable.pets) { + user.items.pets[pet] = 5; + } expect(scope.hasAllTimeTravelerItemsOfType('pets')).to.eql(true); - }); + })); it('returns false for mounts if user does not own all mounts in the Time Travel Stable', function() { expect(scope.hasAllTimeTravelerItemsOfType('mounts')).to.eql(false); }); - it('returns true for mounts if user owns all mounts in the Time Travel Stable', function() { - _.forEach(Content.timeTravelStable.mounts, function(v,k) { - user.items.mounts[k] = true; - }); + it('returns true for mounts if user owns all mounts in the Time Travel Stable', inject(function(Content) { + for (var mount in Content.timeTravelStable.mounts) { + user.items.mounts[mount] = true; + } expect(scope.hasAllTimeTravelerItemsOfType('mounts')).to.eql(true); - }); + })); }); });