Test refactoring: user.user -> user

This commit is contained in:
Dušan Juretić
2014-01-04 17:35:45 -03:00
parent a74e99a78f
commit 4777a693ba

View File

@@ -6,13 +6,11 @@ describe('Inventory Controller', function() {
beforeEach(module('habitrpg')); beforeEach(module('habitrpg'));
beforeEach(inject(function($rootScope, $controller){ beforeEach(inject(function($rootScope, $controller){
user = { user = {
user: { balance: 4,
balance: 4, stats: {gp: 0},
stats: {gp: 0}, items: {eggs: {Cactus: 1}, hatchingPotions: {Base: 1}, food: {Meat: 1}, pets: {}},
items: {eggs: {Cactus: 1}, hatchingPotions: {Base: 1}, food: {Meat: 1}, pets: {}},
}
}; };
window.habitrpgShared.wrap(user.user); window.habitrpgShared.wrap(user);
var mockWindow = { var mockWindow = {
confirm: function(msg){ confirm: function(msg){
return true; return true;
@@ -20,7 +18,7 @@ describe('Inventory Controller', function() {
}; };
scope = $rootScope.$new(); scope = $rootScope.$new();
$rootScope.Content = window.habitrpgShared.content; $rootScope.Content = window.habitrpgShared.content;
ctrl = $controller('InventoryCtrl', {$scope: scope, User: user, $window: mockWindow}); ctrl = $controller('InventoryCtrl', {$scope: scope, User: {user: user}, $window: mockWindow});
})); }));
it('starts without any item selected', function(){ it('starts without any item selected', function(){
@@ -42,9 +40,9 @@ describe('Inventory Controller', function() {
it('hatches a pet', function(){ it('hatches a pet', function(){
scope.chooseEgg('Cactus'); scope.chooseEgg('Cactus');
scope.choosePotion('Base'); scope.choosePotion('Base');
expect(user.user.items.eggs).to.eql({Cactus: 0}); expect(user.items.eggs).to.eql({Cactus: 0});
expect(user.user.items.hatchingPotions).to.eql({Base: 0}); expect(user.items.hatchingPotions).to.eql({Base: 0});
expect(user.user.items.pets).to.eql({'Cactus-Base': 5}); expect(user.items.pets).to.eql({'Cactus-Base': 5});
expect(scope.selectedEgg).to.eql(null); expect(scope.selectedEgg).to.eql(null);
expect(scope.selectedPotion).to.eql(null); expect(scope.selectedPotion).to.eql(null);
}); });
@@ -52,33 +50,33 @@ describe('Inventory Controller', function() {
it('sells an egg', function(){ it('sells an egg', function(){
scope.chooseEgg('Cactus'); scope.chooseEgg('Cactus');
scope.sellInventory(); scope.sellInventory();
expect(user.user.items.eggs).to.eql({Cactus: 0}); expect(user.items.eggs).to.eql({Cactus: 0});
expect(user.user.stats.gp).to.eql(3); expect(user.stats.gp).to.eql(3);
}); });
it('sells a potion', function(){ it('sells a potion', function(){
scope.choosePotion('Base'); scope.choosePotion('Base');
scope.sellInventory(); scope.sellInventory();
expect(user.user.items.hatchingPotions).to.eql({Base: 0}); expect(user.items.hatchingPotions).to.eql({Base: 0});
expect(user.user.stats.gp).to.eql(2); expect(user.stats.gp).to.eql(2);
}); });
it('sells food', function(){ it('sells food', function(){
scope.chooseFood('Meat'); scope.chooseFood('Meat');
scope.sellInventory(); scope.sellInventory();
expect(user.user.items.food).to.eql({Meat: 0}); expect(user.items.food).to.eql({Meat: 0});
expect(user.user.stats.gp).to.eql(1); expect(user.stats.gp).to.eql(1);
}); });
it('chooses a pet', function(){ it('chooses a pet', function(){
user.user.items.pets['Cactus-Base'] = 5; user.items.pets['Cactus-Base'] = 5;
scope.choosePet('Cactus', 'Base'); scope.choosePet('Cactus', 'Base');
expect(user.user.items.currentPet).to.eql('Cactus-Base'); expect(user.items.currentPet).to.eql('Cactus-Base');
}); });
it('purchases an egg', function(){ it('purchases an egg', function(){
scope.purchase('eggs', window.habitrpgShared.content.eggs['Wolf']); scope.purchase('eggs', window.habitrpgShared.content.eggs['Wolf']);
expect(user.user.balance).to.eql(3.25); expect(user.balance).to.eql(3.25);
expect(user.user.items.eggs).to.eql({Cactus: 1, Wolf: 1}) expect(user.items.eggs).to.eql({Cactus: 1, Wolf: 1})
}); });
}); });