fixup! feat($resource): add support for request and requestError interceptors

Author: gkalpak

src/ngResource/resource.js

@@ -187,8 +187,9 @@ function shallowClearAndCopy(src, dst) {
  *     [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType).
  *   - **`interceptor`** - `{Object=}` - The interceptor object has four optional methods -
  *     `request`, `requestError`, `response`, and `responseError`. See
- *     {@link ng.$http $http interceptors} for details. In addition, the
- *     resource instance or array object is accessible by the `resource` property of the
+ *     {@link ng.$http $http interceptors} for details. Note that `request`/`requestError`
+ *     interceptors are applied before calling `$http`, thus before any global `$http` interceptors.
+ *     The resource instance or array object is accessible by the `resource` property of the
  *     `http response` object passed to response interceptors.
  *     Keep in mind that the associated promise will be resolved with the value returned by the
  *     response interceptor, if one is specified. The default response interceptor returns

test/ngResource/resourceSpec.js

@@ -1189,7 +1189,9 @@ describe('basic usage', function() {
         resource.$promise.then(successSpy, failureSpy);
 
         $httpBackend.flush();
-        expect(successSpy).toHaveBeenCalledOnce();
+        expect(successSpy).toHaveBeenCalledOnceWith(jasmine.arrayContaining([
+          jasmine.objectContaining({id: 1})
+        ]));
         expect(failureSpy).not.toHaveBeenCalled();
       });
 
@@ -1215,8 +1217,7 @@ describe('basic usage', function() {
         // Ensure the resource promise was rejected
         expect(resource.$resolved).toBeTruthy();
         expect(successSpy).not.toHaveBeenCalled();
-        expect(failureSpy).toHaveBeenCalledOnce();
-        expect(failureSpy).toHaveBeenCalledWith(rejectReason);
+        expect(failureSpy).toHaveBeenCalledOnceWith(rejectReason);
 
         // Ensure that no requests were made.
         $httpBackend.verifyNoOutstandingRequest();
@@ -1243,44 +1244,41 @@ describe('basic usage', function() {
         resource.$promise.then(successSpy, failureSpy);
         $rootScope.$digest();
 
-        expect(callback).toHaveBeenCalledOnce();
-        expect(callback).toHaveBeenCalledWith(rejectReason);
+        expect(callback).toHaveBeenCalledOnceWith(rejectReason);
         expect(successSpy).not.toHaveBeenCalled();
-        expect(failureSpy).toHaveBeenCalledOnce();
-        expect(failureSpy).toHaveBeenCalledWith(rejectReason);
+        expect(failureSpy).toHaveBeenCalledOnceWith(rejectReason);
 
         // Ensure that no requests were made.
         $httpBackend.verifyNoOutstandingRequest();
       });
 
       it('should abort the operation if a requestErrorInterceptor rejects the operation', function() {
-          var CreditCard = $resource('/CreditCard', {}, {
-            query: {
-              method: 'get',
-              isArray: true,
-              interceptor: {
-                request: function() {
-                  return $q.reject(rejectReason);
-                },
-                requestError: function(rejection) {
-                  return $q.reject(rejection);
-                }
+        var CreditCard = $resource('/CreditCard', {}, {
+          query: {
+            method: 'get',
+            isArray: true,
+            interceptor: {
+              request: function() {
+                return $q.reject(rejectReason);
+              },
+              requestError: function(rejection) {
+                return $q.reject(rejection);
               }
             }
-          });
+          }
+        });
 
-          var resource = CreditCard.query();
-          resource.$promise.then(successSpy, failureSpy);
-          $rootScope.$apply();
+        var resource = CreditCard.query();
+        resource.$promise.then(successSpy, failureSpy);
+        $rootScope.$apply();
 
-          expect(resource.$resolved).toBeTruthy();
-          expect(successSpy).not.toHaveBeenCalled();
-          expect(failureSpy).toHaveBeenCalledOnce();
-          expect(failureSpy).toHaveBeenCalledWith(rejectReason);
+        expect(resource.$resolved).toBeTruthy();
+        expect(successSpy).not.toHaveBeenCalled();
+        expect(failureSpy).toHaveBeenCalledOnceWith(rejectReason);
 
-          // Ensure that no requests were made.
-          $httpBackend.verifyNoOutstandingRequest();
-        });
+        // Ensure that no requests were made.
+        $httpBackend.verifyNoOutstandingRequest();
+      });
 
       it('should continue the operation if a requestErrorInterceptor rescues it', function() {
         var CreditCard = $resource('/CreditCard', {}, {
@@ -1305,8 +1303,11 @@ describe('basic usage', function() {
         $httpBackend.flush();
 
         expect(resource.$resolved).toBeTruthy();
-        expect(successSpy).toHaveBeenCalledOnce();
+        expect(successSpy).toHaveBeenCalledOnceWith(jasmine.arrayContaining([
+          jasmine.objectContaining({id: 1})
+        ]));
         expect(failureSpy).not.toHaveBeenCalled();
+
         $httpBackend.verifyNoOutstandingRequest();
       });
     });
@@ -2038,7 +2039,7 @@ describe('handling rejections', function() {
       failureSpy = jasmine.createSpy('failureSpy');
       callback = jasmine.createSpy();
     }));
-    
+
     it('should call requestErrorInterceptor if requestInterceptor throws an error', function() {
       var CreditCard = $resource('/CreditCard', {}, {
         query: {