diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.service.spec.ts b/lib/content-services/src/lib/aspect-list/aspect-list.service.spec.ts index 1db6c5aa47..6236a542cb 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list.service.spec.ts +++ b/lib/content-services/src/lib/aspect-list/aspect-list.service.spec.ts @@ -142,16 +142,25 @@ describe('AspectListService', () => { describe('should fetch the list of the aspects', () => { let service: AspectListService; - const appConfigService: AppConfigService = new AppConfigService(null); - - const aspectTypesApi = jasmine.createSpyObj('AspectsApi', ['listAspects']); - const apiService: AlfrescoApiService = new AlfrescoApiService(null, null); - const logService: LogService = new LogService(appConfigService); + let appConfigService: AppConfigService; + let apiService: AlfrescoApiService; + let logService: LogService; + let aspectTypesApi: any; beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ContentTestingModule] + }); + + aspectTypesApi = jasmine.createSpyObj('AspectsApi', ['listAspects']); + appConfigService = TestBed.inject(AppConfigService); + apiService = TestBed.inject(AlfrescoApiService); + logService = TestBed.inject(LogService); + spyOn(appConfigService, 'get').and.returnValue({ 'default': ['frs:AspectOne'] }); spyOnProperty(apiService, 'aspectsApi').and.returnValue(aspectTypesApi); - service = new AspectListService(apiService, appConfigService, null, logService); + + service = TestBed.inject(AspectListService); }); it('should get the list of only available aspects', async(() => { diff --git a/lib/content-services/src/lib/document-list/services/custom-resources.service.spec.ts b/lib/content-services/src/lib/document-list/services/custom-resources.service.spec.ts index 4219858680..4d7a114b67 100644 --- a/lib/content-services/src/lib/document-list/services/custom-resources.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/custom-resources.service.spec.ts @@ -16,16 +16,19 @@ */ import { CustomResourcesService } from './custom-resources.service'; -import { PaginationModel, AlfrescoApiServiceMock, AppConfigService, LogService, AppConfigServiceMock, StorageService } from '@alfresco/adf-core'; +import { PaginationModel } from '@alfresco/adf-core'; +import { TestBed } from '@angular/core/testing'; +import { ContentTestingModule } from '../../testing/content.testing.module'; describe('CustomResourcesService', () => { let customResourcesService: CustomResourcesService; beforeEach(() => { - const logService = new LogService(new AppConfigServiceMock(null)); - const alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); + TestBed.configureTestingModule({ + imports: [ContentTestingModule] + }); - customResourcesService = new CustomResourcesService(alfrescoApiService, logService); + customResourcesService = TestBed.inject(CustomResourcesService); }); describe('loadFavorites', () => { diff --git a/lib/content-services/src/lib/document-list/services/document-actions.service.spec.ts b/lib/content-services/src/lib/document-list/services/document-actions.service.spec.ts index 3ce6fcc54d..20cd687c91 100644 --- a/lib/content-services/src/lib/document-list/services/document-actions.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/document-actions.service.spec.ts @@ -15,9 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiServiceMock, AppConfigService, ContentService, - setupTestBed, TranslationMock, AlfrescoApiService, StorageService -} from '@alfresco/adf-core'; +import { setupTestBed } from '@alfresco/adf-core'; import { FileNode, FolderNode } from '../../mock'; import { ContentActionHandler } from '../models/content-action.model'; import { DocumentActionsService } from './document-actions.service'; @@ -36,21 +34,12 @@ describe('DocumentActionsService', () => { imports: [ TranslateModule.forRoot(), ContentTestingModule - ], - providers: [ - { - provide: AlfrescoApiService, - useValue: new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()) - } ] }); beforeEach(() => { - const alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); - const contentService = TestBed.inject(ContentService); - - documentListService = new DocumentListService(contentService, alfrescoApiService, null, null); - service = new DocumentActionsService(null, null, new TranslationMock(), documentListService, contentService); + documentListService = TestBed.inject(DocumentListService); + service = TestBed.inject(DocumentActionsService); }); it('should register default download action', () => { diff --git a/lib/content-services/src/lib/document-list/services/document-list.service.spec.ts b/lib/content-services/src/lib/document-list/services/document-list.service.spec.ts index dbf0a3ca86..6086dd964d 100644 --- a/lib/content-services/src/lib/document-list/services/document-list.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/document-list.service.spec.ts @@ -15,10 +15,8 @@ * limitations under the License. */ -import { AlfrescoApiServiceMock, AlfrescoApiService, - AppConfigService, ContentService, setupTestBed, LogService, AppConfigServiceMock, StorageService } from '@alfresco/adf-core'; +import { AlfrescoApiService, setupTestBed } from '@alfresco/adf-core'; import { DocumentListService } from './document-list.service'; -import { CustomResourcesService } from './custom-resources.service'; import { TestBed } from '@angular/core/testing'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -72,11 +70,8 @@ describe('DocumentListService', () => { }); beforeEach(() => { - const logService = new LogService(new AppConfigServiceMock(null)); - const contentService = TestBed.inject(ContentService); - alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); - const customActionService = new CustomResourcesService(alfrescoApiService, logService); - service = new DocumentListService(contentService, alfrescoApiService, logService, customActionService); + alfrescoApiService = TestBed.inject(AlfrescoApiService); + service = TestBed.inject(DocumentListService); jasmine.Ajax.install(); }); diff --git a/lib/content-services/src/lib/document-list/services/folder-actions.service.spec.ts b/lib/content-services/src/lib/document-list/services/folder-actions.service.spec.ts index 58d83ffef8..46ea4daaac 100644 --- a/lib/content-services/src/lib/document-list/services/folder-actions.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/folder-actions.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { AlfrescoApiServiceMock, AppConfigService, ContentService, setupTestBed, TranslationMock, StorageService } from '@alfresco/adf-core'; +import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; import { Observable } from 'rxjs'; import { FileNode, FolderNode } from '../../mock'; import { ContentActionHandler } from '../models/content-action.model'; @@ -41,10 +41,8 @@ describe('FolderActionsService', () => { const appConfig: AppConfigService = TestBed.inject(AppConfigService); appConfig.config.ecmHost = 'http://localhost:9876/ecm'; - const contentService = TestBed.inject(ContentService); - const alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); - documentListService = new DocumentListService(contentService, alfrescoApiService, null, null); - service = new FolderActionsService(null, documentListService, contentService, new TranslationMock()); + documentListService = TestBed.inject(DocumentListService); + service = TestBed.inject(FolderActionsService); }); it('should register custom action handler', () => { diff --git a/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts b/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts index 22e6da6fe8..272faed301 100644 --- a/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts @@ -19,6 +19,8 @@ import { SearchSortingPickerComponent } from './search-sorting-picker.component' import { SearchQueryBuilderService } from '../../search-query-builder.service'; import { AppConfigService } from '@alfresco/adf-core'; import { SearchConfiguration } from '../../search-configuration.interface'; +import { TestBed } from '@angular/core/testing'; +import { ContentTestingModule } from '../../../testing/content.testing.module'; describe('SearchSortingPickerComponent', () => { @@ -26,12 +28,16 @@ describe('SearchSortingPickerComponent', () => { let component: SearchSortingPickerComponent; const buildConfig = (searchSettings): AppConfigService => { - const config = new AppConfigService(null); + const config = TestBed.inject(AppConfigService); config.config.search = searchSettings; return config; }; beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ContentTestingModule] + }); + const config: SearchConfiguration = { sorting: { options: [ diff --git a/lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts b/lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts index 14f7dc6664..b3716aea72 100644 --- a/lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts +++ b/lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts @@ -18,11 +18,19 @@ import { SearchConfiguration } from './search-configuration.interface'; import { AppConfigService } from '@alfresco/adf-core'; import { SearchHeaderQueryBuilderService } from './search-header-query-builder.service'; +import { TestBed } from '@angular/core/testing'; +import { ContentTestingModule } from '../testing/content.testing.module'; describe('SearchHeaderQueryBuilderService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ContentTestingModule] + }); + }); + const buildConfig = (searchSettings): AppConfigService => { - const config = new AppConfigService(null); + const config = TestBed.inject(AppConfigService); config.config['search-headers'] = searchSettings; return config; }; diff --git a/lib/content-services/src/lib/search/search-query-builder.service.spec.ts b/lib/content-services/src/lib/search/search-query-builder.service.spec.ts index 6dc326a7e0..f0257f5b82 100644 --- a/lib/content-services/src/lib/search/search-query-builder.service.spec.ts +++ b/lib/content-services/src/lib/search/search-query-builder.service.spec.ts @@ -19,11 +19,19 @@ import { SearchQueryBuilderService } from './search-query-builder.service'; import { SearchConfiguration } from './search-configuration.interface'; import { AppConfigService } from '@alfresco/adf-core'; import { FacetField } from './facet-field.interface'; +import { TestBed } from '@angular/core/testing'; +import { ContentTestingModule } from '../testing/content.testing.module'; describe('SearchQueryBuilder', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ContentTestingModule] + }); + }); + const buildConfig = (searchSettings): AppConfigService => { - const config = new AppConfigService(null); + const config = TestBed.inject(AppConfigService); config.config.search = searchSettings; return config; }; diff --git a/lib/core/app-config/app-config.service.spec.ts b/lib/core/app-config/app-config.service.spec.ts index 07e620d123..9b3e4d3d42 100644 --- a/lib/core/app-config/app-config.service.spec.ts +++ b/lib/core/app-config/app-config.service.spec.ts @@ -15,16 +15,25 @@ * limitations under the License. */ -import { HttpClientModule } from '@angular/common/http'; -import { async, inject, TestBed } from '@angular/core/testing'; +import { HttpClient, HttpClientModule } from '@angular/common/http'; +import { async, TestBed } from '@angular/core/testing'; import { AppConfigService } from './app-config.service'; import { AppConfigModule } from './app-config.module'; +import { ExtensionConfig, ExtensionService } from '@alfresco/adf-extensions'; +import { of } from 'rxjs'; -declare let jasmine: any; +class TestExtensionService extends ExtensionService { + + onSetup(config: ExtensionConfig) { + this.onSetup$.next(config); + } +} describe('AppConfigService', () => { let appConfigService: AppConfigService; + let extensionService: ExtensionService; + let httpClient: HttpClient; const mockResponse = { ecmHost: 'http://localhost:4000/ecm', @@ -46,32 +55,60 @@ describe('AppConfigService', () => { AppConfigModule ], providers: [ - { provide: AppConfigService, useClass: AppConfigService } + { provide: ExtensionService, useClass: TestExtensionService } ] }); - - jasmine.Ajax.install(); }); - beforeEach( - inject([AppConfigService], (appConfig: AppConfigService) => { - appConfigService = appConfig; - appConfigService.load(); + beforeEach(() => { + httpClient = TestBed.inject(HttpClient); + spyOn(httpClient, 'get').and.returnValue(of(mockResponse)); - jasmine.Ajax.requests.mostRecent().respondWith({ - 'status': 200, - contentType: 'application/json', - responseText: JSON.stringify(mockResponse) - }); - }) - ); + extensionService = TestBed.inject(ExtensionService); - afterEach(() => { - jasmine.Ajax.uninstall(); + appConfigService = TestBed.inject(AppConfigService); + appConfigService.load(); }); - it('should export service in the module', () => { - expect(appConfigService).toBeDefined(); + it('should merge the configs from extensions', () => { + appConfigService.config = { + application: { + name: 'application name' + } + }; + + (extensionService as TestExtensionService).onSetup({ + appConfig: { + application: { + name: 'custom name' + } + } + } as any); + + expect(appConfigService.get('application.name')).toEqual('custom name'); + }); + + it('should merge the configs upon new data loaded', async (done) => { + appConfigService.config = { + application: { + name: 'application name' + } + }; + + (extensionService as TestExtensionService).onSetup({ + appConfig: { + application: { + name: 'custom name' + } + } + } as any); + + expect(appConfigService.get('application.name')).toEqual('custom name'); + + await appConfigService.load(); + + expect(appConfigService.get('application.name')).toEqual('custom name'); + done(); }); it('should stream only the selected attribute changes when using select', async(() => { diff --git a/lib/core/app-config/app-config.service.ts b/lib/core/app-config/app-config.service.ts index d433e91ab4..3b160d4c2c 100644 --- a/lib/core/app-config/app-config.service.ts +++ b/lib/core/app-config/app-config.service.ts @@ -19,7 +19,8 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { ObjectUtils } from '../utils/object-utils'; import { Observable, Subject } from 'rxjs'; -import { map, distinctUntilChanged } from 'rxjs/operators'; +import { map, distinctUntilChanged, take } from 'rxjs/operators'; +import { ExtensionConfig, ExtensionService, mergeObjects } from '@alfresco/adf-extensions'; /* spellchecker: disable */ export enum AppConfigValues { @@ -69,9 +70,13 @@ export class AppConfigService { protected onLoadSubject: Subject; onLoad: Observable; - constructor(private http: HttpClient) { + constructor(protected http: HttpClient, protected extensionService: ExtensionService) { this.onLoadSubject = new Subject(); this.onLoad = this.onLoadSubject.asObservable(); + + extensionService.setup$.subscribe((config) => { + this.onExtensionsLoaded(config); + }); } /** @@ -142,6 +147,29 @@ export class AppConfigService { return location.port ? prefix + location.port : ''; } + protected onLoaded() { + this.onLoadSubject.next(this.config); + } + + protected onDataLoaded(data: any) { + this.config = Object.assign({}, this.config, data || {}); + this.onLoadSubject.next(this.config); + + this.extensionService.setup$ + .pipe(take(1)) + .subscribe((config) => this.onExtensionsLoaded(config)); + } + + protected onExtensionsLoaded(config: ExtensionConfig) { + if (config) { + const customConfig = config.appConfig; + + if (customConfig) { + this.config = mergeObjects(this.config, customConfig); + } + } + } + /** * Loads the config file. * @returns Notification when loading is complete @@ -152,11 +180,10 @@ export class AppConfigService { if (this.status === Status.INIT) { this.status = Status.LOADING; - await this.http.get(configUrl).subscribe( + this.http.get(configUrl).subscribe( (data: any) => { this.status = Status.LOADED; - this.config = Object.assign({}, this.config, data || {}); - this.onLoadSubject.next(this.config); + this.onDataLoaded(data); resolve(this.config); }, () => { diff --git a/lib/core/app-config/debug-app-config.service.ts b/lib/core/app-config/debug-app-config.service.ts index 352e31ec05..c05d6ab8c6 100644 --- a/lib/core/app-config/debug-app-config.service.ts +++ b/lib/core/app-config/debug-app-config.service.ts @@ -19,11 +19,12 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { StorageService } from '../services/storage.service'; import { AppConfigService, AppConfigValues } from '../app-config/app-config.service'; +import { ExtensionService } from '@alfresco/adf-extensions'; @Injectable() export class DebugAppConfigService extends AppConfigService { - constructor(private storage: StorageService, http: HttpClient) { - super(http); + constructor(private storage: StorageService, http: HttpClient, extensionService: ExtensionService) { + super(http, extensionService); } /** @override */ diff --git a/lib/core/datatable/components/datatable-cell/datatable-cell.component.spec.ts b/lib/core/datatable/components/datatable-cell/datatable-cell.component.spec.ts index d048b56be0..9ce65ccee3 100644 --- a/lib/core/datatable/components/datatable-cell/datatable-cell.component.spec.ts +++ b/lib/core/datatable/components/datatable-cell/datatable-cell.component.spec.ts @@ -17,25 +17,39 @@ import { DateCellComponent } from '../date-cell/date-cell.component'; import { Subject } from 'rxjs'; -import { AlfrescoApiServiceMock, AppConfigService, StorageService } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { Node } from '@alfresco/js-api'; +import { TestBed } from '@angular/core/testing'; +import { CoreTestingModule } from '../../../testing'; +import { AlfrescoApiService } from '../../../services/alfresco-api.service'; +import { CoreModule } from '../../../core.module'; +import { TranslateModule } from '@ngx-translate/core'; describe('DataTableCellComponent', () => { - let alfrescoApiService: AlfrescoApiServiceMock; + let alfrescoApiService: AlfrescoApiService; + let appConfigService: AppConfigService; beforeEach(() => { - alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot(), + TranslateModule.forRoot(), + CoreTestingModule + ] + }); + alfrescoApiService = TestBed.inject(AlfrescoApiService); + appConfigService = TestBed.inject(AppConfigService); }); it('should use medium format by default', () => { - const component = new DateCellComponent(null, null, new AppConfigService(null)); + const component = new DateCellComponent(null, null, appConfigService); expect(component.format).toBe('medium'); }); it('should use column format', () => { const component = new DateCellComponent(null, { nodeUpdated: new Subject() - }, new AppConfigService(null)); + }, appConfigService); component.column = { key: 'created', type: 'date', @@ -50,7 +64,7 @@ describe('DataTableCellComponent', () => { const component = new DateCellComponent( null, alfrescoApiService, - new AppConfigService(null) + appConfigService ); component.column = { @@ -85,7 +99,7 @@ describe('DataTableCellComponent', () => { const component = new DateCellComponent( null, alfrescoApiService, - new AppConfigService(null) + appConfigService ); component.column = { @@ -120,7 +134,7 @@ describe('DataTableCellComponent', () => { const component = new DateCellComponent( null, alfrescoApiService, - new AppConfigService(null) + appConfigService ); component.column = { diff --git a/lib/core/directives/library-membership.directive.spec.ts b/lib/core/directives/library-membership.directive.spec.ts index 0a47982556..0e225c2054 100644 --- a/lib/core/directives/library-membership.directive.spec.ts +++ b/lib/core/directives/library-membership.directive.spec.ts @@ -23,7 +23,7 @@ import { of, throwError, Subject } from 'rxjs'; import { TranslateModule } from '@ngx-translate/core'; import { DirectiveModule } from './directive.module'; import { CoreModule } from '../core.module'; -import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; +import { CoreTestingModule } from '../testing/core.testing.module'; describe('LibraryMembershipDirective', () => { let alfrescoApiService: AlfrescoApiService; @@ -40,9 +40,11 @@ describe('LibraryMembershipDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot(), DirectiveModule, CoreModule.forRoot()], - providers: [ - { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock } + imports: [ + TranslateModule.forRoot(), + DirectiveModule, + CoreModule.forRoot(), + CoreTestingModule ], schemas: [NO_ERRORS_SCHEMA] }); diff --git a/lib/core/directives/node-favorite.directive.spec.ts b/lib/core/directives/node-favorite.directive.spec.ts index 8f24492f49..109db075e8 100644 --- a/lib/core/directives/node-favorite.directive.spec.ts +++ b/lib/core/directives/node-favorite.directive.spec.ts @@ -16,19 +16,17 @@ */ import { SimpleChange } from '@angular/core'; -import { fakeAsync, tick } from '@angular/core/testing'; +import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { NodeFavoriteDirective } from './node-favorite.directive'; -import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; -import { AppConfigService } from '../app-config/app-config.service'; import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; -import { StorageService } from '../services/storage.service'; import { TranslateModule } from '@ngx-translate/core'; +import { AlfrescoApiService } from '../services/alfresco-api.service'; describe('NodeFavoriteDirective', () => { - let directive; - let alfrescoApiService; + let directive: NodeFavoriteDirective; + let alfrescoApiService: AlfrescoApiService; setupTestBed({ imports: [ @@ -38,7 +36,7 @@ describe('NodeFavoriteDirective', () => { }); beforeEach(() => { - alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); + alfrescoApiService = TestBed.inject(AlfrescoApiService); directive = new NodeFavoriteDirective( alfrescoApiService); }); diff --git a/lib/core/mock/alfresco-api.service.mock.ts b/lib/core/mock/alfresco-api.service.mock.ts index 1460b2a986..4106f67aab 100644 --- a/lib/core/mock/alfresco-api.service.mock.ts +++ b/lib/core/mock/alfresco-api.service.mock.ts @@ -35,7 +35,7 @@ export class AlfrescoApiServiceMock extends AlfrescoApiService { initialize(): Promise { return new Promise((resolve) => { this.alfrescoApiInitialized.next(true); - resolve(); + resolve({}); }); } } diff --git a/lib/core/mock/app-config.service.mock.ts b/lib/core/mock/app-config.service.mock.ts index 7e4b80cdc4..2be5677b25 100644 --- a/lib/core/mock/app-config.service.mock.ts +++ b/lib/core/mock/app-config.service.mock.ts @@ -16,8 +16,9 @@ */ import { Injectable } from '@angular/core'; -import { AppConfigService } from '../app-config/app-config.service'; +import { AppConfigService, Status } from '../app-config/app-config.service'; import { HttpClient } from '@angular/common/http'; +import { ExtensionService } from '@alfresco/adf-extensions'; @Injectable() export class AppConfigServiceMock extends AppConfigService { @@ -30,13 +31,14 @@ export class AppConfigServiceMock extends AppConfigService { logLevel: 'silent' }; - constructor(http: HttpClient) { - super(http); + constructor(http: HttpClient, extensionService: ExtensionService) { + super(http, extensionService); } load(): Promise { return new Promise((resolve) => { - this.onLoadSubject.next(this.config); + this.status = Status.LOADED; + this.onDataLoaded(this.config); resolve(this.config); }); } diff --git a/lib/core/mock/search.service.mock.ts b/lib/core/mock/search.service.mock.ts index 8f2286b9f1..407a16de35 100644 --- a/lib/core/mock/search.service.mock.ts +++ b/lib/core/mock/search.service.mock.ts @@ -59,5 +59,8 @@ export let searchMockApi = { queriesApi: { findNodes: () => Promise.resolve(fakeSearch) } + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/core/pipes/decimal-number.pipe.spec.ts b/lib/core/pipes/decimal-number.pipe.spec.ts index ada9166b19..a66763c7f2 100644 --- a/lib/core/pipes/decimal-number.pipe.spec.ts +++ b/lib/core/pipes/decimal-number.pipe.spec.ts @@ -39,7 +39,7 @@ describe('DecimalNumberPipe', () => { beforeEach(async(() => { userPreferences = TestBed.inject(UserPreferencesService); spyOn(userPreferences, 'select').and.returnValue(of('')); - pipe = new DecimalNumberPipe(userPreferences, new AppConfigService(null)); + pipe = new DecimalNumberPipe(userPreferences, TestBed.inject(AppConfigService)); })); it('should return number localized and rounded following the default config', () => { diff --git a/lib/core/pipes/localized-date.pipe.spec.ts b/lib/core/pipes/localized-date.pipe.spec.ts index 546ffd77ef..ede84b5ae9 100644 --- a/lib/core/pipes/localized-date.pipe.spec.ts +++ b/lib/core/pipes/localized-date.pipe.spec.ts @@ -42,7 +42,7 @@ describe('LocalizedDatePipe', () => { beforeEach(async(() => { userPreferences = TestBed.inject(UserPreferencesService); spyOn(userPreferences, 'select').and.returnValue(of('')); - pipe = new LocalizedDatePipe(userPreferences, new AppConfigService(null)); + pipe = new LocalizedDatePipe(userPreferences, TestBed.inject(AppConfigService)); })); it('should return time with locale en-US', () => { diff --git a/lib/core/pipes/time-ago.pipe.spec.ts b/lib/core/pipes/time-ago.pipe.spec.ts index c1273a802b..e815981eda 100644 --- a/lib/core/pipes/time-ago.pipe.spec.ts +++ b/lib/core/pipes/time-ago.pipe.spec.ts @@ -39,7 +39,7 @@ describe('TimeAgoPipe', () => { beforeEach(async(() => { userPreferences = TestBed.inject(UserPreferencesService); spyOn(userPreferences, 'select').and.returnValue(of('')); - pipe = new TimeAgoPipe(userPreferences, new AppConfigService(null)); + pipe = new TimeAgoPipe(userPreferences, TestBed.inject(AppConfigService)); })); it('should return time difference for a given date', () => { diff --git a/lib/core/services/nodes-api.service.spec.ts b/lib/core/services/nodes-api.service.spec.ts index 2091cf49ed..8b6e2e6cff 100644 --- a/lib/core/services/nodes-api.service.spec.ts +++ b/lib/core/services/nodes-api.service.spec.ts @@ -45,6 +45,9 @@ describe('NodesApiService', () => { getNodeChildren: jasmine.createSpy('getNodeChildren'), addNode: jasmine.createSpy('addNode') } + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/core/services/user-preferences.service.spec.ts b/lib/core/services/user-preferences.service.spec.ts index 830e0f1f04..e7bece60f1 100644 --- a/lib/core/services/user-preferences.service.spec.ts +++ b/lib/core/services/user-preferences.service.spec.ts @@ -23,7 +23,8 @@ import { UserPreferencesService, UserPreferenceValues } from './user-preferences import { setupTestBed } from '../testing/setup-test-bed'; import { CoreTestingModule } from '../testing/core.testing.module'; import { AppConfigServiceMock } from '../mock/app-config.service.mock'; -import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; +import { AlfrescoApiService } from './alfresco-api.service'; +import { AlfrescoApiServiceMock } from '../mock'; describe('UserPreferencesService', () => { @@ -53,7 +54,7 @@ describe('UserPreferencesService', () => { storage = TestBed.inject(StorageService); translate = TestBed.inject(TranslateService); - alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); + alfrescoApiService = TestBed.inject(AlfrescoApiService) as AlfrescoApiServiceMock; }); beforeEach(() => { @@ -71,7 +72,7 @@ describe('UserPreferencesService', () => { describe(' with pagination config', () => { beforeEach(() => { - preferences = new UserPreferencesService(translate, appConfig, storage, alfrescoApiService); + preferences = TestBed.inject(UserPreferencesService); }); it('should get default pagination from app config', (done) => { @@ -183,7 +184,6 @@ describe('UserPreferencesService', () => { } ]; appConfig.config.locale = 'fake-locale-config'; - preferences = new UserPreferencesService(translate, appConfig, storage, alfrescoApiService); alfrescoApiService.initialize(); const textOrientation = preferences.getPropertyKey('textOrientation'); expect(storage.getItem(textOrientation)).toBe('ltr'); @@ -197,7 +197,6 @@ describe('UserPreferencesService', () => { } ]; appConfig.config.locale = 'fake-locale-config'; - preferences = new UserPreferencesService(translate, appConfig, storage, alfrescoApiService); alfrescoApiService.initialize(); const textOrientation = preferences.getPropertyKey('textOrientation'); expect(storage.getItem(textOrientation)).toBe('rtl'); @@ -209,7 +208,6 @@ describe('UserPreferencesService', () => { key: 'fake-locale-browser' } ]; - preferences = new UserPreferencesService(translate, appConfig, storage, alfrescoApiService); alfrescoApiService.initialize(); const textOrientation = preferences.getPropertyKey('textOrientation'); @@ -224,7 +222,6 @@ describe('UserPreferencesService', () => { } ]; spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locale-browser'); - preferences = new UserPreferencesService(translate, appConfig, storage, alfrescoApiService); alfrescoApiService.initialize(); changeDisposable = preferences.onChange diff --git a/lib/core/testing/core.testing.module.ts b/lib/core/testing/core.testing.module.ts index 76ecf25e5c..100cd31c5a 100644 --- a/lib/core/testing/core.testing.module.ts +++ b/lib/core/testing/core.testing.module.ts @@ -40,8 +40,8 @@ import { VersionCompatibilityService } from '../services/version-compatibility.s NoopAnimationsModule, RouterTestingModule, HttpClientModule, - TranslateModule, - CoreModule + TranslateModule.forRoot(), + CoreModule.forRoot() ], providers: [ DatePipe, diff --git a/lib/core/viewer/components/media-player.component.spec.ts b/lib/core/viewer/components/media-player.component.spec.ts index 55c0623fd3..ccec1e8cd7 100644 --- a/lib/core/viewer/components/media-player.component.spec.ts +++ b/lib/core/viewer/components/media-player.component.spec.ts @@ -21,7 +21,6 @@ import { MediaPlayerComponent } from './media-player.component'; import { setupTestBed } from '../../testing/setup-test-bed'; import { CoreTestingModule } from '../../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; -import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock'; import { AlfrescoApiService } from '../../services'; import { NodeEntry } from '@alfresco/js-api'; @@ -36,9 +35,6 @@ describe('Test Media player component ', () => { imports: [ TranslateModule.forRoot(), CoreTestingModule - ], - providers: [ - { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock } ] }); diff --git a/lib/core/viewer/components/viewer.component.spec.ts b/lib/core/viewer/components/viewer.component.spec.ts index 33c906b776..5787e7ae58 100644 --- a/lib/core/viewer/components/viewer.component.spec.ts +++ b/lib/core/viewer/components/viewer.component.spec.ts @@ -26,7 +26,6 @@ import { EventMock } from '../../mock/event.mock'; import { RenderingQueueServices } from '../services/rendering-queue.services'; import { ViewerComponent } from './viewer.component'; import { setupTestBed } from '../../testing/setup-test-bed'; -import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock'; import { NodeEntry, VersionEntry } from '@alfresco/js-api'; import { CoreTestingModule } from '../../testing/core.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -151,7 +150,6 @@ describe('ViewerComponent', () => { ViewerWithCustomToolbarActionsComponent ], providers: [ - { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, { provide: RenditionsService, useValue: { getRendition: () => { diff --git a/lib/extensions/src/lib/config/extension.config.ts b/lib/extensions/src/lib/config/extension.config.ts index b718b6fedf..7b1142e2e5 100644 --- a/lib/extensions/src/lib/config/extension.config.ts +++ b/lib/extensions/src/lib/config/extension.config.ts @@ -27,9 +27,9 @@ export interface ExtensionRef { $license: string; $runtime?: string; $description?: string; - $dependencies?: Array; + appConfig?: any; rules?: Array; routes?: Array; actions?: Array; diff --git a/lib/extensions/src/lib/config/schema/plugin-extension.schema.json b/lib/extensions/src/lib/config/schema/plugin-extension.schema.json index 68c5b9f282..e626b9d798 100644 --- a/lib/extensions/src/lib/config/schema/plugin-extension.schema.json +++ b/lib/extensions/src/lib/config/schema/plugin-extension.schema.json @@ -602,6 +602,10 @@ "minItems": 0, "uniqueItems": true }, + "appConfig": { + "description": "Application configuration parameters to add/override", + "type": "object" + }, "rules": { "description": "List of rule definitions", "type": "array", diff --git a/lib/extensions/src/lib/services/extension.service.ts b/lib/extensions/src/lib/services/extension.service.ts index 518f785967..3391cbbe7e 100644 --- a/lib/extensions/src/lib/services/extension.service.ts +++ b/lib/extensions/src/lib/services/extension.service.ts @@ -25,6 +25,7 @@ import * as core from '../evaluators/core.evaluators'; import { ComponentRegisterService } from './component-register.service'; import { RuleService } from './rule.service'; import { ExtensionElement } from '../config/extension-element'; +import { BehaviorSubject } from 'rxjs'; export function extensionJsonsFactory() { return []; @@ -58,6 +59,9 @@ export class ExtensionService { features: Array = []; authGuards: { [key: string]: Type<{}> } = {}; + protected onSetup$ = new BehaviorSubject(this.config); + setup$ = this.onSetup$.asObservable(); + constructor( protected loader: ExtensionLoaderService, protected componentRegister: ComponentRegisterService, @@ -103,6 +107,7 @@ export class ExtensionService { this.features = this.loader.getFeatures(config); this.ruleService.setup(config); + this.onSetup$.next(config); } /** diff --git a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts index dbefd7c1e1..00b5781d22 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts @@ -37,6 +37,9 @@ describe('AppListCloudComponent', () => { const mock = { oauth2Auth: { callCustomApi: () => Promise.resolve(fakeApplicationInstance) + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.spec.ts index 6f281bbfd4..7c4c9cb05e 100644 --- a/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.spec.ts @@ -33,6 +33,9 @@ describe('AppsProcessCloudService', () => { const apiMock = { oauth2Auth: { callCustomApi: () => Promise.resolve({list : { entries: [ {entry: fakeApplicationInstance[0]}, {entry: fakeApplicationInstance[1]}] }}) + }, + isEcmLoggedIn() { + return false; } }; @@ -41,14 +44,19 @@ describe('AppsProcessCloudService', () => { TranslateModule.forRoot(), CoreTestingModule, ProcessServiceCloudTestingModule + ], + providers: [ + AlfrescoApiService, + AppConfigService ] }); beforeEach(() => { - service = TestBed.inject(AppsProcessCloudService); - appConfigService = TestBed.inject(AppConfigService); apiService = TestBed.inject(AlfrescoApiService); spyOn(apiService, 'getInstance').and.returnValue(apiMock); + + service = TestBed.inject(AppsProcessCloudService); + appConfigService = TestBed.inject(AppConfigService); }); it('should get the deployed applications no apps are specified in app.config', (done) => { diff --git a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts index 5bb0e67cb8..d856fdbed0 100644 --- a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts @@ -49,7 +49,13 @@ describe('Form Cloud service', () => { beforeEach(() => { service = TestBed.inject(FormCloudService); apiService = TestBed.inject(AlfrescoApiService); - spyOn(apiService, 'getInstance').and.returnValue({ oauth2Auth: oauth2Auth }); + + spyOn(apiService, 'getInstance').and.returnValue({ + oauth2Auth: oauth2Auth, + isEcmLoggedIn() { + return false; + } + }); }); describe('Form tests', () => { diff --git a/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.spec.ts index 3ca3ffe986..5588c09c19 100644 --- a/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.spec.ts @@ -70,7 +70,12 @@ describe('Form Definition Selector Cloud Service', () => { beforeEach(() => { service = TestBed.inject(FormDefinitionSelectorCloudService); apiService = TestBed.inject(AlfrescoApiService); - spyOn(apiService, 'getInstance').and.returnValue({ oauth2Auth: oauth2Auth }); + spyOn(apiService, 'getInstance').and.returnValue({ + oauth2Auth: oauth2Auth, + isEcmLoggedIn() { + return false; + } + }); }); it('should fetch all the forms when getForms is called', (done) => { diff --git a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts index 676e51005b..bd2a566d66 100644 --- a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts @@ -43,6 +43,9 @@ describe('GroupCloudComponent', () => { const mock = { oauth2Auth: { callCustomApi: () => Promise.resolve(mockIdentityGroups) + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts index 3e8a10a25a..c40868368b 100644 --- a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts @@ -43,6 +43,9 @@ describe('PeopleCloudComponent', () => { const mock = { oauth2Auth: { callCustomApi: () => Promise.resolve(mockUsers) + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts index 0ac1dad302..2517ac4aaa 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts @@ -67,14 +67,17 @@ describe('EditProcessFilterCloudComponent', () => { const mock = { oauth2Auth: { callCustomApi: () => Promise.resolve(fakeApplicationInstance) + }, + isEcmLoggedIn() { + return false; } }; setupTestBed({ imports: [ TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, ProcessFiltersCloudModule, + ProcessServiceCloudTestingModule, MatIconTestingModule ], providers: [ diff --git a/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts index 60a686d9d8..bd5d19189c 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts @@ -14,14 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { async } from '@angular/core/testing'; -import { setupTestBed, StorageService, AlfrescoApiServiceMock, LogService, AppConfigService, CoreModule } from '@alfresco/adf-core'; +import { async, TestBed } from '@angular/core/testing'; +import { setupTestBed, AlfrescoApiService } from '@alfresco/adf-core'; import { ProcessListCloudService } from './process-list-cloud.service'; import { ProcessQueryCloudRequestModel } from '../models/process-cloud-query-request.model'; +import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; describe('ProcessListCloudService', () => { let service: ProcessListCloudService; - let alfrescoApiMock: AlfrescoApiServiceMock; + let alfrescoApiService: AlfrescoApiService; function returnCallQueryParameters() { return { @@ -29,6 +30,9 @@ describe('ProcessListCloudService', () => { callCustomApi: (_queryUrl, _operation, _context, queryParams) => { return Promise.resolve(queryParams); } + }, + isEcmLoggedIn() { + return false; } }; } @@ -39,26 +43,27 @@ describe('ProcessListCloudService', () => { callCustomApi: (queryUrl) => { return Promise.resolve(queryUrl); } + }, + isEcmLoggedIn() { + return false; } }; } setupTestBed({ imports: [ - CoreModule.forRoot() + ProcessServiceCloudTestingModule ] }); beforeEach(async(() => { - alfrescoApiMock = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); - service = new ProcessListCloudService(alfrescoApiMock, - new AppConfigService(null), - new LogService(new AppConfigService(null))); + alfrescoApiService = TestBed.inject(AlfrescoApiService); + service = TestBed.inject(ProcessListCloudService); })); it('should append to the call all the parameters', (done) => { const processRequest: ProcessQueryCloudRequestModel = { appName: 'fakeName', skipCount: 0, maxItems: 20, service: 'fake-service' }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallQueryParameters); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallQueryParameters); service.getProcessByRequest(processRequest).subscribe((res) => { expect(res).toBeDefined(); expect(res).not.toBeNull(); @@ -71,7 +76,7 @@ describe('ProcessListCloudService', () => { it('should concat the app name to the request url', (done) => { const processRequest: ProcessQueryCloudRequestModel = { appName: 'fakeName', skipCount: 0, maxItems: 20, service: 'fake-service' }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallUrl); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallUrl); service.getProcessByRequest(processRequest).subscribe((requestUrl) => { expect(requestUrl).toBeDefined(); expect(requestUrl).not.toBeNull(); @@ -85,7 +90,7 @@ describe('ProcessListCloudService', () => { appName: 'fakeName', skipCount: 0, maxItems: 20, service: 'fake-service', sorting: [{ orderBy: 'NAME', direction: 'DESC' }, { orderBy: 'TITLE', direction: 'ASC' }] }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallQueryParameters); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallQueryParameters); service.getProcessByRequest(processRequest).subscribe((res) => { expect(res).toBeDefined(); expect(res).not.toBeNull(); @@ -96,7 +101,7 @@ describe('ProcessListCloudService', () => { it('should return an error when app name is not specified', (done) => { const processRequest: ProcessQueryCloudRequestModel = { appName: null }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallUrl); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallUrl); service.getProcessByRequest(processRequest).subscribe( () => { }, (error) => { diff --git a/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts index e8092e324a..bbb94b5ce6 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts @@ -37,6 +37,9 @@ describe('StartProcessCloudService', () => { status: 'RUNNING' } }) + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/process-services-cloud/src/lib/services/notification-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/services/notification-cloud.service.spec.ts index 94cada495d..6b488cf33a 100644 --- a/lib/process-services-cloud/src/lib/services/notification-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/services/notification-cloud.service.spec.ts @@ -46,6 +46,9 @@ describe('NotificationCloudService', () => { const apiServiceMock = { oauth2Auth: { token: '1234567' + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.spec.ts index 70a3c52927..a336d3f755 100644 --- a/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.spec.ts @@ -39,6 +39,9 @@ describe('PreferenceService', () => { callCustomApi: () => { return Promise.resolve(mockResponse); } + }, + isEcmLoggedIn() { + return false; } }; } @@ -46,6 +49,9 @@ describe('PreferenceService', () => { const apiErrorMock = { oauth2Auth: { callCustomApi: () => Promise.reject(errorResponse) + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts index bc1cdaf835..0756f4af65 100644 --- a/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts @@ -38,6 +38,9 @@ describe('Task Cloud Service', () => { callCustomApi : () => { return Promise.resolve(taskCompleteCloudMock); } + }, + isEcmLoggedIn() { + return false; } }; } @@ -48,6 +51,9 @@ describe('Task Cloud Service', () => { callCustomApi : () => { return Promise.reject(taskCompleteCloudMock); } + }, + isEcmLoggedIn() { + return false; } }; } @@ -58,6 +64,9 @@ describe('Task Cloud Service', () => { callCustomApi : () => { return Promise.resolve(fakeTaskDetailsCloud); } + }, + isEcmLoggedIn() { + return false; } }; } @@ -68,6 +77,9 @@ describe('Task Cloud Service', () => { callCustomApi : () => { return Promise.resolve(['mockuser1', 'mockuser2', 'mockuser3']); } + }, + isEcmLoggedIn() { + return false; } }; } @@ -78,6 +90,9 @@ describe('Task Cloud Service', () => { callCustomApi : () => { return Promise.resolve(['mockgroup1', 'mockgroup2', 'mockgroup3']); } + }, + isEcmLoggedIn() { + return false; } }; } diff --git a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts index 86b05b7048..4825afa6b4 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts @@ -41,6 +41,9 @@ describe('StartTaskCloudComponent', () => { const mock = { oauth2Auth: { callCustomApi: () => Promise.resolve(taskDetailsMock) + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts index 7be493dea7..6e445ebf8a 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts @@ -54,6 +54,9 @@ describe('EditTaskFilterCloudComponent', () => { const mock = { oauth2Auth: { callCustomApi: () => Promise.resolve(fakeApplicationInstance) + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts index f379cc4a05..2c82df80eb 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts @@ -16,14 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { - AlfrescoApiService, - AlfrescoApiServiceMock, - AppConfigService, - AppConfigServiceMock, - IdentityUserService, - setupTestBed -} from '@alfresco/adf-core'; +import { IdentityUserService, setupTestBed } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { TASK_FILTERS_SERVICE_TOKEN } from '../../../services/cloud-token.service'; import { LocalPreferenceCloudService } from '../../../services/local-preference-cloud.service'; @@ -42,6 +35,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TaskFilterCloudModel } from '../models/filter-cloud.model'; import { NotificationCloudService } from '../../../services/notification-cloud.service'; import { TaskCloudEngineEvent } from './../../../models/engine-event-cloud.model'; +import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; describe('TaskFilterCloudService', () => { let service: TaskFilterCloudService; @@ -57,12 +51,11 @@ describe('TaskFilterCloudService', () => { setupTestBed({ imports: [ - HttpClientTestingModule + HttpClientTestingModule, + ProcessServiceCloudTestingModule ], providers: [ - { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: UserPreferenceCloudService }, - { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, - { provide: AppConfigService, useClass: AppConfigServiceMock } + { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: UserPreferenceCloudService } ] }); diff --git a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts index 5a348e9690..a06ab2185b 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts @@ -52,6 +52,9 @@ describe('TaskHeaderCloudComponent', () => { const mock = { oauth2Auth: { callCustomApi: () => Promise.resolve({}) + }, + isEcmLoggedIn() { + return false; } }; diff --git a/lib/process-services-cloud/src/lib/task/task-list/services/service-task-list-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/services/service-task-list-cloud.service.spec.ts index f50af219cc..83e31a668f 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/services/service-task-list-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/services/service-task-list-cloud.service.spec.ts @@ -15,15 +15,16 @@ * limitations under the License. */ -import { async } from '@angular/core/testing'; -import { setupTestBed, StorageService, AlfrescoApiServiceMock, LogService, AppConfigService, CoreModule } from '@alfresco/adf-core'; +import { async, TestBed } from '@angular/core/testing'; +import { setupTestBed, AlfrescoApiService } from '@alfresco/adf-core'; import { ServiceTaskListCloudService } from './service-task-list-cloud.service'; import { ServiceTaskQueryCloudRequestModel } from '../models/service-task-cloud.model'; +import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; describe('Activiti ServiceTaskList Cloud Service', () => { let service: ServiceTaskListCloudService; - let alfrescoApiMock: AlfrescoApiServiceMock; + let alfrescoApiService: AlfrescoApiService; function returnCallQueryParameters() { return { @@ -31,6 +32,9 @@ describe('Activiti ServiceTaskList Cloud Service', () => { callCustomApi: (_queryUrl, _operation, _context, queryParams) => { return Promise.resolve(queryParams); } + }, + isEcmLoggedIn() { + return false; } }; } @@ -41,26 +45,27 @@ describe('Activiti ServiceTaskList Cloud Service', () => { callCustomApi: (queryUrl) => { return Promise.resolve(queryUrl); } + }, + isEcmLoggedIn() { + return false; } }; } setupTestBed({ imports: [ - CoreModule.forRoot() + ProcessServiceCloudTestingModule ] }); beforeEach(async(() => { - alfrescoApiMock = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); - service = new ServiceTaskListCloudService(alfrescoApiMock, - new AppConfigService(null), - new LogService(new AppConfigService(null))); + alfrescoApiService = TestBed.inject(AlfrescoApiService); + service = TestBed.inject(ServiceTaskListCloudService); })); it('should append to the call all the parameters', (done) => { const taskRequest: ServiceTaskQueryCloudRequestModel = { appName: 'fakeName', skipCount: 0, maxItems: 20, service: 'fake-service' }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallQueryParameters); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallQueryParameters); service.getServiceTaskByRequest(taskRequest).subscribe((res) => { expect(res).toBeDefined(); expect(res).not.toBeNull(); @@ -73,7 +78,7 @@ describe('Activiti ServiceTaskList Cloud Service', () => { it('should concat the app name to the request url', (done) => { const taskRequest: ServiceTaskQueryCloudRequestModel = { appName: 'fakeName', skipCount: 0, maxItems: 20, service: 'fake-service' }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallUrl); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallUrl); service.getServiceTaskByRequest(taskRequest).subscribe((requestUrl) => { expect(requestUrl).toBeDefined(); expect(requestUrl).not.toBeNull(); @@ -87,7 +92,7 @@ describe('Activiti ServiceTaskList Cloud Service', () => { appName: 'fakeName', skipCount: 0, maxItems: 20, service: 'fake-service', sorting: [{ orderBy: 'NAME', direction: 'DESC' }, { orderBy: 'TITLE', direction: 'ASC' }] }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallQueryParameters); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallQueryParameters); service.getServiceTaskByRequest(taskRequest).subscribe((res) => { expect(res).toBeDefined(); expect(res).not.toBeNull(); @@ -98,7 +103,7 @@ describe('Activiti ServiceTaskList Cloud Service', () => { it('should return an error when app name is not specified', (done) => { const taskRequest: ServiceTaskQueryCloudRequestModel = { appName: null }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallUrl); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallUrl); service.getServiceTaskByRequest(taskRequest).subscribe( () => { }, (error) => { diff --git a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts index 5e11ab537d..430e138ef8 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts @@ -15,15 +15,17 @@ * limitations under the License. */ -import { async } from '@angular/core/testing'; -import { setupTestBed, StorageService, AlfrescoApiServiceMock, LogService, AppConfigService, CoreModule } from '@alfresco/adf-core'; +import { TestBed } from '@angular/core/testing'; +import { setupTestBed, AlfrescoApiService } from '@alfresco/adf-core'; import { TaskListCloudService } from './task-list-cloud.service'; import { TaskQueryCloudRequestModel } from '../models/filter-cloud-model'; +import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; +import { TranslateModule } from '@ngx-translate/core'; describe('TaskListCloudService', () => { let service: TaskListCloudService; - let alfrescoApiMock: AlfrescoApiServiceMock; + let alfrescoApiService: AlfrescoApiService; function returnCallQueryParameters() { return { @@ -31,6 +33,9 @@ describe('TaskListCloudService', () => { callCustomApi : (_queryUrl, _operation, _context, queryParams) => { return Promise.resolve(queryParams); } + }, + isEcmLoggedIn() { + return false; } }; } @@ -41,26 +46,28 @@ describe('TaskListCloudService', () => { callCustomApi : (queryUrl) => { return Promise.resolve(queryUrl); } + }, + isEcmLoggedIn() { + return false; } }; } setupTestBed({ imports: [ - CoreModule.forRoot() + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule ] }); - beforeEach(async(() => { - alfrescoApiMock = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); - service = new TaskListCloudService(alfrescoApiMock, - new AppConfigService(null), - new LogService(new AppConfigService(null))); - })); + beforeEach(() => { + alfrescoApiService = TestBed.inject(AlfrescoApiService); + service = TestBed.inject(TaskListCloudService); + }); it('should append to the call all the parameters', (done) => { const taskRequest: TaskQueryCloudRequestModel = { appName: 'fakeName', skipCount: 0, maxItems: 20, service: 'fake-service' }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallQueryParameters); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallQueryParameters); service.getTaskByRequest(taskRequest).subscribe((res) => { expect(res).toBeDefined(); expect(res).not.toBeNull(); @@ -73,7 +80,7 @@ describe('TaskListCloudService', () => { it('should concat the app name to the request url', (done) => { const taskRequest: TaskQueryCloudRequestModel = { appName: 'fakeName', skipCount: 0, maxItems: 20, service: 'fake-service' }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallUrl); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallUrl); service.getTaskByRequest(taskRequest).subscribe((requestUrl) => { expect(requestUrl).toBeDefined(); expect(requestUrl).not.toBeNull(); @@ -85,7 +92,7 @@ describe('TaskListCloudService', () => { it('should concat the sorting to append as parameters', (done) => { const taskRequest: TaskQueryCloudRequestModel = { appName: 'fakeName', skipCount: 0, maxItems: 20, service: 'fake-service', sorting: [{ orderBy: 'NAME', direction: 'DESC'}, { orderBy: 'TITLE', direction: 'ASC'}] }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallQueryParameters); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallQueryParameters); service.getTaskByRequest(taskRequest).subscribe((res) => { expect(res).toBeDefined(); expect(res).not.toBeNull(); @@ -96,7 +103,7 @@ describe('TaskListCloudService', () => { it('should return an error when app name is not specified', (done) => { const taskRequest: TaskQueryCloudRequestModel = { appName: null }; - spyOn(alfrescoApiMock, 'getInstance').and.callFake(returnCallUrl); + spyOn(alfrescoApiService, 'getInstance').and.callFake(returnCallUrl); service.getTaskByRequest(taskRequest).subscribe( () => { }, (error) => { diff --git a/lib/process-services-cloud/src/lib/testing/process-service-cloud.testing.module.ts b/lib/process-services-cloud/src/lib/testing/process-service-cloud.testing.module.ts index 5e74a9e72d..46e6f924b6 100644 --- a/lib/process-services-cloud/src/lib/testing/process-service-cloud.testing.module.ts +++ b/lib/process-services-cloud/src/lib/testing/process-service-cloud.testing.module.ts @@ -36,9 +36,9 @@ import { RouterTestingModule } from '@angular/router/testing'; HttpClientModule, NoopAnimationsModule, RouterTestingModule, - TranslateModule, - CoreModule, - ProcessServicesCloudModule + TranslateModule.forRoot(), + CoreModule.forRoot(), + ProcessServicesCloudModule.forRoot() ], providers: [ { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, diff --git a/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.spec.ts b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.spec.ts index 5e303236cd..78e7a5759c 100644 --- a/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.spec.ts +++ b/lib/process-services/src/lib/content-widget/attach-file-widget-dialog.component.spec.ts @@ -21,7 +21,7 @@ import { ContentModule, ContentNodeSelectorPanelComponent, DocumentListService } import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ProcessTestingModule } from '../testing/process.testing.module'; import { AttachFileWidgetDialogComponent } from './attach-file-widget-dialog.component'; -import { setupTestBed, AuthenticationService, SitesService, AlfrescoApiService, AlfrescoApiServiceMock, NodesApiService } from '@alfresco/adf-core'; +import { setupTestBed, AuthenticationService, SitesService, AlfrescoApiService, NodesApiService } from '@alfresco/adf-core'; import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface'; import { of, throwError } from 'rxjs'; import { By } from '@angular/platform-browser'; @@ -53,12 +53,11 @@ describe('AttachFileWidgetDialogComponent', () => { setupTestBed({ imports: [ TranslateModule.forRoot(), - ProcessTestingModule, - ContentModule.forRoot() + ContentModule.forRoot(), + ProcessTestingModule ], providers: [ { provide: MAT_DIALOG_DATA, useValue: data }, - { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, { provide: MatDialogRef, useValue: { close: () => of() } } ], schemas: [NO_ERRORS_SCHEMA] diff --git a/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts b/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts index fc31831bdf..27d2eb281a 100644 --- a/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts +++ b/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts @@ -15,12 +15,11 @@ * limitations under the License. */ -import { async } from '@angular/core/testing'; +import { async, TestBed } from '@angular/core/testing'; import { mockError, fakeProcessFiltersResponse } from '../../mock'; import { FilterProcessRepresentationModel } from '../models/filter-process.model'; import { ProcessFilterService } from './process-filter.service'; -import { AlfrescoApiServiceMock, AlfrescoApiService, AppConfigService, - setupTestBed, CoreModule, StorageService } from '@alfresco/adf-core'; +import { AlfrescoApiService, setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; declare let jasmine: any; @@ -32,13 +31,13 @@ describe('Process filter', () => { setupTestBed({ imports: [ - CoreModule.forRoot() + CoreTestingModule ] }); beforeEach(() => { - apiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); - service = new ProcessFilterService(apiService); + apiService = TestBed.inject(AlfrescoApiService); + service = TestBed.inject(ProcessFilterService); alfrescoApi = apiService.getInstance(); }); diff --git a/lib/process-services/src/lib/process-list/services/process-filter.service.ts b/lib/process-services/src/lib/process-list/services/process-filter.service.ts index 6fe6ffb9ce..779d862183 100644 --- a/lib/process-services/src/lib/process-list/services/process-filter.service.ts +++ b/lib/process-services/src/lib/process-list/services/process-filter.service.ts @@ -38,9 +38,9 @@ export class ProcessFilterService { getProcessFilters(appId: number): Observable { return from(this.callApiProcessFilters(appId)) .pipe( - map((response: any) => { + map((response) => { const filters: FilterProcessRepresentationModel[] = []; - response.data.forEach((filter: FilterProcessRepresentationModel) => { + response.data.forEach((filter) => { const filterModel = new FilterProcessRepresentationModel(filter); filters.push(filterModel); }); diff --git a/lib/process-services/src/lib/process-list/services/process.service.spec.ts b/lib/process-services/src/lib/process-list/services/process.service.spec.ts index 8047ce56f9..9c691cbe2a 100644 --- a/lib/process-services/src/lib/process-list/services/process.service.spec.ts +++ b/lib/process-services/src/lib/process-list/services/process.service.spec.ts @@ -15,13 +15,13 @@ * limitations under the License. */ -import { async } from '@angular/core/testing'; +import { async, TestBed } from '@angular/core/testing'; import { exampleProcess, fakeProcessInstances, mockError, fakeProcessDef, fakeTasksList } from '../../mock'; import { ProcessFilterParamRepresentationModel } from '../models/filter-process.model'; import { ProcessInstanceVariable } from '../models/process-instance-variable.model'; import { ProcessService } from './process.service'; -import { AlfrescoApiService, AlfrescoApiServiceMock, AppConfigService, - setupTestBed, CoreModule, StorageService } from '@alfresco/adf-core'; +import { AlfrescoApiService, setupTestBed, CoreModule } from '@alfresco/adf-core'; +import { ProcessTestingModule } from '../../testing/process.testing.module'; declare let moment: any; @@ -33,12 +33,13 @@ describe('ProcessService', () => { setupTestBed({ imports: [ - CoreModule.forRoot() + CoreModule.forRoot(), + ProcessTestingModule ] }); beforeEach(() => { - apiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()); + apiService = TestBed.inject(AlfrescoApiService); service = new ProcessService(apiService); alfrescoApi = apiService.getInstance(); }); @@ -47,7 +48,7 @@ describe('ProcessService', () => { let getProcessInstances: jasmine.Spy; - const filter: ProcessFilterParamRepresentationModel = new ProcessFilterParamRepresentationModel({ + const filter = new ProcessFilterParamRepresentationModel({ processDefinitionId: '1', appDefinitionId: '1', page: 1, diff --git a/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts b/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts index 2a24de5cd3..163aeab876 100644 --- a/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts +++ b/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts @@ -15,12 +15,13 @@ * limitations under the License. */ -import { async } from '@angular/core/testing'; +import { async, TestBed } from '@angular/core/testing'; import { fakeAppPromise } from '../../mock'; import { fakeFiltersResponse, fakeAppFilter } from '../../mock/task/task-filters.mock'; import { FilterRepresentationModel } from '../models/filter.model'; import { TaskFilterService } from './task-filter.service'; -import { AlfrescoApiServiceMock, LogService, AppConfigService, setupTestBed, CoreModule, StorageService } from '@alfresco/adf-core'; +import { setupTestBed, CoreModule } from '@alfresco/adf-core'; +import { ProcessTestingModule } from '../../testing/process.testing.module'; declare let jasmine: any; @@ -30,14 +31,13 @@ describe('Activiti Task filter Service', () => { setupTestBed({ imports: [ - CoreModule.forRoot() + CoreModule.forRoot(), + ProcessTestingModule ] }); beforeEach(async(() => { - service = new TaskFilterService( - new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()), - new LogService(new AppConfigService(null))); + service = TestBed.inject(TaskFilterService); jasmine.Ajax.install(); })); @@ -127,7 +127,7 @@ describe('Activiti Task filter Service', () => { }); it('should return the default filters', (done) => { - service.createDefaultFilters(1234).subscribe((res: FilterRepresentationModel []) => { + service.createDefaultFilters(1234).subscribe((res) => { expect(res).toBeDefined(); expect(res.length).toEqual(4); expect(res[0].name).toEqual('My Tasks'); @@ -175,7 +175,7 @@ describe('Activiti Task filter Service', () => { }); it('should be able create filters and add sorting information to the response', (done) => { - service.createDefaultFilters(1234).subscribe((res: FilterRepresentationModel []) => { + service.createDefaultFilters(1234).subscribe((res) => { expect(res).toBeDefined(); expect(res.length).toEqual(4); expect(res[0].name).toEqual('My Tasks'); @@ -235,7 +235,7 @@ describe('Activiti Task filter Service', () => { assignment: 'fake-assignment' }); - service.addFilter(filterFake).subscribe((res: FilterRepresentationModel) => { + service.addFilter(filterFake).subscribe((res) => { expect(res).toBeDefined(); expect(res.id).not.toEqual(null); expect(res.name).toEqual('FakeNameFilter'); diff --git a/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts b/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts index e03fc82c0e..0d625e4da4 100644 --- a/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts +++ b/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { async } from '@angular/core/testing'; -import { UserProcessModel, setupTestBed, CoreModule, StorageService, AlfrescoApiServiceMock, LogService, AppConfigService } from '@alfresco/adf-core'; +import { async, TestBed } from '@angular/core/testing'; +import { UserProcessModel, setupTestBed, CoreModule } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { fakeCompletedTaskList, @@ -34,6 +34,7 @@ import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from ' import { TaskDetailsModel } from '../models/task-details.model'; import { TaskListService } from './tasklist.service'; import { TaskUpdateRepresentation } from '@alfresco/js-api'; +import { ProcessTestingModule } from '../../testing/process.testing.module'; declare let jasmine: any; @@ -43,14 +44,13 @@ describe('Activiti TaskList Service', () => { setupTestBed({ imports: [ - CoreModule.forRoot() + CoreModule.forRoot(), + ProcessTestingModule ] }); beforeEach(async(() => { - service = new TaskListService( - new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService()), - new LogService(new AppConfigService(null))); + service = TestBed.inject(TaskListService); jasmine.Ajax.install(); })); diff --git a/lib/process-services/src/lib/testing/process.testing.module.ts b/lib/process-services/src/lib/testing/process.testing.module.ts index b0bb14bb56..b0adc3f662 100644 --- a/lib/process-services/src/lib/testing/process.testing.module.ts +++ b/lib/process-services/src/lib/testing/process.testing.module.ts @@ -35,8 +35,8 @@ import { RouterTestingModule } from '@angular/router/testing'; @NgModule({ imports: [ NoopAnimationsModule, - TranslateModule, - CoreModule, + TranslateModule.forRoot(), + CoreModule.forRoot(), ProcessModule, RouterTestingModule ],