Merge pull request #20 from corinna000/updated_tests

Updated tests
marklagendijk · Mar 28, 2015 · e564b05 · e564b05
2 parents c7dab74 + 6f42a5c
commit e564b05
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -6,14 +6,15 @@
   "dependencies": {},
   "devDependencies": {
     "gulp": "~3.8.0",
-    "gulp-karma": "0.0.1",
+    "gulp-karma": "^0.0.4",
     "gulp-ng-annotate": "^0.3.3",
     "gulp-rename": "~0.2.1",
     "gulp-uglify": "~0.1.0",
+    "jasmine-core": "^2.2.0",
     "karma": "^0.12.24",
-    "karma-chrome-launcher": "~0.1.2",
+    "karma-chrome-launcher": "^0.1.7",
     "karma-firefox-launcher": "~0.1.3",
-    "karma-jasmine": "~0.1.5",
+    "karma-jasmine": "^0.3.5",
     "karma-phantomjs-launcher": "~0.1.1",
     "karma-requirejs": "~0.2.1",
     "karma-script-launcher": "~0.1.0"

diff --git a/test/statehelperSpec.js b/test/statehelperSpec.js
@@ -2,6 +2,8 @@
 describe('ui-router.stateHelper', function(){
     var stateHelperProvider, $stateProvider, rootState, expectedState;
 
+    var stateHelperProviderState;
+
     beforeEach(module('ui.router.stateHelper', function(_stateHelperProvider_, _$stateProvider_){
         stateHelperProvider = _stateHelperProvider_;
         $stateProvider = _$stateProvider_;
@@ -26,7 +28,7 @@ describe('ui-router.stateHelper', function(){
             ]
         };
 
-        spyOn($stateProvider, 'state');
+        spyOn($stateProvider, 'state').and.callThrough();
     }));
 
     describe('.state', function(){
@@ -49,11 +51,11 @@ describe('ui-router.stateHelper', function(){
                 ]
             };
 
-            stateHelperProvider.state(rootState);
+            stateHelperProviderState = stateHelperProvider.state(rootState);
         }));
 
         it('should set each state', function(){
-            expect($stateProvider.state.callCount).toBe(4);
+            expect($stateProvider.state.calls.count()).toBe(4);
         });
 
         it('should convert names to dot notation, set parent references', function(){
@@ -65,11 +67,12 @@ describe('ui-router.stateHelper', function(){
             expectedState.children[1].parent = expectedState;
             expectedState.children[1].children[0].parent = expectedState.children[1];
 
-            expect($stateProvider.state.argsForCall[0][0]).toEqual(expectedState);
+            // expect($stateProvider.state.argsForCall[0][0]).toEqual(expectedState);
+            expect($stateProvider.state.calls.argsFor(0)[0]).toEqual(expectedState);
         });
 
         it('should return itself to support chaining', function(){
-            expect(stateHelperProvider.state(rootState)).toBe(stateHelperProvider);
+            expect(stateHelperProviderState).toBe(stateHelperProvider);
         });
     });
 
@@ -105,14 +108,14 @@ describe('ui-router.stateHelper', function(){
             expectedState.children[1].parent = expectedState;
             expectedState.children[1].children[0].parent = expectedState.children[1];
 
-            expect($stateProvider.state.argsForCall[0][0]).toEqual(expectedState);
+            expect($stateProvider.state.calls.argsFor(0)[0]).toEqual(expectedState);
         });
     });
 
     describe('.setNestedState', function(){
         it('should support .setNestedState as legacy name', function(){
             stateHelperProvider.setNestedState(rootState);
-            expect($stateProvider.state.callCount).toBe(4);
+            expect($stateProvider.state.calls.count()).toBe(4);
         });
     });
 });