krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed linting and some tests

Browse Source
This commit is contained in:
Keith Holliday
2016-05-10 10:44:48 -05:00
parent a0939155c9
commit 632a1ebbf3
16 changed files with 64 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/spec/controllers/inventoryCtrlSpec.js
View File

@@ -4,11 +4,9 @@ describe('Inventory Controller', function() {
var scope, ctrl, user, rootScope;
beforeEach(function() {
module(function($provide) {
$provide.value('User', {});
});
module(function($provide) {});
inject(function($rootScope, $controller, Shared){
inject(function($rootScope, $controller, Shared, User) {
user = specHelper.newUser({
balance: 4,
items: {
@@ -33,10 +31,13 @@ describe('Inventory Controller', function() {
scope = $rootScope.$new();
rootScope = $rootScope;
// Load RootCtrl to ensure shared behaviors are loaded
$controller('RootCtrl', {$scope: scope, User: {user: user}, $window: mockWindow});
User.user = user;
User.setUser(user);
ctrl = $controller('InventoryCtrl', {$scope: scope, User: {user: user}, $window: mockWindow});
// Load RootCtrl to ensure shared behaviors are loaded
$controller('RootCtrl', {$scope: scope, User: User, $window: mockWindow});
ctrl = $controller('InventoryCtrl', {$scope: scope, User: User, $window: mockWindow});
});
});