Merge pull request #11 from tonycapone/master

guylabs · guylabs · commit bda7392c9af8 · 2015-08-10T07:46:01.000+02:00
interceptor intercepts angular-ui templates
diff --git a/dist/angular-spring-data-rest.js b/dist/angular-spring-data-rest.js
@@ -386,6 +386,9 @@ angular.module("spring-data-rest").provider("SpringDataRestInterceptor",
 
                     return {
                         response: function (response) {
+                            if(!angular.isObject(response.data)){
+                                return response;
+                            }
                             return SpringDataRestAdapter.process(response.data).then(function (processedResponse) {
                                 response.data = processedResponse;
                                 return response;
diff --git a/dist/angular-spring-data-rest.min.js b/dist/angular-spring-data-rest.min.js
diff --git a/src/angular-spring-data-rest-interceptor-provider.js b/src/angular-spring-data-rest-interceptor-provider.js
@@ -17,6 +17,9 @@ angular.module("spring-data-rest").provider("SpringDataRestInterceptor",
 
                     return {
                         response: function (response) {
+                            if(!angular.isObject(response.data)){
+                                return response;
+                            }
                             return SpringDataRestAdapter.process(response.data).then(function (processedResponse) {
                                 response.data = processedResponse;
                                 return response;
diff --git a/test/angular-spring-data-rest-interceptor-provider.spec.js b/test/angular-spring-data-rest-interceptor-provider.spec.js
@@ -89,9 +89,10 @@ describe("if the spring data rest interceptor is added", function () {
         // start the injectors previously registered with calls to angular.mock.module and assign it to the
         // this scope. See above for the description.
         var httpBackendVar = undefined;
-        inject(function (_SpringDataRestAdapter_, $httpBackend) {
+        inject(function (_SpringDataRestAdapter_, $httpBackend, _$http_) {
             SpringDataRestAdapter = _SpringDataRestAdapter_;
             httpBackendVar = $httpBackend;
+            $http = _$http_;
         });
         this.httpBackend = httpBackendVar;
 
@@ -133,4 +134,18 @@ describe("if the spring data rest interceptor is added", function () {
         this.httpBackend.verifyNoOutstandingExpectation();
     });
 
+    it(" it must not execute when a response is of type string", function () {
+        var linkHref = "http://localhost:8080/categories";
+        var responseString = "<html>test</html>";
+        this.httpBackend.whenGET(linkHref).respond(200, responseString);
+        this.httpBackend.expectGET(linkHref);
+
+        var data = $http.get(linkHref).then(function(response){
+            data = response.data;
+        });
+
+        this.httpBackend.flush();
+        expect(data).toBe(responseString);
+    });
+
 });
