Skip to content

Commit 922a83e

Browse files
hereblurgkalpak
authored andcommitted
fix($resource): delete $cancelRequest() in toJSON()
Closes angular#15244
1 parent ee1458f commit 922a83e

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

src/ngResource/resource.js

+1
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ angular.module('ngResource', ['ng']).
636636
var data = extend({}, this);
637637
delete data.$promise;
638638
delete data.$resolved;
639+
delete data.$cancelRequest;
639640
return data;
640641
};
641642

test/ngResource/resourceSpec.js

+18
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,24 @@ describe('basic usage', function() {
777777
expect(json).toEqual({id: 123, number: '9876', $myProp: 'still here'});
778778
});
779779

780+
it('should not include $cancelRequest when resource is toJson\'ed', function() {
781+
$httpBackend.whenGET('/CreditCard').respond({});
782+
783+
var CreditCard = $resource('/CreditCard', {}, {
784+
get: {
785+
method: 'GET',
786+
cancellable: true
787+
}
788+
});
789+
790+
var card = CreditCard.get();
791+
var json = card.toJSON();
792+
793+
expect(card.$cancelRequest).toBeDefined();
794+
expect(json.$cancelRequest).toBeUndefined();
795+
});
796+
797+
780798
describe('promise api', function() {
781799

782800
var $rootScope;

0 commit comments

Comments
 (0)