diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts index bf5c5760c7..0ce38ad345 100644 --- a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts +++ b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts @@ -355,14 +355,19 @@ describe('Form service', () => { it('should get all the forms with modelType=2', (done) => { service.getForms().subscribe(result => { expect(jasmine.Ajax.requests.mostRecent().url.endsWith('models?modelType=2')).toBeTruthy(); - expect(result).toEqual({}); + expect(result.length).toEqual(2); done(); }); jasmine.Ajax.requests.mostRecent().respondWith({ 'status': 200, contentType: 'application/json', - responseText: JSON.stringify({}) + responseText: JSON.stringify({ + data: [ + { name: 'FakeName-1', lastUpdatedByFullName: 'FakeUser-1', lastUpdated: '2017-01-02' }, + { name: 'FakeName-2', lastUpdatedByFullName: 'FakeUser-2', lastUpdated: '2017-01-03' } + ] + }) }); }); diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.ts b/ng2-components/ng2-activiti-form/src/services/form.service.ts index e6147e9dc3..e850e77c85 100644 --- a/ng2-components/ng2-activiti-form/src/services/form.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/form.service.ts @@ -150,9 +150,9 @@ export class FormService { 'modelType': 2 }; - return Observable.fromPromise( - this.apiService.getInstance().activiti.modelsApi.getModels(opts) - ); + return Observable.fromPromise(this.apiService.getInstance().activiti.modelsApi.getModels(opts)) + .map(this.toJsonArray) + .catch(err => this.handleError(err)); } /**