chore(deps): upgrade dev dependencies, fix tests (#1450)

bostrom · web-flow · commit b583197fd069 · 2017-01-06T00:11:16.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "7.0"
 
 before_script:
   - export DISPLAY=:99.0
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/mgonto/restangular.svg?branch=master)](https://travis-ci.org/mgonto/restangular)
 [![Coverage Status](https://coveralls.io/repos/github/mgonto/restangular/badge.svg?branch=master)](https://coveralls.io/github/mgonto/restangular?branch=master)
+[![David](https://img.shields.io/david/dev/mgonto/restangular.svg)]()
 [![PayPayl donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=martin%40gon%2eto&lc=US&item_name=Martin%20Gontovnikas&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted "Donate once-off to this project using Paypal")
 [![Donate on Gittip](https://img.shields.io/gittip/mgonto.svg)](https://www.gittip.com/mgonto/)
 <a href="https://twitter.com/intent/tweet?hashtags=&original_referer=http%3A%2F%2Fgithub.com%2F&text=Check+out+Restangular%2C+a+service+for+%23AngularJS+that+makes+it+easy+to+use+Rest+APIs&tw_p=tweetbutton&url=https%3A%2F%2Fgithub.com%2Fmgonto%2Frestangular" target="_blank">
diff --git a/package.json b/package.json
@@ -36,23 +36,24 @@
   },
   "devDependencies": {
     "angular-mocks": "^1.4.8",
-    "grunt": "^0.4.5",
+    "grunt": "^1.0.0",
     "grunt-bower": "*",
     "grunt-bower-task": "*",
-    "grunt-cli": ">= 0.1.7",
+    "grunt-cli": "^1.2.0",
     "grunt-contrib-concat": "*",
     "grunt-contrib-jshint": "*",
     "grunt-contrib-uglify": "*",
     "grunt-conventional-changelog": "latest",
     "grunt-coveralls": "^1.0.1",
     "grunt-karma": "latest",
     "grunt-zip": "*",
-    "karma": "^0.13.19",
-    "karma-chrome-launcher": "~v2.0.0",
+    "jasmine-core": "^2.5.2",
+    "karma": "^1.3.0",
+    "karma-chrome-launcher": "~2.0.0",
     "karma-coverage": "^1.1.1",
     "karma-firefox-launcher": "~v1.0.0",
-    "karma-jasmine": "~0.1.5",
-    "karma-mocha-reporter": "0.2.8",
+    "karma-jasmine": "^1.1.0",
+    "karma-mocha-reporter": "^2.2.0",
     "karma-phantomjs-launcher": "~v1.0.2"
   },
   "scripts": {
diff --git a/test/restangularSpec.js b/test/restangularSpec.js
@@ -309,9 +309,9 @@ describe('Restangular', function() {
       CallbackManager.firstErrorInterceptor = function() {};
       CallbackManager.secondErrorInterceptor = function() {};
 
-      spyOn(CallbackManager, 'successCallback').andCallThrough();
-      spyOn(CallbackManager, 'firstErrorInterceptor').andCallThrough();
-      spyOn(CallbackManager, 'secondErrorInterceptor').andCallThrough();
+      spyOn(CallbackManager, 'successCallback').and.callThrough();
+      spyOn(CallbackManager, 'firstErrorInterceptor').and.callThrough();
+      spyOn(CallbackManager, 'secondErrorInterceptor').and.callThrough();
 
       Restangular.addErrorInterceptor(CallbackManager.firstErrorInterceptor);
       Restangular.addErrorInterceptor(CallbackManager.secondErrorInterceptor);
@@ -341,8 +341,8 @@ describe('Restangular', function() {
         return false; // prevent promise to be rejected
       };
 
-      spyOn(CallbackManager, 'successCallback').andCallThrough();
-      spyOn(CallbackManager, 'errorCallback').andCallThrough();
+      spyOn(CallbackManager, 'successCallback').and.callThrough();
+      spyOn(CallbackManager, 'errorCallback').and.callThrough();
 
       Restangular.addErrorInterceptor(CallbackManager.firstErrorInterceptor);
       Restangular.addErrorInterceptor(CallbackManager.secondErrorInterceptor);
@@ -371,9 +371,9 @@ describe('Restangular', function() {
       };
       CallbackManager.secondErrorInterceptor = function() {};
 
-      spyOn(CallbackManager, 'successCallback').andCallThrough();
-      spyOn(CallbackManager, 'firstErrorInterceptor').andCallThrough();
-      spyOn(CallbackManager, 'secondErrorInterceptor').andCallThrough();
+      spyOn(CallbackManager, 'successCallback').and.callThrough();
+      spyOn(CallbackManager, 'firstErrorInterceptor').and.callThrough();
+      spyOn(CallbackManager, 'secondErrorInterceptor').and.callThrough();
 
       Restangular.addErrorInterceptor(CallbackManager.firstErrorInterceptor);
       Restangular.addErrorInterceptor(CallbackManager.secondErrorInterceptor);
@@ -943,7 +943,7 @@ describe('Restangular', function() {
       expect(copiedAccount).not.toBe(accountsModel[0]);
 
       // create a spy for one of the methods to capture the value of 'this'
-      spyOn(copiedAccount, 'getRestangularUrl').andCallFake(function() {
+      spyOn(copiedAccount, 'getRestangularUrl').and.callFake(function() {
         that = this;
       });
 
@@ -957,7 +957,7 @@ describe('Restangular', function() {
       // with fromServer=true
       restangularAccount1.get().then(responseHandler);
       $httpBackend.flush();
-      var account = responseHandler.calls[0].args[0],
+      var account = responseHandler.calls.argsFor(0)[0],
         copiedAccount = Restangular.copy(account);
       expect(account.fromServer).toEqual(true);
       expect(copiedAccount.fromServer).toEqual(true);
@@ -981,7 +981,7 @@ describe('Restangular', function() {
       // with collections, fromServer = true;
       restangularAccounts.getList().then(responseHandler);
       $httpBackend.flush();
-      accounts = responseHandler.calls[0].args[0],
+      accounts = responseHandler.calls.argsFor(0)[0],
         copiedAccounts = Restangular.copy(accounts);
       expect(accounts.fromServer).toEqual(true);
       expect(copiedAccounts.fromServer).toEqual(true);
@@ -1116,7 +1116,7 @@ describe('Restangular', function() {
       Restangular.all('accounts').getList().then(responseHandler);
       $httpBackend.flush();
 
-      var accounts = responseHandler.calls[0].args[0];
+      var accounts = responseHandler.calls.argsFor(0)[0];
       var accountsCopy = accounts.clone();
 
       expect(accounts.customThing).toEqual('customValue');
