Pre-Angular 9 upgrade fixes (#5712)

* remove deprecated angular/http

* upgrade adf libs

* fix production builds

* ivy-compatible translate module usage

* improved module usage

* upgrade content services module

* fix process services tests

* upgrade process cloud tests

* lint fixes

* update core max size

* fix insights test module

* remove insights lazy loading workaround

* fix insights module exports

* * Fixed skipped form-cloud unit test and removed duplicated tests

* cleanup the use of services

Co-authored-by: sivakumar414ram <siva.kumar@muraai.com>
This commit is contained in:
Denys Vuika
2020-05-20 16:51:51 +01:00
committed by GitHub
parent 4cb3a876d9
commit 654be10dd2
185 changed files with 622 additions and 1156 deletions

View File

@@ -92,6 +92,7 @@ describe('ButtonsMenuComponent', () => {
it('should trigger event when a specific button is clicked', async(() => {
expect(component.value).toBeUndefined();
fixture.detectChanges();
const button = element.querySelector('button');
button.click();
fixture.detectChanges();

View File

@@ -26,7 +26,7 @@ import { FlexLayoutModule } from '@angular/flex-layout';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild(),
TranslateModule,
FlexLayoutModule
],
declarations: [

View File

@@ -53,7 +53,7 @@ import { CardViewArrayItemComponent } from './components/card-view-arrayitem/car
CommonModule,
FormsModule,
FlexLayoutModule,
TranslateModule.forChild(),
TranslateModule,
MatDatepickerModule,
MatNativeDateModule,
MatCheckboxModule,

View File

@@ -18,10 +18,9 @@
import { Component, ViewChild } from '@angular/core';
import { ComponentFixture, TestBed, tick, fakeAsync } from '@angular/core/testing';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { ClipboardService } from './clipboard.service';
import { ClipboardDirective } from './clipboard.directive';
import { RouterTestingModule } from '@angular/router/testing';
import { CoreTestingModule } from '../testing/core.testing.module';
@Component({
selector: 'adf-test-component',
@@ -43,7 +42,7 @@ describe('ClipboardDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
declarations: [
TestTargetClipboardComponent
@@ -85,8 +84,7 @@ describe('CopyClipboardDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot(),
RouterTestingModule
CoreTestingModule
],
declarations: [
TestCopyClipboardComponent
@@ -109,9 +107,11 @@ describe('CopyClipboardDirective', () => {
it('should not show tooltip when element it is not hovered', (() => {
const spanHTMLElement: HTMLInputElement = <HTMLInputElement> element.querySelector('span');
spanHTMLElement.dispatchEvent(new Event('mouseenter'));
fixture.detectChanges();
expect(fixture.debugElement.nativeElement.querySelector('.adf-copy-tooltip')).not.toBeNull();
spanHTMLElement.dispatchEvent(new Event('mouseleave'));
fixture.detectChanges();
expect(fixture.debugElement.nativeElement.querySelector('.adf-copy-tooltip')).toBeNull();
}));

View File

@@ -23,7 +23,7 @@ import { TranslateModule } from '@ngx-translate/core';
@NgModule({
imports: [
CommonModule,
TranslateModule.forChild()
TranslateModule
],
declarations: [
ClipboardDirective,

View File

@@ -16,16 +16,11 @@
*/
import { NotificationService } from '../notifications/services/notification.service';
import { AppConfigService } from '../app-config/app-config.service';
import { TestBed } from '@angular/core/testing';
import { ClipboardModule } from './clipboard.module';
import { ClipboardService } from './clipboard.service';
import { TranslationService } from '../services/translation.service';
import { AppConfigServiceMock } from '../mock/app-config.service.mock';
import { HttpClientModule } from '@angular/common/http';
import { MatSnackBarModule } from '@angular/material';
import { TranslationMock } from '@alfresco/adf-core';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreTestingModule } from '../testing';
describe('ClipboardService', () => {
let clipboardService: ClipboardService;
@@ -34,13 +29,8 @@ describe('ClipboardService', () => {
setupTestBed({
imports: [
ClipboardModule,
HttpClientModule,
CoreTestingModule,
MatSnackBarModule
],
providers: [
{ provide: TranslationService, useClass: TranslationMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock }
]
});

View File

@@ -36,7 +36,7 @@ import { CommentsComponent } from './comments.component';
ReactiveFormsModule,
MaterialModule,
CommonModule,
TranslateModule.forChild()
TranslateModule
],
declarations: [
CommentListComponent,

View File

@@ -21,9 +21,8 @@ import { fakeAsync, ComponentFixture, TestBed, tick } from '@angular/core/testin
import { ContextMenuHolderComponent } from './context-menu-holder.component';
import { ContextMenuModule } from './context-menu.module';
import { ContextMenuService } from './context-menu.service';
import { CoreModule } from '../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreTestingModule } from '../testing';
describe('ContextMenuHolderComponent', () => {
let fixture: ComponentFixture<ContextMenuHolderComponent>;
@@ -55,8 +54,7 @@ describe('ContextMenuHolderComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot(),
CoreTestingModule,
ContextMenuModule
],
providers: [

View File

@@ -28,7 +28,7 @@ import { ContextMenuListComponent } from './context-menu-list.component';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild()
TranslateModule
],
declarations: [
ContextMenuHolderComponent,

View File

@@ -18,9 +18,8 @@
import { Component } from '@angular/core';
import { TestBed, ComponentFixture } from '@angular/core/testing';
import { ContextMenuModule } from './context-menu.module';
import { CoreModule } from '../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreTestingModule } from '../testing/core.testing.module';
@Component({
selector: 'adf-test-component',
@@ -81,9 +80,8 @@ describe('ContextMenuDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot(),
ContextMenuModule,
NoopAnimationsModule
CoreTestingModule,
ContextMenuModule
],
declarations: [
TestComponent

View File

@@ -61,7 +61,7 @@ import { SearchTextModule } from './search-text/search-text-input.module';
@NgModule({
imports: [
TranslateModule,
ExtensionsModule.forChild(),
ExtensionsModule,
AboutModule,
ViewerModule,
SidenavLayoutModule,

View File

@@ -27,7 +27,7 @@ import { PipeModule } from '../pipes/pipe.module';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild(),
TranslateModule,
PipeModule
],
declarations: [

View File

@@ -28,7 +28,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
CommonModule,
FormsModule,
ReactiveFormsModule,
TranslateModule.forChild(),
TranslateModule,
MatDialogModule,
MatButtonModule
],

View File

@@ -19,8 +19,8 @@ import { ChangeDetectorRef, Component, ElementRef, SimpleChange } from '@angular
import { ContentService } from './../services/content.service';
import { CheckAllowableOperationDirective, NodeAllowableOperationSubject } from './check-allowable-operation.directive';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { TestBed } from '@angular/core/testing';
import { CoreTestingModule } from '../testing/core.testing.module';
@Component({
selector: 'adf-text-subject',
@@ -35,7 +35,9 @@ describe('CheckAllowableOperationDirective', () => {
let changeDetectorMock: ChangeDetectorRef;
setupTestBed({
imports: [CoreModule.forRoot()]
imports: [
CoreTestingModule
]
});
beforeEach(() => {

View File

@@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser';
import { HighlightTransformService } from '../services/highlight-transform.service';
import { HighlightDirective } from './highlight.directive';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { CoreTestingModule } from '../testing/core.testing.module';
/* spellchecker: disable */
const template: string = `
@@ -47,7 +47,7 @@ describe('HighlightDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
declarations: [
TestComponent

View File

@@ -18,12 +18,11 @@
import { Component, ContentChildren } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { Router } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { of, throwError } from 'rxjs';
import { AuthenticationService } from '../services';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { LogoutDirective } from './logout.directive';
import { CoreTestingModule } from '../testing/core.testing.module';
describe('LogoutDirective', () => {
@@ -44,8 +43,7 @@ describe('LogoutDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot(),
RouterTestingModule
CoreTestingModule
],
declarations: [
TestComponent
@@ -99,8 +97,7 @@ describe('LogoutDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot(),
RouterTestingModule
CoreTestingModule
],
declarations: [
TestComponent
@@ -143,8 +140,7 @@ describe('LogoutDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot(),
RouterTestingModule
CoreTestingModule
],
declarations: [
TestComponent

View File

@@ -21,10 +21,7 @@ import { By } from '@angular/platform-browser';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import { NodeDeleteDirective } from './node-delete.directive';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { TranslationService } from '../services/translation.service';
import { TranslationMock } from '../mock/translation.service.mock';
import { CoreTestingModule } from '../testing/core.testing.module';
@Component({
template: `
@@ -83,10 +80,8 @@ describe('NodeDeleteDirective', () => {
let fixtureWithPermissions: ComponentFixture<TestWithPermissionsComponent>;
let fixtureWithPermanentComponent: ComponentFixture<TestDeletePermanentComponent>;
let element: DebugElement;
let elementWithPermissions: DebugElement;
let elementWithPermanentDelete: DebugElement;
let component: TestComponent;
let componentWithPermissions: TestWithPermissionsComponent;
let componentWithPermanentDelete: TestDeletePermanentComponent;
let alfrescoApi: AlfrescoApiService;
let nodeApi;
@@ -96,16 +91,12 @@ describe('NodeDeleteDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
declarations: [
TestComponent,
TestWithPermissionsComponent,
TestDeletePermanentComponent
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
{ provide: TranslationService, useClass: TranslationMock }
]
});
@@ -120,11 +111,9 @@ describe('NodeDeleteDirective', () => {
fixtureWithPermanentComponent = TestBed.createComponent(TestDeletePermanentComponent);
component = fixture.componentInstance;
componentWithPermissions = fixtureWithPermissions.componentInstance;
componentWithPermanentDelete = fixtureWithPermanentComponent.componentInstance;
element = fixture.debugElement.query(By.directive(NodeDeleteDirective));
elementWithPermissions = fixtureWithPermissions.debugElement.query(By.directive(NodeDeleteDirective));
elementWithPermanentDelete = fixtureWithPermanentComponent.debugElement.query(By.directive(NodeDeleteDirective));
});
@@ -330,6 +319,9 @@ describe('NodeDeleteDirective', () => {
});
it('should not enable the button if adf-check-allowable-operation is present', (done) => {
const elementWithPermissions = fixtureWithPermissions.debugElement.query(By.directive(NodeDeleteDirective));
const componentWithPermissions = fixtureWithPermissions.componentInstance;
elementWithPermissions.nativeElement.disabled = false;
componentWithPermissions.selection = [];

View File

@@ -20,11 +20,11 @@ import { By } from '@angular/platform-browser';
import { MatDialog } from '@angular/material';
import { Component, DebugElement } from '@angular/core';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { DialogModule } from '../dialogs/dialog.module';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import { NodeDownloadDirective } from './node-download.directive';
import { CoreTestingModule } from '../testing/core.testing.module';
@Component({
template: '<div [adfNodeDownload]="selection"></div>'
@@ -44,7 +44,7 @@ describe('NodeDownloadDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot(),
CoreTestingModule,
DialogModule
],
providers: [

View File

@@ -21,10 +21,9 @@ import { By } from '@angular/platform-browser';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import { NodeRestoreDirective } from './node-restore.directive';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslationService } from '../services/translation.service';
import { CoreTestingModule } from '../testing/core.testing.module';
@Component({
template: `
@@ -51,8 +50,7 @@ describe('NodeRestoreDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot(),
NoopAnimationsModule
CoreTestingModule
],
declarations: [
TestComponent

View File

@@ -21,12 +21,9 @@ import { FormFieldModel, FormFieldTypes, FormModel } from './../widgets/core/ind
import { TextWidgetComponent, CheckboxWidgetComponent } from '../widgets/index';
import { FormFieldComponent } from './form-field.component';
import { setupTestBed } from '../../../testing/setup-test-bed';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { FormBaseModule } from '../../form-base.module';
import { TranslationService } from '../../../services/translation.service';
import { TranslationMock } from '../../../mock/translation.service.mock';
import { TranslateStore } from '@ngx-translate/core';
import { formWithOneVisibleAndOneInvisibleFieldMock, formWithOneVisibleAndOneInvisibleTabMock } from '../mock/form-renderer.component.mock';
import { CoreTestingModule } from '../../../testing';
describe('FormFieldComponent', () => {
@@ -38,12 +35,8 @@ describe('FormFieldComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreTestingModule,
FormBaseModule
],
providers: [
{ provide: TranslationService, useClass: TranslationMock },
TranslateStore
]
});

View File

@@ -16,13 +16,11 @@
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslationService, TranslationMock } from '../../index';
import { of } from 'rxjs';
import { FormService } from '../services/form.service';
import { FormListComponent } from './form-list.component';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../testing/core.testing.module';
describe('TaskAttachmentList', () => {
@@ -33,11 +31,7 @@ describe('TaskAttachmentList', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
],
providers: [
{ provide: TranslationService, useClass: TranslationMock }
CoreTestingModule
]
});

View File

@@ -17,7 +17,6 @@
import { TestBed, ComponentFixture } from '@angular/core/testing';
import { setupTestBed } from '../../testing/setup-test-bed';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { FormRendererComponent } from './form-renderer.component';
import { FormBaseModule } from '../form-base.module';
import { formDisplayValueVisibility,
@@ -32,10 +31,8 @@ import { formDisplayValueVisibility,
textWidgetVisibility,
numberWidgetVisibilityForm,
radioWidgetVisibiltyForm } from './mock/form-renderer.component.mock';
import { TranslationService } from 'core/services';
import { TranslationMock } from 'core/mock';
import { TranslateStore } from '@ngx-translate/core';
import { FormService } from '../services/form.service';
import { CoreTestingModule } from '../../testing';
function typeIntoInput(targetInput: HTMLInputElement, message: string ) {
expect(targetInput).not.toBeNull('Expected input to set to be valid and not null');
@@ -80,12 +77,8 @@ describe('Form Renderer Component', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreTestingModule,
FormBaseModule
],
providers: [
{ provide: TranslationService, useClass: TranslationMock },
TranslateStore
]
});

View File

@@ -19,12 +19,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormFieldModel } from './../core/form-field.model';
import { AmountWidgetComponent, ADF_AMOUNT_SETTINGS } from './amount.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { FormBaseModule } from '../../../form-base.module';
import { TranslateStore } from '@ngx-translate/core';
import { TranslationService } from '../../../../services/translation.service';
import { TranslationMock } from '../../../../mock/translation.service.mock';
import { FormModel } from '../core';
import { CoreTestingModule } from '../../../../testing/core.testing.module';
describe('AmountWidgetComponent', () => {
@@ -33,12 +30,8 @@ describe('AmountWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreTestingModule,
FormBaseModule
],
providers: [
{ provide: TranslationService, useClass: TranslationMock },
TranslateStore
]
});
@@ -92,12 +85,8 @@ describe('AmountWidgetComponent - rendering', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreTestingModule,
FormBaseModule
],
providers: [
{ provide: TranslationService, useClass: TranslationMock },
TranslateStore
]
});
@@ -162,12 +151,10 @@ describe('AmountWidgetComponent settings', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreTestingModule,
FormBaseModule
],
providers: [
{ provide: TranslationService, useClass: TranslationMock },
TranslateStore,
{
provide: ADF_AMOUNT_SETTINGS,
useValue: {

View File

@@ -22,10 +22,10 @@ import { FormModel } from '../core/form.model';
import { CheckboxWidgetComponent } from './checkbox.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { FormBaseModule } from 'core/form/form-base.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateService, TranslateStore, TranslateLoader } from '@ngx-translate/core';
import { TranslateLoaderService } from 'core/services';
import { MatCheckboxModule } from '@angular/material';
import { CoreTestingModule } from '../../../../testing';
describe('CheckboxWidgetComponent', () => {
@@ -35,7 +35,7 @@ describe('CheckboxWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreTestingModule,
FormBaseModule,
MatCheckboxModule
],

View File

@@ -24,8 +24,7 @@ import { FormModel } from './../core/form.model';
import { ContainerWidgetComponent } from './container.widget';
import { ContainerWidgetComponentModel } from './container.widget.model';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../../../testing';
describe('ContainerWidgetComponent', () => {
@@ -34,8 +33,7 @@ describe('ContainerWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -18,16 +18,14 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { TranslationService, ContentService } from '../../../../services';
import { ContentService } from '../../../../services';
import { of } from 'rxjs';
import { ProcessContentService } from '../../../services/process-content.service';
import { ContentLinkModel } from '../index';
import { ContentWidgetComponent } from './content.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslationMock } from '../../../../mock/translation.service.mock';
import { CoreTestingModule } from '../../../../testing/core.testing.module';
declare let jasmine: any;
@@ -65,11 +63,7 @@ describe('ContentWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
],
providers: [
{ provide: TranslationService, useClass: TranslationMock }
CoreTestingModule
]
});

View File

@@ -21,8 +21,7 @@ import { FormFieldModel } from './../core/form-field.model';
import { FormModel } from './../core/form.model';
import { DateTimeWidgetComponent } from './date-time.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../../../testing/core.testing.module';
describe('DateTimeWidgetComponent', () => {
@@ -32,8 +31,7 @@ describe('DateTimeWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -21,8 +21,7 @@ import { FormFieldModel } from './../core/form-field.model';
import { FormModel } from './../core/form.model';
import { DateWidgetComponent } from './date.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../../../testing/core.testing.module';
describe('DateWidgetComponent', () => {
@@ -32,8 +31,7 @@ describe('DateWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -26,8 +26,7 @@ import { FormModel } from './../core/form.model';
import { FormFieldTypes } from '../core/form-field-types';
import { DropdownWidgetComponent } from './dropdown.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../../../testing/core.testing.module';
describe('DropdownWidgetComponent', () => {
@@ -50,8 +49,7 @@ describe('DropdownWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -24,8 +24,7 @@ import { DynamicTableRow } from './dynamic-table-row.model';
import { DynamicTableWidgetComponent } from './dynamic-table.widget';
import { DynamicTableModel } from './dynamic-table.widget.model';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../../../testing/core.testing.module';
const fakeFormField = {
id: 'fake-dynamic-table',
@@ -79,8 +78,7 @@ describe('DynamicTableWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -22,10 +22,9 @@ import { DynamicTableRow } from './../../dynamic-table-row.model';
import { DynamicTableModel } from './../../dynamic-table.widget.model';
import { DateEditorComponent } from './date.editor';
import { setupTestBed } from '../../../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { By } from '@angular/platform-browser';
import { MatDatepickerInputEvent } from '@angular/material';
import { CoreTestingModule } from '../../../../../../testing';
describe('DateEditorComponent', () => {
let component: DateEditorComponent;
@@ -36,8 +35,7 @@ describe('DateEditorComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -23,8 +23,7 @@ import { DynamicTableRow } from './../../dynamic-table-row.model';
import { DynamicTableModel } from './../../dynamic-table.widget.model';
import { DateTimeEditorComponent } from './datetime.editor';
import { setupTestBed } from '../../../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../../../../../testing/core.testing.module';
describe('DateTimeEditorComponent', () => {
let component: DateTimeEditorComponent;
@@ -35,8 +34,7 @@ describe('DateTimeEditorComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -26,8 +26,7 @@ import { DynamicTableRow } from './../../dynamic-table-row.model';
import { DynamicTableModel } from './../../dynamic-table.widget.model';
import { DropdownEditorComponent } from './dropdown.editor';
import { setupTestBed } from '../../../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../../../../../testing/core.testing.module';
describe('DropdownEditorComponent', () => {
@@ -40,8 +39,7 @@ describe('DropdownEditorComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -18,13 +18,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormFieldTypes } from '../core/form-field-types';
import { FormFieldModel } from './../core/form-field.model';
import { FormModel } from './../core/form.model';
import { TranslateModule, TranslateStore, TranslateService } from '@ngx-translate/core';
import { WidgetComponent } from './../widget.component';
import { TranslationService } from '../../../../services';
import { HyperlinkWidgetComponent } from './hyperlink.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { TranslationMock } from '../../../../mock/translation.service.mock';
import { HttpClientModule } from '@angular/common/http';
import { CoreTestingModule } from '../../../../testing';
describe('HyperlinkWidgetComponent', () => {
@@ -34,16 +31,7 @@ describe('HyperlinkWidgetComponent', () => {
setupTestBed({
imports: [
TranslateModule.forChild(),
HttpClientModule
],
declarations: [
HyperlinkWidgetComponent
],
providers: [
TranslateStore,
TranslateService,
{ provide: TranslationService, useClass: TranslationMock }
CoreTestingModule
]
});

View File

@@ -25,9 +25,8 @@ import { FormFieldModel } from '../core/form-field.model';
import { FormModel } from '../core/form.model';
import { PeopleWidgetComponent } from './people.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateService } from '@ngx-translate/core';
import { CoreTestingModule } from '../../../../testing/core.testing.module';
describe('PeopleWidgetComponent', () => {
@@ -39,8 +38,7 @@ describe('PeopleWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -25,15 +25,9 @@ import { FormFieldModel } from './../core/form-field.model';
import { FormModel } from './../core/form.model';
import { RadioButtonsWidgetComponent } from './radio-buttons.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateModule, TranslateStore, TranslateService } from '@ngx-translate/core';
import { MatIconModule, MatRadioModule } from '@angular/material';
import { FormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
import { ErrorWidgetComponent } from '../error/error.component';
import { TranslationService } from '../../../../services';
import { TranslationMock } from '../../../../mock/translation.service.mock';
import { DisplayTextWidgetComponent } from '../display-text/display-text.widget';
import { CoreTestingModule } from '../../../../testing';
describe('RadioButtonsWidgetComponent', () => {
@@ -42,22 +36,10 @@ describe('RadioButtonsWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
TranslateModule.forChild(),
CoreTestingModule,
MatRadioModule,
FormsModule,
MatIconModule,
HttpClientModule
],
declarations: [
RadioButtonsWidgetComponent,
ErrorWidgetComponent,
DisplayTextWidgetComponent
],
providers: [
TranslateStore,
TranslateService,
{ provide: TranslationService, useClass: TranslationMock }
MatIconModule
]
});

View File

@@ -16,15 +16,13 @@
*/
import { tick, fakeAsync, async, ComponentFixture, TestBed, flush } from '@angular/core/testing';
import { fakeFormJson, TranslationMock } from '../../../../mock';
import { fakeFormJson } from '../../../../mock';
import { FormFieldModel } from '../core/form-field.model';
import { FormModel } from '../core/form.model';
import { TabModel } from '../core/tab.model';
import { TabsWidgetComponent } from './tabs.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslationService } from '../../../../services/translation.service';
import { CoreTestingModule } from '../../../../testing/core.testing.module';
describe('TabsWidgetComponent', () => {
@@ -32,11 +30,7 @@ describe('TabsWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
],
providers: [
{ provide: TranslationService, useClass: TranslationMock }
CoreTestingModule
]
});

View File

@@ -21,15 +21,9 @@ import { FormFieldModel } from '../core/form-field.model';
import { FormModel } from '../core/form.model';
import { TextWidgetComponent } from './text.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslationMock } from '../../../../mock/translation.service.mock';
import { TranslationService } from '../../../../services';
import { FormsModule } from '@angular/forms';
import { TranslateModule, TranslateStore, TranslateService } from '@ngx-translate/core';
import { MatInputModule, MatIconModule } from '@angular/material';
import { InputMaskDirective } from './text-mask.component';
import { ErrorWidgetComponent } from '../error/error.component';
import { HttpClientModule } from '@angular/common/http';
import { CoreTestingModule } from '../../../../testing';
const enterValueInTextField = (element: HTMLInputElement, value: string) => {
element.value = value;
@@ -45,22 +39,10 @@ describe('TextWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
TranslateModule.forChild(),
CoreTestingModule,
MatInputModule,
FormsModule,
MatIconModule,
HttpClientModule
],
declarations: [
TextWidgetComponent,
InputMaskDirective,
ErrorWidgetComponent
],
providers: [
TranslateStore,
TranslateService,
{ provide: TranslationService, useClass: TranslationMock }
MatIconModule
]
});

View File

@@ -26,9 +26,8 @@ import { FormFieldModel } from '../core/form-field.model';
import { FormModel } from '../core/form.model';
import { TypeaheadWidgetComponent } from './typeahead.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateService } from '@ngx-translate/core';
import { CoreTestingModule } from '../../../../testing/core.testing.module';
describe('TypeaheadWidgetComponent', () => {
@@ -38,8 +37,7 @@ describe('TypeaheadWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -26,8 +26,7 @@ import { FormModel } from '../core/form.model';
import { FormFieldModel } from './../core/form-field.model';
import { UploadWidgetComponent } from './upload.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { CoreModule } from '../../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../../../testing/core.testing.module';
const fakePngAnswer = {
'id': 1155,
@@ -82,8 +81,7 @@ describe('UploadWidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -20,8 +20,7 @@ import { FormFieldModel } from './core/form-field.model';
import { FormModel } from './core/form.model';
import { WidgetComponent } from './widget.component';
import { setupTestBed } from '../../../testing/setup-test-bed';
import { CoreModule } from '../../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../../testing';
describe('WidgetComponent', () => {
@@ -31,8 +30,7 @@ describe('WidgetComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -48,7 +48,7 @@ import { FlexLayoutModule } from '@angular/flex-layout';
DataTableModule,
HttpClientModule,
MaterialModule,
TranslateModule.forChild(),
TranslateModule,
FormsModule,
ReactiveFormsModule,
DataColumnModule,

View File

@@ -19,10 +19,10 @@ import { Observable } from 'rxjs';
import { FormModel } from './../components/widgets/core/form.model';
import { EcmModelService } from './ecm-model.service';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { TestBed } from '@angular/core/testing';
import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock';
import { CoreTestingModule } from '../../testing/core.testing.module';
declare let jasmine: any;
@@ -32,7 +32,7 @@ describe('EcmModelService', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }

View File

@@ -16,13 +16,11 @@
*/
import { TestBed } from '@angular/core/testing';
import { Response, ResponseOptions } from '@angular/http';
import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { formModelTabs, AlfrescoApiServiceMock } from '../../mock';
import { FormService } from './form.service';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../testing/core.testing.module';
declare let jasmine: any;
@@ -58,8 +56,7 @@ describe('Form service', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }
@@ -246,32 +243,6 @@ describe('Form service', () => {
});
});
it('should not get form id from response', () => {
let response = new Response(new ResponseOptions({ body: null }));
expect(service.getFormId(response)).toBeNull();
response = new Response(new ResponseOptions({ body: {} }));
expect(service.getFormId(response)).toBeNull();
response = new Response(new ResponseOptions({ body: { data: null } }));
expect(service.getFormId(response)).toBeNull();
response = new Response(new ResponseOptions({ body: { data: [] } }));
expect(service.getFormId(response)).toBeNull();
expect(service.getFormId(null)).toBeNull();
});
it('should fallback to empty json array', () => {
expect(service.toJsonArray(null)).toEqual([]);
let response = new Response(new ResponseOptions({ body: {} }));
expect(service.toJsonArray(response)).toEqual([]);
response = new Response(new ResponseOptions({ body: { data: null } }));
expect(service.toJsonArray(response)).toEqual([]);
});
it('should handle error with generic message', () => {
service.handleError(null).subscribe(() => {
}, (error) => {

View File

@@ -20,10 +20,9 @@ import { NodeMetadata } from '../../models/node-metadata.model';
import { EcmModelService } from './ecm-model.service';
import { NodeService } from './node.service';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock';
import { CoreTestingModule } from '../../testing/core.testing.module';
declare let jasmine: any;
@@ -33,8 +32,7 @@ describe('NodeService', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }

View File

@@ -19,10 +19,9 @@ import { TestBed } from '@angular/core/testing';
import { of } from 'rxjs';
import { ProcessContentService } from './process-content.service';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock';
import { CoreTestingModule } from '../../testing/core.testing.module';
declare let jasmine: any;
@@ -71,8 +70,7 @@ describe('ProcessContentService', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }

View File

@@ -27,8 +27,6 @@ import { TaskProcessVariableModel } from './../models/task-process-variable.mode
import { WidgetVisibilityModel, WidgetTypeEnum } from './../models/widget-visibility.model';
import { WidgetVisibilityService } from './widget-visibility.service';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock';
import {
@@ -36,6 +34,7 @@ import {
formTest, formValues, complexVisibilityJsonVisible,
nextConditionForm, complexVisibilityJsonNotVisible,
headerVisibilityCond } from 'core/mock/form/widget-visibility-cloud.service.mock';
import { CoreTestingModule } from '../../testing/core.testing.module';
declare let jasmine: any;
@@ -47,8 +46,7 @@ describe('WidgetVisibilityCloudService', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }

View File

@@ -27,8 +27,6 @@ import { TaskProcessVariableModel } from './../models/task-process-variable.mode
import { WidgetVisibilityModel } from './../models/widget-visibility.model';
import { WidgetVisibilityService } from './widget-visibility.service';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock';
import { fakeTaskProcessVariableModels,
@@ -37,6 +35,7 @@ import { fakeTaskProcessVariableModels,
complexVisibilityJsonNotVisible, tabVisibilityJsonMock,
tabInvalidFormVisibility } from 'core/mock/form/widget-visibility.service.mock';
import { formWithOneVisibleAndOneInvisibleFieldMock, formWithOneVisibleAndOneInvisibleTabMock } from '../components/mock/form-renderer.component.mock';
import { CoreTestingModule } from '../../testing/core.testing.module';
declare let jasmine: any;
@@ -48,8 +47,7 @@ describe('WidgetVisibilityService', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }

View File

@@ -21,10 +21,9 @@ import { MatTabChangeEvent } from '@angular/material';
import { By } from '@angular/platform-browser';
import { InfoDrawerComponent } from './info-drawer.component';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { of } from 'rxjs';
import { TranslateService } from '@ngx-translate/core';
import { CoreTestingModule } from '../testing/core.testing.module';
describe('InfoDrawerComponent', () => {
let element: HTMLElement;
@@ -34,8 +33,7 @@ describe('InfoDrawerComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});
@@ -93,8 +91,7 @@ describe('Custom InfoDrawer', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
],
declarations: [
CustomInfoDrawerComponent

View File

@@ -27,7 +27,7 @@ import { TranslateModule } from '@ngx-translate/core';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild()
TranslateModule
],
declarations: [
InfoDrawerLayoutComponent,

View File

@@ -33,7 +33,7 @@ import { TranslateModule } from '@ngx-translate/core';
CommonModule,
MaterialModule,
RouterModule,
TranslateModule.forChild()
TranslateModule
],
exports: [
SidenavLayoutHeaderDirective,

View File

@@ -35,7 +35,7 @@ import { LoginDialogPanelComponent } from './components/login-dialog-panel.compo
FormsModule,
ReactiveFormsModule,
CommonModule,
TranslateModule.forChild()
TranslateModule
],
declarations: [
LoginComponent,

View File

@@ -27,7 +27,7 @@ import { NotificationIconPipe } from './pipes/notification-icon.pipe';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild()
TranslateModule
],
declarations: [
NotificationHistoryComponent,

View File

@@ -16,17 +16,15 @@
*/
import { LiveAnnouncer } from '@angular/cdk/a11y';
import { OVERLAY_PROVIDERS, OverlayModule } from '@angular/cdk/overlay';
import { OverlayModule } from '@angular/cdk/overlay';
import { Component } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatSnackBar, MatSnackBarModule, MatSnackBarConfig } from '@angular/material';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { NotificationService } from './notification.service';
import { TranslationMock } from '../../mock/translation.service.mock';
import { TranslationService } from '../../services/translation.service';
import { HttpClientModule } from '@angular/common/http';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreTestingModule } from '../../testing/core.testing.module';
@Component({
template: '',
@@ -79,18 +77,14 @@ describe('NotificationService', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreTestingModule,
OverlayModule,
MatSnackBarModule,
HttpClientModule
MatSnackBarModule
],
declarations: [ProvidesNotificationServiceComponent],
providers: [
NotificationService,
MatSnackBar,
OVERLAY_PROVIDERS,
LiveAnnouncer,
{ provide: TranslationService, useClass: TranslationMock }
LiveAnnouncer
]
});

View File

@@ -19,7 +19,6 @@
"@angular/core": ">=7.0.3",
"@angular/flex-layout": ">=7.0.0-beta.19",
"@angular/forms": ">=7.0.3",
"@angular/http": ">=7.0.3",
"@angular/material": ">=7.0.3",
"@angular/material-moment-adapter": ">=7.0.3",
"@angular/platform-browser": ">=7.0.3",

View File

@@ -26,7 +26,7 @@ import { PaginationComponent } from './pagination.component';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild()
TranslateModule
],
declarations: [
InfinitePaginationComponent,

View File

@@ -30,7 +30,7 @@ import { SearchTriggerDirective } from './search-trigger.directive';
],
imports: [
CommonModule,
TranslateModule.forChild(),
TranslateModule,
MaterialModule,
FormsModule
],

View File

@@ -19,9 +19,9 @@ import { TestBed } from '@angular/core/testing';
import { BpmUserModel } from '../models/bpm-user.model';
import { BpmUserService } from '../services/bpm-user.service';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { AlfrescoApiService } from './alfresco-api.service';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { CoreTestingModule } from '../testing/core.testing.module';
declare let jasmine: any;
@@ -31,7 +31,7 @@ describe('Bpm user service', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }

View File

@@ -16,19 +16,13 @@
*/
import { TestBed } from '@angular/core/testing';
import { CookieServiceMock } from '../mock/cookie.service.mock';
import { ContentService } from './content.service';
import { AppConfigService } from '../app-config/app-config.service';
import { AuthenticationService } from './authentication.service';
import { CookieService } from './cookie.service';
import { StorageService } from './storage.service';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { AlfrescoApiService } from './alfresco-api.service';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { TranslationService } from './translation.service';
import { TranslationMock } from '../mock/translation.service.mock';
import { Node } from '@alfresco/js-api';
import { CoreTestingModule } from '../testing';
declare let jasmine: any;
@@ -43,12 +37,7 @@ describe('ContentService', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
{ provide: TranslationService, useClass: TranslationMock },
{ provide: CookieService, useClass: CookieServiceMock }
CoreTestingModule
]
});

View File

@@ -20,8 +20,8 @@ import { AuthenticationService, ContentService, AlfrescoApiService } from '.';
import { fakeEcmUser } from '../mock/ecm-user.service.mock';
import { EcmUserService } from '../services/ecm-user.service';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { CoreTestingModule } from '../testing/core.testing.module';
declare let jasmine: any;
@@ -33,7 +33,7 @@ describe('EcmUserService', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }

View File

@@ -18,7 +18,6 @@
import { async, TestBed } from '@angular/core/testing';
import {
AlfrescoApiServiceMock,
CoreModule,
setupTestBed,
AlfrescoApiService,
LogService,
@@ -42,6 +41,7 @@ import {
deleteGroupMappingApi,
mockIdentityGroupsCount
} from '../mock/identity-group.service.mock';
import { CoreTestingModule } from '../testing/core.testing.module';
describe('IdentityGroupService', () => {
let service: IdentityGroupService;
@@ -49,7 +49,9 @@ describe('IdentityGroupService', () => {
let logService: LogService;
setupTestBed({
imports: [CoreModule.forRoot()],
imports: [
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }
]

View File

@@ -39,11 +39,11 @@ import {
} from 'core/mock/identity-user.service.mock';
import { IdentityUserService } from '../services/identity-user.service';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { AlfrescoApiService } from './alfresco-api.service';
import { mockToken } from '../mock/jwt-helper.service.spec';
import { IdentityRoleModel } from '../models/identity-role.model';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { CoreTestingModule } from '../testing/core.testing.module';
describe('IdentityUserService', () => {
@@ -60,7 +60,7 @@ describe('IdentityUserService', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }

View File

@@ -20,7 +20,7 @@ import { setupTestBed } from '../testing/setup-test-bed';
import { MatDialog } from '@angular/material';
import { LoginDialogService } from './login-dialog.service';
import { Subject, of } from 'rxjs';
import { CoreModule } from '../core.module';
import { CoreTestingModule } from '../testing/core.testing.module';
describe('LoginDialogService', () => {
@@ -29,7 +29,9 @@ describe('LoginDialogService', () => {
let spyOnDialogOpen: jasmine.Spy;
setupTestBed({
imports: [CoreModule.forRoot()]
imports: [
CoreTestingModule
]
});
beforeEach(() => {

View File

@@ -16,13 +16,12 @@
*/
import { TestBed } from '@angular/core/testing';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { NodesApiService } from './nodes-api.service';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { AlfrescoApiService } from './alfresco-api.service';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { NodeMetadata } from '../models/node-metadata.model';
import { CoreTestingModule } from '../testing/core.testing.module';
describe('NodesApiService', () => {
let service: NodesApiService;
@@ -51,8 +50,7 @@ describe('NodesApiService', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }

View File

@@ -17,11 +17,12 @@
import { TestBed } from '@angular/core/testing';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { AppConfigService } from '../app-config/app-config.service';
import { PageTitleService } from './page-title.service';
import { TranslationService } from './translation.service';
import { Title } from '@angular/platform-browser';
import { CoreModule } from '../core.module';
import { TranslateModule } from '@ngx-translate/core';
describe('PageTitleService', () => {
@@ -33,6 +34,7 @@ describe('PageTitleService', () => {
setupTestBed({
imports: [
TranslateModule.forRoot(),
CoreModule.forRoot()
]
});

View File

@@ -19,10 +19,10 @@ import { TestBed } from '@angular/core/testing';
import { fakeRendition, fakeRenditionCreated, fakeRenditionsList, fakeRenditionsListWithACreated } from '../mock/renditions-service.mock';
import { RenditionsService } from './renditions.service';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { AlfrescoApiService } from './alfresco-api.service';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { RenditionEntry } from '@alfresco/js-api';
import { CoreTestingModule } from '../testing/core.testing.module';
declare let jasmine: any;
@@ -31,7 +31,7 @@ describe('RenditionsService', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }

View File

@@ -17,15 +17,10 @@
import { TestBed } from '@angular/core/testing';
import { searchMockApi, mockError, fakeSearch } from '../mock/search.service.mock';
import { CookieServiceMock } from './../mock/cookie.service.mock';
import { CookieService } from './cookie.service';
import { SearchService } from './search.service';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { AlfrescoApiService } from './alfresco-api.service';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { TranslationService } from './translation.service';
import { TranslationMock } from '../mock/translation.service.mock';
import { CoreTestingModule } from '../testing/core.testing.module';
describe('SearchService', () => {
@@ -34,12 +29,7 @@ describe('SearchService', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
],
providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
{ provide: TranslationService, useClass: TranslationMock },
{ provide: CookieService, useClass: CookieServiceMock }
CoreTestingModule
]
});

View File

@@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing';
import { TranslateLoaderService } from './translate-loader.service';
import { TranslationService } from './translation.service';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreModule } from '../core.module';
import { CoreTestingModule } from '../testing/core.testing.module';
declare let jasmine: any;
@@ -29,7 +29,10 @@ describe('TranslateLoader', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
providers: [
TranslationService
]
});

View File

@@ -27,7 +27,7 @@ import { HostSettingsComponent } from './host-settings.component';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild(),
TranslateModule,
FormsModule,
ReactiveFormsModule
],

View File

@@ -25,7 +25,7 @@ import { SortingPickerComponent } from './sorting-picker.component';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild()
TranslateModule
],
declarations: [
SortingPickerComponent

View File

@@ -18,12 +18,10 @@
import { Component } from '@angular/core';
import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { setupTestBed, CoreModule, TranslationService } from '@alfresco/adf-core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TemplateModule } from '../template.module';
import { TranslationMock } from '../../mock/translation.service.mock';
import { setupTestBed } from '@alfresco/adf-core';
import { TranslateService } from '@ngx-translate/core';
import { of } from 'rxjs';
import { CoreTestingModule } from '../../testing/core.testing.module';
@Component({
selector: 'adf-test-component',
@@ -47,15 +45,10 @@ describe('EmptyContentComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot(),
TemplateModule
CoreTestingModule
],
declarations: [
TestComponent
],
providers: [
{ provide: TranslationService, useClass: TranslationMock }
]
});

View File

@@ -19,7 +19,6 @@ import { TestBed, async } from '@angular/core/testing';
import { CoreTestingModule } from '../../testing/core.testing.module';
import { ErrorContentComponent } from './error-content.component';
import { TranslationService } from '../../services/translation.service';
import { TranslationMock } from '../../mock/translation.service.mock';
import { setupTestBed } from '../../testing/setup-test-bed';
import { ActivatedRoute } from '@angular/router';
import { of } from 'rxjs';
@@ -50,7 +49,6 @@ describe('ErrorContentComponent', () => {
CoreTestingModule
],
providers: [
{ provide: TranslationService, useClass: TranslationMock },
{ provide: ActivatedRoute, useValue: { params: of() } }
]
});
@@ -114,7 +112,6 @@ describe('ErrorContentComponent', () => {
CoreTestingModule
],
providers: [
{ provide: TranslationService, useClass: TranslationMock },
{ provide: ActivatedRoute, useValue: { params: of({ id: '404' }) } }
]
});

View File

@@ -26,7 +26,7 @@ import { EmptyContentComponent } from './empty-content/empty-content.component';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild()
TranslateModule
],
declarations: [
ErrorContentComponent,

View File

@@ -18,6 +18,7 @@
import { NgModule } from '@angular/core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing';
import { TranslateModule } from '@ngx-translate/core';
import { CoreModule } from '../core.module';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
@@ -28,9 +29,16 @@ import { TranslationMock } from '../mock/translation.service.mock';
import { DatePipe } from '@angular/common';
import { CookieService } from '../services/cookie.service';
import { CookieServiceMock } from '../mock/cookie.service.mock';
import { HttpClientModule } from '@angular/common/http';
@NgModule({
imports: [NoopAnimationsModule, RouterTestingModule, CoreModule.forRoot()],
imports: [
NoopAnimationsModule,
RouterTestingModule,
HttpClientModule,
TranslateModule.forRoot(),
CoreModule.forRoot()
],
providers: [
DatePipe,
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
@@ -40,7 +48,9 @@ import { CookieServiceMock } from '../mock/cookie.service.mock';
],
exports: [
NoopAnimationsModule
NoopAnimationsModule,
CoreModule,
TranslateModule
]
})
export class CoreTestingModule {}

View File

@@ -16,3 +16,4 @@
*/
export * from './setup-test-bed';
export * from './core.testing.module';

View File

@@ -27,7 +27,7 @@ import { UserInfoComponent } from './components/user-info.component';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild(),
TranslateModule,
PipeModule
],
declarations: [

View File

@@ -21,8 +21,8 @@ import { ContentService } from '../../services/content.service';
import { ImgViewerComponent } from './img-viewer.component';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { AppConfigService, AppConfigServiceMock } from '@alfresco/adf-core';
import { CoreTestingModule } from '../../testing/core.testing.module';
describe('Test Img viewer component ', () => {
@@ -38,7 +38,7 @@ describe('Test Img viewer component ', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: AppConfigService, useClass: AppConfigServiceMock }

View File

@@ -19,8 +19,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { PdfPasswordDialogComponent } from './pdf-viewer-password-dialog';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { CoreTestingModule } from '../../testing/core.testing.module';
declare const pdfjsLib: any;
@@ -31,8 +30,7 @@ describe('PdfPasswordDialogComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{

View File

@@ -19,7 +19,7 @@ import { DomSanitizer } from '@angular/platform-browser';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { PdfThumbComponent } from './pdf-viewer-thumb.component';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { CoreTestingModule } from '../../testing/core.testing.module';
describe('PdfThumbComponent', () => {
@@ -43,7 +43,7 @@ describe('PdfThumbComponent', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
providers: [
{ provide: DomSanitizer, useValue: domSanitizer }

View File

@@ -17,10 +17,9 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { PdfThumbListComponent } from './pdf-viewer-thumbnails.component';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { CoreTestingModule } from '../../testing/core.testing.module';
declare const pdfjsViewer: any;
@@ -63,8 +62,7 @@ describe('PdfThumbListComponent', () => {
setupTestBed({
imports: [
NoopAnimationsModule,
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -24,11 +24,9 @@ import { RIGHT_ARROW, LEFT_ARROW } from '@angular/cdk/keycodes';
import { MatDialog } from '@angular/material';
import { of } from 'rxjs';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { TranslationService } from '../../services/translation.service';
import { TranslationMock } from '../../mock/translation.service.mock';
import { take } from 'rxjs/operators';
import { AppConfigService, AppConfigServiceMock } from '@alfresco/adf-core';
import { AppConfigService } from '@alfresco/adf-core';
import { CoreTestingModule } from '../../testing/core.testing.module';
declare const pdfjsLib: any;
@@ -128,7 +126,7 @@ describe('Test PdfViewer component', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
],
declarations: [
TestDialogComponent,
@@ -137,8 +135,6 @@ describe('Test PdfViewer component', () => {
BlobTestComponent
],
providers: [
{ provide: TranslationService, useClass: TranslationMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock },
{
provide: MatDialog, useValue: {
open: () => {

View File

@@ -19,7 +19,7 @@ import { SimpleChange } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { TxtViewerComponent } from './txt-viewer.component';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { CoreTestingModule } from '../../testing/core.testing.module';
describe('Text View component', () => {
@@ -29,7 +29,7 @@ describe('Text View component', () => {
setupTestBed({
imports: [
CoreModule.forRoot()
CoreTestingModule
]
});

View File

@@ -21,8 +21,6 @@ import { Component } from '@angular/core';
import { ComponentFixture, TestBed, fakeAsync, tick, async } from '@angular/core/testing';
import { AlfrescoApiService, RenditionsService } from '../../services';
import { CoreModule } from '../../core.module';
import { throwError } from 'rxjs';
import { EventMock } from '../../mock/event.mock';
import { RenderingQueueServices } from '../services/rendering-queue.services';
@@ -30,7 +28,7 @@ import { ViewerComponent } from './viewer.component';
import { setupTestBed } from '../../testing/setup-test-bed';
import { AlfrescoApiServiceMock } from '../../mock/alfresco-api.service.mock';
import { NodeEntry } from '@alfresco/js-api';
import { RouterTestingModule } from '@angular/router/testing';
import { CoreTestingModule } from '../../testing/core.testing.module';
@Component({
selector: 'adf-viewer-container-toolbar',
@@ -130,8 +128,7 @@ describe('ViewerComponent', () => {
setupTestBed({
imports: [
CoreModule.forRoot(),
RouterTestingModule
CoreTestingModule
],
declarations: [
ViewerWithCustomToolbarComponent,

View File

@@ -22,8 +22,7 @@ import { async, TestBed } from '@angular/core/testing';
import { ViewerComponent } from '../components/viewer.component';
import { ViewerExtensionDirective } from './viewer-extension.directive';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreModule } from '../../core.module';
import { RouterTestingModule } from '@angular/router/testing';
import { CoreTestingModule } from '../../testing/core.testing.module';
describe('ExtensionViewerDirective', () => {
let extensionViewerDirective: ViewerExtensionDirective;
@@ -36,8 +35,7 @@ describe('ExtensionViewerDirective', () => {
setupTestBed({
imports: [
CoreModule.forRoot(),
RouterTestingModule
CoreTestingModule
],
providers: [
{ provide: Location, useClass: SpyLocation },

View File

@@ -48,7 +48,7 @@ import { A11yModule } from '@angular/cdk/a11y';
imports: [
CommonModule,
MaterialModule,
TranslateModule.forChild(),
TranslateModule,
FormsModule,
ReactiveFormsModule,
ToolbarModule,