fix($resource): delete $cancelRequest() in toJSON()

hereblur · gkalpak · commit 4f3858e7c371 · 2016-12-29T10:02:20.000+02:00
Closes angular#15244
diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
@@ -670,6 +670,7 @@ angular.module('ngResource', ['ng']).
           var data = extend({}, this);
           delete data.$promise;
           delete data.$resolved;
+          delete data.$cancelRequest;
           return data;
         };
 
diff --git a/test/ngResource/resourceSpec.js b/test/ngResource/resourceSpec.js
@@ -732,6 +732,24 @@ describe('basic usage', function() {
     expect(json).toEqual({id: 123, number: '9876', $myProp: 'still here'});
   });
 
+  it('should not include $cancelRequest when resource is toJson\'ed', function() {
+    $httpBackend.whenGET('/CreditCard').respond({});
+
+    var CreditCard = $resource('/CreditCard', {}, {
+      get: {
+        method: 'GET',
+        cancellable: true
+      }
+    });
+
+    var card = CreditCard.get();
+    var json = card.toJSON();
+
+    expect(card.$cancelRequest).toBeDefined();
+    expect(json.$cancelRequest).toBeUndefined();
+  });
+
+
   describe('promise api', function() {
 
     var $rootScope;
