Merge pull request #34 from mangei/MG/relativeUrls

make the api url relative, such that the application works if it is d…
Catalysts · Oct 6, 2015 · b02fa50 · b02fa50
2 parents 4f7a479 + 9a1aa43
commit b02fa50
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/main/javascript/service/cat-api-service.js b/src/main/javascript/service/cat-api-service.js
@@ -384,7 +384,7 @@ function CatApiServiceProvider() {
  */
 angular
     .module('cat.service.api', ['cat.service.conversion', 'cat.service.search'])
-    .constant('CAT_API_SERVICE_DEFAULTS', {endpointUrlPrefix: '/api/'})
+    .constant('CAT_API_SERVICE_DEFAULTS', {endpointUrlPrefix: 'api/'})
     .provider('catApiService', CatApiServiceProvider);
 
 /**

diff --git a/src/test/javascript/service/cat-api-service.spec.js b/src/test/javascript/service/cat-api-service.spec.js
@@ -42,7 +42,7 @@ describe('Api Service', function () {
     });
 
     it('should return a converted object', function () {
-        $httpBackend.expectGET('/api/test/' + testData[0].id).respond(testData[0]);
+        $httpBackend.expectGET('api/test/' + testData[0].id).respond(testData[0]);
         catApiService.test.get(testData[0].id).then(function (result) {
             expect(result).toBeDefined();
             cat.util.test.expectToEqualConverted(result, testData[0]);
@@ -52,7 +52,7 @@ describe('Api Service', function () {
 
     it('should return a paginated result if a PagedResultDTO is returned by the server', function () {
         var serverData = {totalCount: 2, elements: testData};
-        $httpBackend.expectGET('/api/test?page=0&size=100').respond(serverData);
+        $httpBackend.expectGET('api/test?page=0&size=100').respond(serverData);
         catApiService.test.list(new window.cat.SearchRequest()).then(function (result) {
             expect(result).toBeDefined();
             expect(result.totalCount).toBe(2);
@@ -63,7 +63,7 @@ describe('Api Service', function () {
     });
 
     it('should return a list of objects if the server response is not paginated', function () {
-        $httpBackend.expectGET('/api/test').respond(testData);
+        $httpBackend.expectGET('api/test').respond(testData);
         catApiService.test.list().then(function (result) {
             expect(result).toBeDefined();
             expect(result.length).toBe(2);
@@ -75,7 +75,7 @@ describe('Api Service', function () {
     it('should post an object without id', function () {
         var clientData = {name: 'NewTestObject'};
         var serverData = {id: 100, name: 'NewTestObject'};
-        $httpBackend.expectPOST('/api/test', clientData).respond(serverData);
+        $httpBackend.expectPOST('api/test', clientData).respond(serverData);
         catApiService.test.save(clientData).then(function (result) {
             cat.util.test.expectToEqualConverted(result, new cat.util.test.Model(serverData));
         });
@@ -84,47 +84,47 @@ describe('Api Service', function () {
 
     it('should update an object with id', function () {
         var data = {id: 100, name: 'NewTestObject'};
-        $httpBackend.expectPUT('/api/test/100', data).respond(data);
+        $httpBackend.expectPUT('api/test/100', data).respond(data);
         catApiService.test.save(data).then(function (result) {
             cat.util.test.expectToEqualConverted(result, data);
         });
         $httpBackend.flush();
     });
 
     it('should delete an object', function () {
-        $httpBackend.expectDELETE('/api/test/100').respond(200);
+        $httpBackend.expectDELETE('api/test/100').respond(200);
         catApiService.test.remove(100).then(function (response) {
             expect(response.status).toBe(200);
         });
         $httpBackend.flush();
     });
 
     it('should call custom GET url', function () {
-        $httpBackend.expectGET('/api/test/customGET').respond(200);
+        $httpBackend.expectGET('api/test/customGET').respond(200);
         catApiService.test.custom.get('customGET').then(function (response) {
             expect(response.status).toBe(200);
         });
         $httpBackend.flush();
     });
 
     it('should call custom GET url with search request', function () {
-        $httpBackend.expectGET('/api/test/customGET?page=0&size=100').respond(200);
+        $httpBackend.expectGET('api/test/customGET?page=0&size=100').respond(200);
         catApiService.test.custom.get('customGET', new window.cat.SearchRequest()).then(function (response) {
             expect(response.status).toBe(200);
         });
         $httpBackend.flush();
     });
 
     it('should call custom POST url', function () {
-        $httpBackend.expectPOST('/api/test/customPOST', {name: 'NewTestObject'}).respond(200);
+        $httpBackend.expectPOST('api/test/customPOST', {name: 'NewTestObject'}).respond(200);
         catApiService.test.custom.post('customPOST', {name: 'NewTestObject'}).then(function (response) {
             expect(response.status).toBe(200);
         });
         $httpBackend.flush();
     });
 
     it('should call custom PUT url', function () {
-        $httpBackend.expectPUT('/api/test/customPUT', {id: 100, name: 'NewTestObject'}).respond(200);
+        $httpBackend.expectPUT('api/test/customPUT', {id: 100, name: 'NewTestObject'}).respond(200);
         catApiService.test.custom.put('customPUT', {id: 100, name: 'NewTestObject'}).then(function (response) {
             expect(response.status).toBe(200);
         });
@@ -141,7 +141,7 @@ describe('Api Service', function () {
         expect(endpoint1).toBe(endpoint2);
 
         // test dynamic endpoint functionality
-        $httpBackend.expectGET('/api/test/' + testData[0].id).respond(testData[0]);
+        $httpBackend.expectGET('api/test/' + testData[0].id).respond(testData[0]);
         endpoint2.get(testData[0].id).then(function (result) {
             expect(result).toBeDefined();
             cat.util.test.expectToEqualConverted(result, testData[0]);
@@ -152,7 +152,7 @@ describe('Api Service', function () {
     it('should allow endpoint children', function () {
         var user2 = catApiService.user.res(2);
 
-        $httpBackend.expectGET('/api/user/2/friend').respond(testData);
+        $httpBackend.expectGET('api/user/2/friend').respond(testData);
         user2.friend.list().then(function (result) {
             expect(result).toBeDefined();
             expect(result.length).toBe(2);

diff --git a/src/test/javascript/service/cat-list-data-loading-service.spec.js b/src/test/javascript/service/cat-list-data-loading-service.spec.js
@@ -39,7 +39,7 @@ describe('CatListDataLoadingService', function () {
 
     it('should update the properties', function () {
         var paginatedTestData = {totalCount: 2, elements: testData};
-        $httpBackend.expectGET('/api/test?page=0&size=100').respond(paginatedTestData);
+        $httpBackend.expectGET('api/test?page=0&size=100').respond(paginatedTestData);
         catListDataLoadingService.load(catApiService.test, new window.cat.SearchRequest()).then(function (result) {
             expect(result.count).toBe(2);
             expect(result.firstResult).toBe(1);
@@ -53,7 +53,7 @@ describe('CatListDataLoadingService', function () {
 
     it('should update the properties and use sorting settings', function () {
         var paginatedTestData = {totalCount: 2, elements: testData};
-        $httpBackend.expectGET('/api/test?page=0&size=100&sort=name:desc').respond(paginatedTestData);
+        $httpBackend.expectGET('api/test?page=0&size=100&sort=name:desc').respond(paginatedTestData);
         catListDataLoadingService.resolve('test', {property: 'name', isDesc: true}).then(function (result) {
             expect(result.count).toBe(2);
             expect(result.firstResult).toBe(1);