inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-1544] app config file management refactoring (#2331)

Browse Source 
* application configuration service refactoring

* fix demo shell

* remove logging to console
This commit is contained in:
Denys Vuika
2017-09-14 10:06:40 +01:00
committed by Eugenio Romano
parent d9bd59833c
commit e96f6aa481
25 changed files with 136 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.spec.ts
View File

@@ -17,10 +17,9 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { AppConfigModule, AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { Observable } from 'rxjs/Rx';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model';
import { TaskListService } from '../services/tasklist.service';
@@ -70,24 +69,23 @@ describe('TaskFiltersComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot(),
AppConfigModule.forRoot('app.config.json', {
bpmHost: 'http://localhost:9876/bpm'
})
CoreModule
],
declarations: [
TaskFiltersComponent
],
providers: [
TaskListService,
{ provide: TranslationService, useClass: TranslationMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock }
{ provide: TranslationService, useClass: TranslationMock }
]
}).compileComponents();
}));
beforeEach(() => {
let appConfig: AppConfigService = TestBed.get(AppConfigService);
appConfig.config.bpmHost = 'http://localhost:9876/bpm';
fixture = TestBed.createComponent(TaskFiltersComponent);
component = fixture.componentInstance;

13
ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts
View File

@@ -18,10 +18,9 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdProgressSpinnerModule } from '@angular/material';
import { AppConfigModule, AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core';
import { DataTableModule } from 'ng2-alfresco-datatable';
import { DataRowEvent, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
import { AppConfigServiceMock } from '../assets/app-config.service.mock';
import { TranslationMock } from '../assets/translation.service.mock';
import { TaskListService } from '../services/tasklist.service';
import { TaskListComponent } from './tasklist.component';
@@ -93,10 +92,7 @@ describe('TaskListComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
CoreModule.forRoot(),
AppConfigModule.forRoot('app.config.json', {
bpmHost: 'http://localhost:9876/bpm'
}),
CoreModule,
DataTableModule,
MdProgressSpinnerModule
],
@@ -105,14 +101,15 @@ describe('TaskListComponent', () => {
],
providers: [
TaskListService,
{provide: TranslationService, useClass: TranslationMock},
{provide: AppConfigService, useClass: AppConfigServiceMock}
{provide: TranslationService, useClass: TranslationMock}
]
}).compileComponents();
}));
beforeEach(() => {
let appConfig: AppConfigService = TestBed.get(AppConfigService);
appConfig.config.bpmHost = 'http://localhost:9876/bpm';
fixture = TestBed.createComponent(TaskListComponent);
component = fixture.componentInstance;