inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-19 17:14:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-1162] Form List - Fix the getForms service response (#2125)

Browse Source 
* Fix the getForms service response

* Fix unit test
This commit is contained in:
Maurizio Vitale 2017-07-25 14:08:42 +01:00 committed by Eugenio Romano
parent 92e30c2fa3
commit df32a49c9e
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ng2-components/ng2-activiti-form/src/services/form.service.spec.ts
View File

@ -355,14 +355,19 @@ describe('Form service', () => {
it('should get all the forms with modelType=2', (done) => { it('should get all the forms with modelType=2', (done) => {
service.getForms().subscribe(result => { service.getForms().subscribe(result => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('models?modelType=2')).toBeTruthy(); expect(jasmine.Ajax.requests.mostRecent().url.endsWith('models?modelType=2')).toBeTruthy();
expect(result).toEqual({}); expect(result.length).toEqual(2);
done(); done();
}); });
jasmine.Ajax.requests.mostRecent().respondWith({ jasmine.Ajax.requests.mostRecent().respondWith({
'status': 200, 'status': 200,
contentType: 'application/json', 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' }
]
})
}); });
}); });

6
ng2-components/ng2-activiti-form/src/services/form.service.ts
View File

@ -150,9 +150,9 @@ export class FormService {
'modelType': 2 'modelType': 2
}; };
return Observable.fromPromise( return Observable.fromPromise(this.apiService.getInstance().activiti.modelsApi.getModels(opts))
this.apiService.getInstance().activiti.modelsApi.getModels(opts) .map(this.toJsonArray)
); .catch(err => this.handleError(err));
} }
/** /**