diff --git a/ng2-components/ng2-alfresco-userinfo/karma.conf.js b/ng2-components/ng2-alfresco-userinfo/karma.conf.js index 4dfc103d4d..8f3adc54b4 100644 --- a/ng2-components/ng2-alfresco-userinfo/karma.conf.js +++ b/ng2-components/ng2-alfresco-userinfo/karma.conf.js @@ -49,8 +49,6 @@ module.exports = function (config) { // paths to support debugging with source maps in dev tools {pattern: 'src/**/*.ts', included: false, watched: false}, {pattern: 'dist/**/*.js.map', included: false, watched: false} - // fake file path - { pattern: '/base/dist/src/img/anonymous.gif', included: false, watched: true, served: true } ], exclude: [ diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.mock.ts similarity index 100% rename from ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.ts rename to ng2-components/ng2-alfresco-userinfo/src/assets/fake-bpm-user.service.mock.ts diff --git a/ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.mock.ts similarity index 100% rename from ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.ts rename to ng2-components/ng2-alfresco-userinfo/src/assets/fake-ecm-user.service.mock.ts diff --git a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts index bb86e401f0..e9fede4d72 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/components/user-info.component.spec.ts @@ -18,8 +18,8 @@ import { UserInfoComponent } from './user-info.component'; import { EcmUserService } from '../services/ecm-user.service'; import { BpmUserService } from '../services/bpm-user.service'; -import { FakeEcmUserService } from '../assets/fake-ecm-user.service'; -import { FakeBpmUserService } from '../assets/fake-bpm-user.service'; +import { FakeEcmUserService } from '../assets/fake-ecm-user.service.mock'; +import { FakeBpmUserService } from '../assets/fake-bpm-user.service.mock'; import { AlfrescoAuthenticationService, AlfrescoContentService } from 'ng2-alfresco-core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts index 422ebbba39..352935c6e5 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.spec.ts @@ -17,8 +17,9 @@ import { ReflectiveInjector } from '@angular/core'; import { BpmUserService } from '../services/bpm-user.service'; +// import { BpmUserModel } from '../models/bpm-user.model'; import { AlfrescoAuthenticationService, AlfrescoApiService, AlfrescoSettingsService } from 'ng2-alfresco-core'; -import { fakeBpmUser } from '../assets/fake-bpm-user.service'; +import { fakeBpmUser } from '../assets/fake-bpm-user.service.mock'; declare let jasmine: any; @@ -38,9 +39,6 @@ describe('Bpm User service', () => { beforeEach(() => { service = injector.get(BpmUserService); authService = injector.get(AlfrescoAuthenticationService); - }); - - beforeEach(() => { jasmine.Ajax.install(); }); @@ -61,20 +59,19 @@ describe('Bpm User service', () => { }); it('should be able to retrieve current user info', (done) => { - spyOn(service, 'getCurrentUserProfileImage').and.callThrough(); service.getCurrentUserInfo().subscribe( (user) => { - expect(user).toBeDefined(); - expect(user.firstName).toEqual('fake-first-name'); - expect(user.lastName).toEqual('fake-last-name'); - expect(user.email).toEqual('fakeBpm@fake.com'); + expect(user.fakeBpmUser).toBeDefined(); + expect(user.fakeBpmUser.firstName).toEqual('fake-first-name'); + expect(user.fakeBpmUser.lastName).toEqual('fake-last-name'); + expect(user.fakeBpmUser.email).toEqual('fakeBpm@fake.com'); done(); }); jasmine.Ajax.requests.mostRecent().respondWith({ status: 200, contentType: 'json', - responseText: fakeBpmUser + responseText: { fakeBpmUser } }); }); @@ -85,6 +82,7 @@ describe('Bpm User service', () => { expect(path).toEqual('fake/img/path'); done(); }); + jasmine.Ajax.requests.mostRecent().respondWith({ status: 200, contentType: 'json', @@ -92,23 +90,16 @@ describe('Bpm User service', () => { }); }); }); -/* - describe('when user is not logged in', () => { + describe('when user is not logged in', () => { beforeEach(() => { spyOn(authService, 'isBpmLoggedIn').and.returnValue(false); }); - it('should not retrieve the user information', () => { - spyOn(service, 'callApiGetProfile'); - service.getCurrentUserInfo(); - expect(service.callApiGetProfile).not.toHaveBeenCalled(); - }); - it('should not retrieve the user avatar', () => { - spyOn(service, 'callApiGetProfilePicture'); + spyOn(service, 'callGetProfilePictureApi'); service.getCurrentUserInfo(); - expect(service.callApiGetProfilePicture).not.toHaveBeenCalled(); + expect(service.callGetProfilePictureApi).not.toHaveBeenCalled(); }); - });*/ + }); }); diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts index b20b1362e4..3877268b4f 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/bpm-user.service.ts @@ -38,7 +38,7 @@ export class BpmUserService { */ getCurrentUserInfo(): Observable { if ( this.authService.isBpmLoggedIn() ) { - return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.profileApi.getProfilePicture()) + return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.profileApi.getProfile()) .map( (data) => data ) @@ -48,7 +48,7 @@ export class BpmUserService { getCurrentUserProfileImage(): Observable { if ( this.authService.isBpmLoggedIn() ) { - return Observable.fromPromise(this.authService.getAlfrescoApi().activiti.profileApi.getProfile()) + return Observable.fromPromise(this.callGetProfilePictureApi()) .map( (data) => data ) @@ -56,6 +56,10 @@ export class BpmUserService { } } + callGetProfilePictureApi() { + return this.authService.getAlfrescoApi().activiti.profileApi.getProfilePicture(); + } + /** * Throw the error * @param error diff --git a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts index 1f82d78995..2449193f70 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/services/ecm-user.service.spec.ts @@ -23,7 +23,7 @@ import { AlfrescoContentService } from 'ng2-alfresco-core'; import { EcmUserService } from '../services/ecm-user.service'; -import { fakeEcmUser } from '../assets/fake-ecm-user.service'; +import { fakeEcmUser } from '../assets/fake-ecm-user.service.mock'; declare let jasmine: any; @@ -88,6 +88,16 @@ describe('Ecm User service', () => { }); }); + it('should be able to log errors on call', (done) => { + service.getCurrentUserInfo().subscribe(() => {}, () => { + done(); + }); + + jasmine.Ajax.requests.mostRecent().respondWith({ + status: 403 + }); + }); + it('should retrieve avatar url for current user', () => { spyOn(contentService, 'getContentUrl').and.returnValue('fake/url/image/for/ecm/user'); let urlRs = service.getUserProfileImage('fake-avatar-id');