From 25d52bccc55af1ed600a18668d88d95b6e20a2ab Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sat, 15 Aug 2015 00:08:41 -0500 Subject: [PATCH] Use new newUser specHelper syntax --- test/spec/controllers/challengesCtrlSpec.js | 4 ---- test/spec/controllers/hallCtrlSpec.js | 1 - test/spec/controllers/inventoryCtrlSpec.js | 18 +++++++++++------- test/spec/services/analyticsServicesSpec.js | 7 ++++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test/spec/controllers/challengesCtrlSpec.js b/test/spec/controllers/challengesCtrlSpec.js index 589aa87b59..283ce4b224 100644 --- a/test/spec/controllers/challengesCtrlSpec.js +++ b/test/spec/controllers/challengesCtrlSpec.js @@ -6,7 +6,6 @@ describe('Challenges Controller', function() { beforeEach(function() { module(function($provide) { user = specHelper.newUser(); - user._id = "unique-user-id"; User = { getBalanceInGems: sandbox.stub(), sync: sandbox.stub(), @@ -16,9 +15,6 @@ describe('Challenges Controller', function() { }); inject(function($rootScope, $controller, _$state_, _Groups_, _Members_, _Notification_){ - user = specHelper.newUser(); - user._id = "unique-user-id"; - scope = $rootScope.$new(); rootScope = $rootScope; diff --git a/test/spec/controllers/hallCtrlSpec.js b/test/spec/controllers/hallCtrlSpec.js index 5ad0e32c98..4cd60d2484 100644 --- a/test/spec/controllers/hallCtrlSpec.js +++ b/test/spec/controllers/hallCtrlSpec.js @@ -10,7 +10,6 @@ describe('Hall of Heroes Controller', function() { inject(function($rootScope, $controller){ user = specHelper.newUser(); - user._id = "unique-user-id" scope = $rootScope.$new(); diff --git a/test/spec/controllers/inventoryCtrlSpec.js b/test/spec/controllers/inventoryCtrlSpec.js index 339d9a8cd7..f9afeb0449 100644 --- a/test/spec/controllers/inventoryCtrlSpec.js +++ b/test/spec/controllers/inventoryCtrlSpec.js @@ -9,13 +9,17 @@ describe('Inventory Controller', function() { }); inject(function($rootScope, $controller, Shared){ - user = specHelper.newUser(); - user.balance = 4; - user.items.eggs = {Cactus: 1}; - user.items.hatchingPotions = {Base: 1}; - user.items.food = {Meat: 1}; - user.items.pets = {} - user.items.mounts = {}; + user = specHelper.newUser({ + balance: 4, + items: { + eggs: { Cactus: 1 }, + hatchingPotions: { Base: 1 }, + food: { Meat: 1 }, + pets: {}, + mounts: {} + } + }); + Shared.wrap(user); var mockWindow = { confirm: function(msg){ diff --git a/test/spec/services/analyticsServicesSpec.js b/test/spec/services/analyticsServicesSpec.js index f1767df1ac..92dd17e0e2 100644 --- a/test/spec/services/analyticsServicesSpec.js +++ b/test/spec/services/analyticsServicesSpec.js @@ -6,9 +6,10 @@ describe('Analytics Service', function () { beforeEach(function() { clock = sandbox.useFakeTimers(); sandbox.stub(window, 'refresher', function(){return true}); - user = specHelper.newUser(); - user.contributor = {}; - user.purchased = { plan: {} }; + user = specHelper.newUser({ + contributor: {}, + purchased: { plan: {} }, + }); user.flags.tour = { intro: null }; module(function($provide) {