From efdd85fe2e54f20e3feb818f85e8707f2a276df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Jureti=C4=87?= Date: Sat, 18 Jan 2014 20:38:47 -0300 Subject: [PATCH] Using newUser helper in tests --- test/spec/filtersCtrlSpec.js | 2 +- test/spec/inventoryCtrlSpec.js | 8 +++----- test/spec/specHelper.js | 3 ++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/spec/filtersCtrlSpec.js b/test/spec/filtersCtrlSpec.js index d31855abc2..ae96ec565c 100644 --- a/test/spec/filtersCtrlSpec.js +++ b/test/spec/filtersCtrlSpec.js @@ -5,7 +5,7 @@ describe('Filters Controller', function() { beforeEach(module('habitrpg')); beforeEach(inject(function($rootScope, $controller, Shared) { - user = {filters: {}}; + user = specHelper.newUser(); Shared.wrap(user); scope = $rootScope.$new(); $controller('FiltersCtrl', {$scope: scope, User: {user: user}}); diff --git a/test/spec/inventoryCtrlSpec.js b/test/spec/inventoryCtrlSpec.js index b4f2df12f6..3b13b3a94f 100644 --- a/test/spec/inventoryCtrlSpec.js +++ b/test/spec/inventoryCtrlSpec.js @@ -5,11 +5,9 @@ describe('Inventory Controller', function() { beforeEach(module('habitrpg')); beforeEach(inject(function($rootScope, $controller, Shared){ - user = { - balance: 4, - stats: {gp: 0}, - items: {eggs: {Cactus: 1}, hatchingPotions: {Base: 1}, food: {Meat: 1}, pets: {}}, - }; + user = specHelper.newUser(); + user.balance = 4, + user.items = {eggs: {Cactus: 1}, hatchingPotions: {Base: 1}, food: {Meat: 1}, pets: {}}; Shared.wrap(user); var mockWindow = { confirm: function(msg){ diff --git a/test/spec/specHelper.js b/test/spec/specHelper.js index 6e6ca07129..eb3d9bbe59 100644 --- a/test/spec/specHelper.js +++ b/test/spec/specHelper.js @@ -3,7 +3,7 @@ specHelper = { var buffs = {per:0, int:0, con:0, str:0, stealth: 0, streaks: false}; user = { auth:{timestamps: {}}, - stats: {str:1, con:1, per:1, int:1, mp: 32, class: 'warrior', buffs: buffs}, + stats: {str:1, con:1, per:1, int:1, mp: 32, class: 'warrior', buffs: buffs, gp: 0}, items:{ lastDrop:{count: 0}, hatchingPotions: {}, @@ -22,6 +22,7 @@ specHelper = { todos: [], rewards: [], flags: {}, + filters: {}, achievements: {}, }; return user;