fix($resource): don't add noop $cancelRequest after request has resolved

petebacondarwin · petebacondarwin · commit b183eae7aed8 · 2015-11-26T13:14:12.000Z
diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
@@ -706,7 +706,7 @@ angular.module('ngResource', ['ng']).
 
             promise.finally(function() {
               value.$resolved = true;
-              if (cancellable) {
+              if (!isInstanceCall && cancellable) {
                 value.$cancelRequest = angular.noop;
                 timeoutDeferred = httpConfig.timeout = null;
               }
diff --git a/test/ngResource/resourceSpec.js b/test/ngResource/resourceSpec.js
@@ -1428,6 +1428,8 @@ describe('cancelling requests', function() {
   );
 
   it('should not create a `$cancelRequest` method for instance calls', function() {
+    $httpBackend.whenPOST('/CreditCard').respond({});
+
     var CreditCard = $resource('/CreditCard', {}, {
       save1: {
         method: 'POST',
@@ -1448,6 +1450,11 @@ describe('cancelling requests', function() {
     var promise2 = creditCard.$save2();
     expect(promise2.$cancelRequest).toBeUndefined();
     expect(creditCard.$cancelRequest).toBeUndefined();
+
+    $httpBackend.flush();
+    expect(promise1.$cancelRequest).toBeUndefined();
+    expect(promise2.$cancelRequest).toBeUndefined();
+    expect(creditCard.$cancelRequest).toBeUndefined();
   });
 
   it('should not create a `$cancelRequest` method for non-cancellable calls', function() {
@@ -1546,7 +1553,7 @@ describe('cancelling requests', function() {
   });
 });
 
-describe('resource wrt configuring `cancellable` on the provider', function() {
+describe('configuring `cancellable` on the provider', function() {
   var $resource;
 
   beforeEach(module('ngResource', function($resourceProvider) {

Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,7 @@ angular.module('ngResource', ['ng']).`
`706`	`706`
`707`	`707`	`promise.finally(function() {`
`708`	`708`	`value.$resolved = true;`
`709`		`- if (cancellable) {`
	`709`	`+ if (!isInstanceCall && cancellable) {`
`710`	`710`	`value.$cancelRequest = angular.noop;`
`711`	`711`	`timeoutDeferred = httpConfig.timeout = null;`
`712`	`712`	`}`