mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
Single naming convention for core services (#1363)
* remove temporary file from repo * fix: alfresco-api.service * new: auth.service.ts - new auth.service.ts implementation - deprecation warning for AlfrescoAuthenticationService - fix ‘clean-build’ typo - extra vscode settings for ‘.d.ts’ files * use AuthService internally * new: content.service.ts - deprecation warning for AlfrescoContentService - use new ContentService internally * new: settings.service.ts - new SettingsService - deprecation warning for AlfrescoSettingsService - using new SettingsService internally * new: translate.service and translate-loader.service - custom TranslateLoader becomes AlfrescoTranslateLoader - custom TranslateService becomes AlfrescoTranslateService - deprecation notices for old service and loader implementations * fix: document list * fix: search * fix: tag also fixes #1364 * fix: activiti form * fix: activiti tasklist, improve unit tests * fix: activiti processlist, unit tests improvements * fix: diagram component * fix: analytics component * fix: upload component - fix numerous issues with unit tests (hidden by ‘any’ type) - test improvements * fix: webscript * fix: userinfo unit tests * code fixes * fix 'beforeAll' issue * tasklist unit testing improvements * fix: form unit tests * fix: unit tests
This commit is contained in:
committed by
Maurizio Vitale
parent
92fc7d1df3
commit
facafbd55c
@@ -22,9 +22,9 @@ import { BpmUserModel } from '../models/bpm-user.model';
|
||||
import { TranslationMock } from '../assets/translation.service.mock';
|
||||
import {
|
||||
CoreModule,
|
||||
AlfrescoAuthenticationService,
|
||||
AlfrescoContentService,
|
||||
AlfrescoTranslationService
|
||||
AuthService,
|
||||
ContentService,
|
||||
AlfrescoTranslateService
|
||||
} from 'ng2-alfresco-core';
|
||||
import { ComponentFixture, TestBed, async } from '@angular/core/testing';
|
||||
|
||||
@@ -73,25 +73,32 @@ describe('User info component', () => {
|
||||
let userInfoComp: UserInfoComponent;
|
||||
let fixture: ComponentFixture<UserInfoComponent>;
|
||||
let element: HTMLElement;
|
||||
let stubAuthService: AlfrescoAuthenticationService;
|
||||
let stubContent: AlfrescoContentService;
|
||||
let stubAuthService: AuthService;
|
||||
let stubContent: ContentService;
|
||||
let componentHandler;
|
||||
|
||||
beforeEach(async(() => {
|
||||
componentHandler = jasmine.createSpyObj('componentHandler', ['upgradeAllRegistered', 'upgradeElement']);
|
||||
window['componentHandler'] = componentHandler;
|
||||
TestBed.configureTestingModule({
|
||||
imports: [CoreModule],
|
||||
declarations: [UserInfoComponent],
|
||||
providers: [EcmUserService,
|
||||
imports: [
|
||||
CoreModule.forRoot()
|
||||
],
|
||||
declarations: [
|
||||
UserInfoComponent
|
||||
],
|
||||
providers: [
|
||||
EcmUserService,
|
||||
BpmUserService,
|
||||
AlfrescoAuthenticationService,
|
||||
{provide: AlfrescoTranslationService, useClass: TranslationMock}
|
||||
{provide: AlfrescoTranslateService, useClass: TranslationMock}
|
||||
]
|
||||
}).compileComponents().then(() => {
|
||||
fixture = TestBed.createComponent(UserInfoComponent);
|
||||
userInfoComp = fixture.componentInstance;
|
||||
element = fixture.nativeElement;
|
||||
|
||||
stubAuthService = TestBed.get(AuthService);
|
||||
stubContent = TestBed.get(ContentService);
|
||||
});
|
||||
}));
|
||||
|
||||
@@ -138,8 +145,6 @@ describe('User info component', () => {
|
||||
describe('when user is logged on ecm', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
stubAuthService = fixture.debugElement.injector.get(AlfrescoAuthenticationService);
|
||||
stubContent = fixture.debugElement.injector.get(AlfrescoContentService);
|
||||
spyOn(stubAuthService, 'isEcmLoggedIn').and.returnValue(true);
|
||||
spyOn(stubAuthService, 'isLoggedIn').and.returnValue(true);
|
||||
});
|
||||
@@ -242,7 +247,6 @@ describe('User info component', () => {
|
||||
let fakeBpmUserForTest;
|
||||
|
||||
beforeEach(() => {
|
||||
stubAuthService = fixture.debugElement.injector.get(AlfrescoAuthenticationService);
|
||||
spyOn(stubAuthService, 'isBpmLoggedIn').and.returnValue(true);
|
||||
spyOn(stubAuthService, 'isLoggedIn').and.returnValue(true);
|
||||
jasmine.Ajax.install();
|
||||
@@ -323,8 +327,6 @@ describe('User info component', () => {
|
||||
describe('when user is logged on bpm and ecm', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
stubAuthService = fixture.debugElement.injector.get(AlfrescoAuthenticationService);
|
||||
stubContent = fixture.debugElement.injector.get(AlfrescoContentService);
|
||||
spyOn(stubAuthService, 'isEcmLoggedIn').and.returnValue(true);
|
||||
spyOn(stubAuthService, 'isBpmLoggedIn').and.returnValue(true);
|
||||
spyOn(stubAuthService, 'isLoggedIn').and.returnValue(true);
|
||||
|
Reference in New Issue
Block a user