Skip to content

Commit b583197

Browse files
bostrombostrom
authored
chore(deps): upgrade dev dependencies, fix tests (#1450)
1 parent ca9856a commit b583197

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- "0.10"
3+
- "7.0"
44

55
before_script:
66
- export DISPLAY=:99.0

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
[![Build Status](https://travis-ci.org/mgonto/restangular.svg?branch=master)](https://travis-ci.org/mgonto/restangular)
44
[![Coverage Status](https://coveralls.io/repos/github/mgonto/restangular/badge.svg?branch=master)](https://coveralls.io/github/mgonto/restangular?branch=master)
5+
[![David](https://img.shields.io/david/dev/mgonto/restangular.svg)]()
56
[![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")
67
[![Donate on Gittip](http://img.shields.io/gittip/mgonto.svg)](https://www.gittip.com/mgonto/)
78
<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">

‎package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,24 @@
3636
},
3737
"devDependencies": {
3838
"angular-mocks": "^1.4.8",
39-
"grunt": "^0.4.5",
39+
"grunt": "^1.0.0",
4040
"grunt-bower": "*",
4141
"grunt-bower-task": "*",
42-
"grunt-cli": ">= 0.1.7",
42+
"grunt-cli": "^1.2.0",
4343
"grunt-contrib-concat": "*",
4444
"grunt-contrib-jshint": "*",
4545
"grunt-contrib-uglify": "*",
4646
"grunt-conventional-changelog": "latest",
4747
"grunt-coveralls": "^1.0.1",
4848
"grunt-karma": "latest",
4949
"grunt-zip": "*",
50-
"karma": "^0.13.19",
51-
"karma-chrome-launcher": "~v2.0.0",
50+
"jasmine-core": "^2.5.2",
51+
"karma": "^1.3.0",
52+
"karma-chrome-launcher": "~2.0.0",
5253
"karma-coverage": "^1.1.1",
5354
"karma-firefox-launcher": "~v1.0.0",
54-
"karma-jasmine": "~0.1.5",
55-
"karma-mocha-reporter": "0.2.8",
55+
"karma-jasmine": "^1.1.0",
56+
"karma-mocha-reporter": "^2.2.0",
5657
"karma-phantomjs-launcher": "~v1.0.2"
5758
},
5859
"scripts": {

‎test/restangularSpec.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,9 @@ describe('Restangular', function() {
309309
CallbackManager.firstErrorInterceptor = function() {};
310310
CallbackManager.secondErrorInterceptor = function() {};
311311

312-
spyOn(CallbackManager, 'successCallback').andCallThrough();
313-
spyOn(CallbackManager, 'firstErrorInterceptor').andCallThrough();
314-
spyOn(CallbackManager, 'secondErrorInterceptor').andCallThrough();
312+
spyOn(CallbackManager, 'successCallback').and.callThrough();
313+
spyOn(CallbackManager, 'firstErrorInterceptor').and.callThrough();
314+
spyOn(CallbackManager, 'secondErrorInterceptor').and.callThrough();
315315

316316
Restangular.addErrorInterceptor(CallbackManager.firstErrorInterceptor);
317317
Restangular.addErrorInterceptor(CallbackManager.secondErrorInterceptor);
@@ -341,8 +341,8 @@ describe('Restangular', function() {
341341
return false; // prevent promise to be rejected
342342
};
343343

344-
spyOn(CallbackManager, 'successCallback').andCallThrough();
345-
spyOn(CallbackManager, 'errorCallback').andCallThrough();
344+
spyOn(CallbackManager, 'successCallback').and.callThrough();
345+
spyOn(CallbackManager, 'errorCallback').and.callThrough();
346346

347347
Restangular.addErrorInterceptor(CallbackManager.firstErrorInterceptor);
348348
Restangular.addErrorInterceptor(CallbackManager.secondErrorInterceptor);
@@ -371,9 +371,9 @@ describe('Restangular', function() {
371371
};
372372
CallbackManager.secondErrorInterceptor = function() {};
373373

374-
spyOn(CallbackManager, 'successCallback').andCallThrough();
375-
spyOn(CallbackManager, 'firstErrorInterceptor').andCallThrough();
376-
spyOn(CallbackManager, 'secondErrorInterceptor').andCallThrough();
374+
spyOn(CallbackManager, 'successCallback').and.callThrough();
375+
spyOn(CallbackManager, 'firstErrorInterceptor').and.callThrough();
376+
spyOn(CallbackManager, 'secondErrorInterceptor').and.callThrough();
377377

378378
Restangular.addErrorInterceptor(CallbackManager.firstErrorInterceptor);
379379
Restangular.addErrorInterceptor(CallbackManager.secondErrorInterceptor);
@@ -943,7 +943,7 @@ describe('Restangular', function() {
943943
expect(copiedAccount).not.toBe(accountsModel[0]);
944944

945945
// create a spy for one of the methods to capture the value of 'this'
946-
spyOn(copiedAccount, 'getRestangularUrl').andCallFake(function() {
946+
spyOn(copiedAccount, 'getRestangularUrl').and.callFake(function() {
947947
that = this;
948948
});
949949

@@ -957,7 +957,7 @@ describe('Restangular', function() {
957957
// with fromServer=true
958958
restangularAccount1.get().then(responseHandler);
959959
$httpBackend.flush();
960-
var account = responseHandler.calls[0].args[0],
960+
var account = responseHandler.calls.argsFor(0)[0],
961961
copiedAccount = Restangular.copy(account);
962962
expect(account.fromServer).toEqual(true);
963963
expect(copiedAccount.fromServer).toEqual(true);
@@ -981,7 +981,7 @@ describe('Restangular', function() {
981981
// with collections, fromServer = true;
982982
restangularAccounts.getList().then(responseHandler);
983983
$httpBackend.flush();
984-
accounts = responseHandler.calls[0].args[0],
984+
accounts = responseHandler.calls.argsFor(0)[0],
985985
copiedAccounts = Restangular.copy(accounts);
986986
expect(accounts.fromServer).toEqual(true);
987987
expect(copiedAccounts.fromServer).toEqual(true);
@@ -1116,7 +1116,7 @@ describe('Restangular', function() {
11161116
Restangular.all('accounts').getList().then(responseHandler);
11171117
$httpBackend.flush();
11181118

1119-
var accounts = responseHandler.calls[0].args[0];
1119+
var accounts = responseHandler.calls.argsFor(0)[0];
11201120
var accountsCopy = accounts.clone();
11211121

11221122
expect(accounts.customThing).toEqual('customValue');

0 commit comments

Comments
 (0)