From cee56975034e6596e5acc7683b97601d4a24fbf1 Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Mon, 5 Sep 2016 12:19:40 +0100 Subject: [PATCH] Fix unit test --- .../activiti-tasklist.component.spec.ts | 14 +++++++++-- .../activiti-tasklist.service.spec.ts | 23 ++++++++++++++++--- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts index b8374faf83..184e25d791 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-tasklist.component.spec.ts @@ -34,7 +34,7 @@ describe('ActivitiTaskList', () => { let taskList: ActivitiTaskList; let fakeGlobalTask = { - size: 1, total: 12, start: 0, + size: 2, total: 2, start: 0, data: [ { id: 14, name: 'fake-long-name-fake-long-name-fake-long-name-fak50-long-name', description: null, category: null, @@ -51,10 +51,19 @@ describe('ActivitiTaskList', () => { ] }; + let fakeGlobalTotalTasks = { + size: 2, total: 2, start: 0, + data: [] + }; + let fakeGlobalTaskPromise = new Promise(function (resolve, reject) { resolve(fakeGlobalTask); }); + let fakeGlobalTotalTasksPromise = new Promise(function (resolve, reject) { + resolve(fakeGlobalTotalTasks); + }); + let fakeErrorTaskList = { error: 'wrong request' }; @@ -91,6 +100,7 @@ describe('ActivitiTaskList', () => { }); it('should return the filtered task list when the taskFilter is passed', (done) => { + spyOn(taskList.activiti, 'getTotalTasks').and.returnValue(Observable.fromPromise(fakeGlobalTotalTasksPromise)); spyOn(taskList.activiti, 'getTasks').and.returnValue(Observable.fromPromise(fakeGlobalTaskPromise)); taskList.taskFilter = new FilterModel('name', false, 'icon', '', 'open', 'fake-assignee'); @@ -108,7 +118,7 @@ describe('ActivitiTaskList', () => { }); it('should throw an exception when the response is wrong', (done) => { - spyOn(taskList.activiti, 'getTasks').and.returnValue(Observable.fromPromise(fakeErrorTaskPromise)); + spyOn(taskList.activiti, 'getTotalTasks').and.returnValue(Observable.fromPromise(fakeErrorTaskPromise)); taskList.taskFilter = new FilterModel('name', false, 'icon', '', 'open', 'fake-assignee'); taskList.onError.subscribe( (err) => { diff --git a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts index 8684988f3a..d0368efa84 100644 --- a/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/services/activiti-tasklist.service.spec.ts @@ -42,8 +42,7 @@ describe('ActivitiTaskListService', () => { }; let fakeFilter = { - page: 2, filterId: 2, appDefinitionId: null, - filter: {sort: 'created-desc', name: '', state: 'open', assignment: 'fake-assignee'} + sort: 'created-desc', text: '', state: 'open', assignment: 'fake-assignee' }; let fakeUser = {id: 1, email: 'fake-email@dom.com', firstName: 'firstName', lastName: 'lastName'}; @@ -130,7 +129,7 @@ describe('ActivitiTaskListService', () => { it('should return the task list filtered', (done) => { service.getTasks(fakeFilter).subscribe( - res => { + res => { expect(res).toBeDefined(); expect(res.size).toEqual(1); expect(res.total).toEqual(1); @@ -302,4 +301,22 @@ describe('ActivitiTaskListService', () => { }); }); + it('should return the total number of tasks', (done) => { + service.getTotalTasks(fakeFilter).subscribe( + res => { + expect(res).toBeDefined(); + expect(res.size).toEqual(1); + expect(res.total).toEqual(1); + done(); + } + ); + + jasmine.Ajax.requests.mostRecent().respondWith({ + 'status': 200, + contentType: 'application/json', + responseText: JSON.stringify(fakeTaskList) + }); + }); + }); +