Merge branch '1970-test_crud_model' of verdnatura/salix into dev

front/core/components/crud-model/crud-model.js

@@ -100,7 +100,7 @@ export default class CrudModel extends ModelProxy {
     }
 
     removeFilter() {
-        return applyFilter(null, null);
+        return this.applyFilter(null, null);
     }
 
     /**
@@ -240,14 +240,12 @@ export default class CrudModel extends ModelProxy {
 
     onRemoteDone(json, filter, append) {
         let data = json.data;
-
         if (append)
             this.orgData = this.orgData.concat(data);
         else {
             this.orgData = data;
             this.currentFilter = filter;
         }
-
         this.data = this.proxiedData.slice();
         this.moreRows = filter.limit && data.length == filter.limit;
         this.onRequestEnd();

front/core/components/crud-model/index.spec.js

@@ -25,7 +25,7 @@ describe('Component vnCrudModel', () => {
     });
 
     describe('save()', () => {
-        it(`should make an HTTP post query and then update the original rows with the returned values`, () => {
+        it('should make an HTTP post query and then update the original rows with the returned values', () => {
             spyOn(controller, 'applyChanges');
 
             controller.insert({value: 'My new item 1'});
@@ -47,4 +47,186 @@ describe('Component vnCrudModel', () => {
             expect(controller.applyChanges).toHaveBeenCalledWith();
         });
     });
+
+    describe('setter url()', () => {
+        it('should set the url', () => {
+            spyOn(controller, 'autoRefresh');
+            spyOn(controller, 'clear');
+
+            controller.url = '/TestUrl';
+
+            expect(controller.url).toEqual('/TestUrl');
+        });
+    });
+
+    describe('isLoading()', () => {
+        it('should return false if canceler is null', () => {
+            controller.canceler = null;
+
+            expect(controller.isLoading).toBe(false);
+        });
+
+        it('should return true if canceler is not null', () => {
+            controller.canceler = 'validValue';
+
+            expect(controller.isLoading).toBe(true);
+        });
+    });
+
+    describe('buildFilter()', () => {
+        it('should build a filter and return it', () => {
+            controller.order = 'id ASC';
+            controller.fields = ['id'];
+            controller.limit = 1;
+            controller.filter = 'filterTest';
+
+            const result = controller.buildFilter();
+
+            expect(Object.keys(result).length).toEqual(13);
+        });
+    });
+
+    describe('sendRequest()', () => {
+        it('should call refresh() and check that the sendRequest is called', () => {
+            spyOn(controller, 'sendRequest').and.callThrough();
+            spyOn(controller, 'onRemoteDone');
+            spyOn(controller, 'onRemoteError');
+
+            const filter = {id: 1};
+            const serializedParams = encodeURIComponent(JSON.stringify(filter));
+
+            $httpBackend.whenRoute('GET', `model?filter=${serializedParams}`).respond();
+            controller.sendRequest(filter, true);
+            $httpBackend.flush();
+
+            expect(controller.isPaging).toBe(false);
+        });
+    });
+
+    describe('addFilter()', () => {
+        it('should call addFilter and check that the new filter has been added', () => {
+            spyOn(controller, 'refresh');
+
+            const filter = {where: {id: 1}};
+            controller.userFilter = {where: {name: 'test'}};
+            const filterMerged = {'where': {'and': [{'name': 'test'}, {'id': 1}]}};
+
+            controller.addFilter(filter);
+
+            expect(controller.userFilter).toEqual(filterMerged);
+            expect(controller.refresh).toHaveBeenCalledWith();
+        });
+    });
+
+    describe('applyFilter()', () => {
+        it('should call applyFilter and check that the refresh() is called', () => {
+            spyOn(controller, 'refresh');
+
+            const filter = {where: {id: 1}};
+            const params = {where: {id: 2}};
+
+            controller.applyFilter(filter, params);
+
+            expect(controller.userFilter).toEqual(filter);
+            expect(controller.userParams).toEqual(params);
+            expect(controller.refresh).toHaveBeenCalledWith();
+        });
+    });
+
+    describe('removeFilter()', () => {
+        it('should check the userFilter and userParams are removed', () => {
+            controller.removeFilter();
+
+            expect(controller.userFilter).toBe(null);
+            expect(controller.userParams).toBe(null);
+        });
+    });
+
+    describe('loadMore()', () => {
+        it('should call sendRequest with the new filter', () => {
+            spyOn(controller, 'sendRequest');
+
+            controller.moreRows = true;
+
+            controller.loadMore();
+
+            expect(controller.sendRequest).toHaveBeenCalledWith({'skip': 2}, true);
+        });
+    });
+
+    describe('clear()', () => {
+        it('should check that orgData and moreRows are set to null', () => {
+            controller.moreRows = true;
+
+            controller.clear();
+
+            expect(controller.moreRows).toBe(null);
+            expect(controller.orgData).toBe(null);
+        });
+    });
+
+    describe('refresh()', () => {
+        it('shold resolve a fake promise if this._url is undefined', () => {
+            spyOn(controller.$q, 'resolve');
+
+            controller._url = undefined;
+
+            controller.refresh();
+
+            expect(controller.$q.resolve).toHaveBeenCalledWith();
+        });
+    });
+
+    describe('onRemoteDone()', () => {
+        it('should check onRequestEnd is called, moreRows is true and currentFilter is undefined when append is true', () => {
+            spyOn(controller, 'onRequestEnd');
+
+            const append = true;
+            const json = {data: [
+                {
+                    id: 1,
+                    name: 'test'
+                }]};
+            const filter = {limit: 1};
+            controller.onRemoteDone(json, filter, append);
+
+            expect(controller.moreRows).toBe(true);
+            expect(controller.currentFilter).toBeUndefined();
+            expect(controller.onRequestEnd).toHaveBeenCalledWith();
+        });
+
+        it('should check onRequestEnd is called, moreRows is true and currentFilter is defined when append is false', () => {
+            spyOn(controller, 'onRequestEnd');
+
+            const append = false;
+            const json = {data: [
+                {
+                    id: 1,
+                    name: 'test'
+                }]};
+            const filter = {limit: 1};
+            controller.onRemoteDone(json, filter, append);
+
+            expect(controller.moreRows).toBe(true);
+            expect(controller.currentFilter).toBe(filter);
+            expect(controller.onRequestEnd).toHaveBeenCalledWith();
+        });
+    });
+
+    describe('onRemoteError()', () => {
+        it('should check the error', () => {
+            spyOn(controller, 'onRequestEnd');
+
+            let error;
+            try {
+                const newError = new Error('TestError');
+                controller.onRemoteError(newError);
+            } catch (e) {
+                error = e.message;
+            }
+
+            expect(controller.onRequestEnd).toHaveBeenCalledWith();
+            expect(error).toEqual('TestError');
+        });
+    });
 });

modules/ticket/back/models/alert-level.json

@@ -8,22 +8,22 @@
         }
     },
     "properties": {
-      "code": {
-        "type": "String",
-        "id": true,
-        "description": "Identifier"
-      },
-      "alertLevel": {
-        "type": "Number",
-        "id": true
-      }
+        "code": {
+            "type": "String",
+            "id": true,
+            "description": "Identifier"
+        },
+        "alertLevel": {
+            "type": "Number",
+            "id": true
+        }
     },
     "acls": [
-      {
-        "accessType": "READ",
-        "principalType": "ROLE",
-        "principalId": "$everyone",
-        "permission": "ALLOW"
-      }
+        {
+            "accessType": "READ",
+            "principalType": "ROLE",
+            "principalId": "$everyone",
+            "permission": "ALLOW"
+        }
     ]
-  }
+}