Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 4f3858e

Browse files
hereblurgkalpak
authored andcommitted
fix($resource): delete $cancelRequest() in toJSON()
Closes #15244
1 parent 4993728 commit 4f3858e

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

src/ngResource/resource.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,7 @@ angular.module('ngResource', ['ng']).
670670
var data = extend({}, this);
671671
delete data.$promise;
672672
delete data.$resolved;
673+
delete data.$cancelRequest;
673674
return data;
674675
};
675676

test/ngResource/resourceSpec.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,24 @@ describe('basic usage', function() {
732732
expect(json).toEqual({id: 123, number: '9876', $myProp: 'still here'});
733733
});
734734

735+
it('should not include $cancelRequest when resource is toJson\'ed', function() {
736+
$httpBackend.whenGET('/CreditCard').respond({});
737+
738+
var CreditCard = $resource('/CreditCard', {}, {
739+
get: {
740+
method: 'GET',
741+
cancellable: true
742+
}
743+
});
744+
745+
var card = CreditCard.get();
746+
var json = card.toJSON();
747+
748+
expect(card.$cancelRequest).toBeDefined();
749+
expect(json.$cancelRequest).toBeUndefined();
750+
});
751+
752+
735753
describe('promise api', function() {
736754

737755
var $rootScope;

0 commit comments

Comments
 (0)