Skip to content

Commit

Permalink
chore(deps): upgrade dev dependencies, fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
bostrom committed Jan 5, 2017
1 parent ca9856a commit 6468157
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.10"
- "7.0"

before_script:
- export DISPLAY=:99.0
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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](http://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">
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
24 changes: 12 additions & 12 deletions test/restangularSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
});

Expand All @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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');
Expand Down

0 comments on commit 6468157

Please sign in to comment.