From 1d1a881f6a572a1ba9259ddc0b7323782aa0eb40 Mon Sep 17 00:00:00 2001 From: Konstantin Dinev Date: Fri, 28 Mar 2025 09:20:52 +0200 Subject: [PATCH 1/8] refactor(tests): removing configureTestSuite() --- .../action-strip.component.spec.ts | 11 +- .../src/lib/combo/combo.component.spec.ts | 11 +- .../date-picker/date-picker.component.spec.ts | 4 +- .../for-of/for_of.directive.spec.ts | 122 ++++++++++-------- .../src/lib/grids/grid/cell.spec.ts | 60 +++++---- .../src/lib/grids/grid/column-hiding.spec.ts | 9 +- .../src/lib/grids/grid/column-moving.spec.ts | 12 +- .../lib/grids/grid/column-resizing.spec.ts | 9 +- .../lib/grids/grid/column-selection.spec.ts | 13 +- .../src/lib/grids/grid/column.spec.ts | 7 +- .../src/lib/grids/grid/grid-add-row.spec.ts | 10 +- .../lib/grids/grid/grid-cell-editing.spec.ts | 10 +- .../grids/grid/grid-cell-selection.spec.ts | 9 +- .../src/lib/grids/grid/grid-clipboard.spec.ts | 15 ++- .../grid/grid-collapsible-columns.spec.ts | 9 +- .../grid/grid-filtering-advanced.spec.ts | 8 +- .../lib/grids/grid/grid-filtering-ui.spec.ts | 22 ++-- .../src/lib/grids/grid/grid-filtering.spec.ts | 15 +-- .../grid/grid-keyBoardNav-headers.spec.ts | 33 +++-- .../lib/grids/grid/grid-keyBoardNav.spec.ts | 32 +++-- .../grids/grid/grid-mrl-keyboard-nav.spec.ts | 5 +- .../lib/grids/grid/grid-row-editing.spec.ts | 7 +- .../lib/grids/grid/grid-row-pinning.spec.ts | 10 +- .../src/lib/grids/grid/grid-summary.spec.ts | 9 +- .../src/lib/grids/grid/grid-toolbar.spec.ts | 10 +- .../lib/grids/grid/grid-validation.spec.ts | 9 +- .../src/lib/grids/grid/grid.crud.spec.ts | 13 +- .../src/lib/grids/grid/grid.groupby.spec.ts | 7 +- .../lib/grids/grid/grid.master-detail.spec.ts | 8 +- .../grid.multi-row-layout.integration.spec.ts | 10 +- .../grids/grid/grid.multi-row-layout.spec.ts | 10 +- .../lib/grids/grid/grid.nested.props.spec.ts | 33 +++-- .../lib/grids/grid/grid.pagination.spec.ts | 17 ++- .../src/lib/grids/grid/grid.sorting.spec.ts | 13 +- .../lib/grids/grid/row-drag.directive.spec.ts | 39 +++--- .../hierarchical-grid-add-row.spec.ts | 14 +- .../hierarchical-grid.navigation.spec.ts | 3 +- .../hierarchical-grid.virtualization.spec.ts | 17 +-- .../pivot-grid/pivot-data-selector.spec.ts | 23 ++-- .../pivot-grid-keyboard-nav.spec.ts | 17 +-- .../src/lib/grids/state.directive.spec.ts | 9 +- .../src/lib/list/list.component.spec.ts | 12 +- 42 files changed, 376 insertions(+), 340 deletions(-) diff --git a/projects/igniteui-angular/src/lib/action-strip/action-strip.component.spec.ts b/projects/igniteui-angular/src/lib/action-strip/action-strip.component.spec.ts index 52e5cca1dbb..b3772ad8e94 100644 --- a/projects/igniteui-angular/src/lib/action-strip/action-strip.component.spec.ts +++ b/projects/igniteui-angular/src/lib/action-strip/action-strip.component.spec.ts @@ -1,7 +1,6 @@ import { IgxActionStripComponent, IgxActionStripMenuItemDirective } from './action-strip.component'; import { Component, ViewChild, ElementRef, ViewContainerRef } from '@angular/core'; -import { configureTestSuite } from '../test-utils/configure-suite'; -import { TestBed } from '@angular/core/testing'; +import { TestBed, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { wait } from '../test-utils/ui-interactions.spec'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; @@ -17,8 +16,8 @@ describe('igxActionStrip', () => { let parentContainer: ElementRef; let innerContainer: ViewContainerRef; - configureTestSuite(() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxActionStripComponent, @@ -26,8 +25,8 @@ describe('igxActionStrip', () => { IgxActionStripMenuTestingComponent, IgxActionStripCombinedMenuTestingComponent ] - }); - }); + }).compileComponents(); + })); describe('Unit tests: ', () => { diff --git a/projects/igniteui-angular/src/lib/combo/combo.component.spec.ts b/projects/igniteui-angular/src/lib/combo/combo.component.spec.ts index 5f4c0bdc924..ef2d041d191 100644 --- a/projects/igniteui-angular/src/lib/combo/combo.component.spec.ts +++ b/projects/igniteui-angular/src/lib/combo/combo.component.spec.ts @@ -1,6 +1,6 @@ import { AsyncPipe } from '@angular/common'; import { AfterViewInit, ChangeDetectorRef, Component, DebugElement, ElementRef, Injectable, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { FormsModule, NgControl, NgForm, NgModel, ReactiveFormsModule, UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; @@ -15,7 +15,6 @@ import { IForOfState } from '../directives/for-of/for_of.directive'; import { IgxInputState } from '../directives/input/input.directive'; import { IgxLabelDirective } from '../input-group/public_api'; import { AbsoluteScrollStrategy, ConnectedPositioningStrategy } from '../services/public_api'; -import { configureTestSuite } from '../test-utils/configure-suite'; import { UIInteractions, wait } from '../test-utils/ui-interactions.spec'; import { IgxComboAddItemComponent } from './combo-add-item.component'; import { IgxComboDropDownComponent } from './combo-dropdown.component'; @@ -986,8 +985,8 @@ describe('igxCombo', () => { }); describe('Combo feature tests: ', () => { - configureTestSuite(() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxComboSampleComponent, @@ -998,8 +997,8 @@ describe('igxCombo', () => { IgxComboFormComponent, IgxComboInTemplatedFormComponent ] - }); - }); + }).compileComponents(); + })); describe('Initialization and rendering tests: ', () => { beforeEach(() => { diff --git a/projects/igniteui-angular/src/lib/date-picker/date-picker.component.spec.ts b/projects/igniteui-angular/src/lib/date-picker/date-picker.component.spec.ts index a85061000d8..5ab280f0a14 100644 --- a/projects/igniteui-angular/src/lib/date-picker/date-picker.component.spec.ts +++ b/projects/igniteui-angular/src/lib/date-picker/date-picker.component.spec.ts @@ -26,7 +26,6 @@ import localeES from "@angular/common/locales/es"; import localeBg from "@angular/common/locales/bg"; import { IgxDateTimeEditorDirective } from '../directives/date-time-editor/public_api'; -const CSS_CLASS_CALENDAR = 'igx-calendar'; const CSS_CLASS_DATE_PICKER = 'igx-date-picker'; const DATE_PICKER_TOGGLE_ICON = 'calendar_today'; @@ -37,8 +36,7 @@ const CSS_CLASS_INPUT_GROUP_INVALID = 'igx-input-group--invalid'; describe('IgxDatePicker', () => { describe('Integration tests', () => { - configureTestSuite(); - beforeAll(waitForAsync(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, diff --git a/projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.spec.ts b/projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.spec.ts index 7c5872e7e4f..d4e2e4f1d3a 100644 --- a/projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.spec.ts +++ b/projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.spec.ts @@ -17,13 +17,12 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { TestBed, ComponentFixture } from '@angular/core/testing'; +import { TestBed, ComponentFixture, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { BehaviorSubject, Observable } from 'rxjs'; import { IForOfState, IgxForOfDirective } from './for_of.directive'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { IgxForOfScrollSyncService } from './for_of.sync.service'; import { PlatformUtil } from '../../core/utils'; @@ -42,10 +41,10 @@ describe('IgxForOf directive -', () => { }); describe('empty virtual component', () => { - configureTestSuite((() => { + beforeEach(waitForAsync(() => { return TestBed.configureTestingModule({ imports: [EmptyVirtualComponent] - }); + }).compileComponents(); })); it('should initialize empty directive', () => { @@ -59,10 +58,10 @@ describe('IgxForOf directive -', () => { describe('horizontal virtual component', () => { let fix: ComponentFixture; - configureTestSuite((() => { + beforeEach(waitForAsync(() => { return TestBed.configureTestingModule({ imports: [HorizontalVirtualComponent] - }); + }).compileComponents(); })); beforeEach(() => { @@ -222,10 +221,12 @@ describe('IgxForOf directive -', () => { describe('vertical virtual component', () => { let fix: ComponentFixture; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [VerticalVirtualNoDataComponent, VerticalVirtualComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + VerticalVirtualNoDataComponent, VerticalVirtualComponent + ] + }).compileComponents(); })); beforeEach(() => { @@ -386,10 +387,12 @@ describe('IgxForOf directive -', () => { describe('vertical virtual component no data', () => { let fix: ComponentFixture; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [VerticalVirtualNoDataComponent, VerticalVirtualComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + VerticalVirtualNoDataComponent, VerticalVirtualComponent + ] + }).compileComponents(); })); beforeEach(() => { @@ -422,10 +425,12 @@ describe('IgxForOf directive -', () => { describe('vertical and horizontal virtual component', () => { let fix: ComponentFixture; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [VirtualComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + VirtualComponent + ] + }).compileComponents(); })); beforeEach(() => { @@ -1002,10 +1007,12 @@ describe('IgxForOf directive -', () => { }); describe('variable size component', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [VirtualVariableSizeComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + VirtualVariableSizeComponent + ] + }).compileComponents(); })); it('should update display container classes when content state changes from virtualized to non-virtualized.', () => { @@ -1043,10 +1050,12 @@ describe('IgxForOf directive -', () => { }); describe('remote virtual component', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [RemoteVirtualizationComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + RemoteVirtualizationComponent + ] + }).compileComponents(); })); it('should allow remote virtualization', async () => { @@ -1080,10 +1089,12 @@ describe('IgxForOf directive -', () => { }); describe('remote virtual component with specified igxForTotalItemCount', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [RemoteVirtCountComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + RemoteVirtCountComponent + ] + }).compileComponents(); })); it('should apply remote virtualization correctly', async () => { @@ -1117,10 +1128,12 @@ describe('IgxForOf directive -', () => { }); describe('no width and height component', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoWidthAndHeightComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoWidthAndHeightComponent + ] + }).compileComponents(); })); it('should use itemSize when no width or height are provided', () => { @@ -1136,10 +1149,12 @@ describe('IgxForOf directive -', () => { }); describe('even odd first last functions', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [LocalVariablesComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + LocalVariablesComponent + ] + }).compileComponents(); })); it('should differentiate even odd items', () => { @@ -1164,10 +1179,12 @@ describe('IgxForOf directive -', () => { }); describe('`as` syntax', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [LocalVariablesAsComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + LocalVariablesAsComponent + ] + }).compileComponents(); })); it('should get correct data using `as` syntax', () => { @@ -1185,10 +1202,12 @@ describe('IgxForOf directive -', () => { describe('on destroy', () => { let fix: ComponentFixture; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [VerticalVirtualDestroyComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + VerticalVirtualDestroyComponent + ] + }).compileComponents(); })); beforeEach(() => { @@ -1230,10 +1249,12 @@ describe('IgxForOf directive -', () => { describe('on create new instance', () => { let fix: ComponentFixture; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [VerticalVirtualCreateComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + VerticalVirtualCreateComponent + ] + }).compileComponents(); })); beforeEach(() => { @@ -1241,7 +1262,6 @@ describe('IgxForOf directive -', () => { fix.componentInstance.data = dg.generateVerticalData(fix.componentInstance.cols); fix.componentRef.hostView.detectChanges(); fix.detectChanges(); - }); it('should reset scroll position if new component is created.', async () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/cell.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/cell.spec.ts index 15965570927..aff3c464c83 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/cell.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/cell.spec.ts @@ -1,9 +1,8 @@ import { Component, ViewChild, OnInit, NgZone, DebugElement } from '@angular/core'; -import { TestBed, fakeAsync } from '@angular/core/testing'; +import { TestBed, fakeAsync, waitForAsync } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './public_api'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { SampleTestData } from '../../test-utils/sample-test-data.spec'; import { HammerGesturesManager } from '../../core/touch'; import { PlatformUtil } from '../../core/utils'; @@ -22,11 +21,12 @@ describe('IgxGrid - Cell component #grid', () => { let cellElem: DebugElement; let firstCell: CellType; let firstCellElem: CellType; - - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NoScrollsComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, NoScrollsComponent + ] + }).compileComponents(); })); beforeEach(() => { @@ -155,11 +155,11 @@ describe('IgxGrid - Cell component #grid', () => { let fix; let grid: IgxGridComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [NoopAnimationsModule, VirtualGridComponent], providers: [{ provide: NgZone, useFactory: () => new TestNgZone() }] - }); + }).compileComponents(); })); beforeEach(fakeAsync(() => { @@ -268,10 +268,12 @@ describe('IgxGrid - Cell component #grid', () => { }); describe('iOS tests', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NoScrollsComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, NoScrollsComponent + ] + }).compileComponents(); })); it('Should not attach doubletap handler for non-iOS', () => { @@ -324,10 +326,12 @@ describe('IgxGrid - Cell component #grid', () => { }); describe('No column widths', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NoColumnWidthGridComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, NoColumnWidthGridComponent + ] + }).compileComponents(); })); it('should not make last column width 0 when no column width is set', () => { @@ -342,10 +346,12 @@ describe('IgxGrid - Cell component #grid', () => { }); describe('Cells styles', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, ConditionalCellStyleTestComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, ConditionalCellStyleTestComponent + ] + }).compileComponents(); })); it('should be able to conditionally style cells', fakeAsync(() => { @@ -372,10 +378,12 @@ describe('IgxGrid - Cell component #grid', () => { }); describe('Cell properties', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, IgxGridDateTimeColumnComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, IgxGridDateTimeColumnComponent + ] + }).compileComponents(); })); it('verify that value of the cell title is correctly', fakeAsync(() => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts index cf8e1a00c68..75f886a5bf1 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/column-hiding.spec.ts @@ -1,12 +1,11 @@ import { DebugElement } from '@angular/core'; -import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, ComponentFixture, waitForAsync } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './grid.component'; import { ColumnHidingTestComponent, ColumnGroupsHidingTestComponent } from '../../test-utils/grid-base-components.spec'; import { UIInteractions } from '../../test-utils/ui-interactions.spec'; import { GridFunctions } from '../../test-utils/grid-functions.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { GridSelectionMode, ColumnDisplayOrder } from '../common/enums'; import { ControlsFunction } from '../../test-utils/controls-functions.spec'; import { IgxColumnActionsComponent } from '../column-actions/column-actions.component'; @@ -23,14 +22,14 @@ describe('Column Hiding UI #grid', () => { const verifyColumnIsHidden = GridFunctions.verifyColumnIsHidden; const getColumnHidingButton = GridFunctions.getColumnHidingButton; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, ColumnHidingTestComponent, ColumnGroupsHidingTestComponent ] - }); + }).compileComponents(); })); describe('Basic', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/column-moving.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/column-moving.spec.ts index 9735f4b849f..b3a14e74095 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/column-moving.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/column-moving.spec.ts @@ -1,5 +1,5 @@ import { DebugElement } from '@angular/core'; -import { TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; @@ -12,7 +12,6 @@ import { MultiColumnHeadersComponent } from '../../test-utils/grid-samples.spec'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { IgxGridComponent } from './grid.component'; import { GridSelectionFunctions, GridFunctions } from '../../test-utils/grid-functions.spec'; import { SortingDirection } from '../../data-operations/sorting-strategy'; @@ -25,8 +24,9 @@ describe('IgxGrid - Column Moving #grid', () => { const COLUMN_RESIZE_CLASS = '.igx-grid-th__resize-line'; let fixture; let grid: IgxGridComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ FormsModule, NoopAnimationsModule, @@ -35,7 +35,7 @@ describe('IgxGrid - Column Moving #grid', () => { MovableColumnsLargeComponent, MultiColumnHeadersComponent ] - }); + }).compileComponents(); })); describe('', () => { @@ -1349,7 +1349,7 @@ describe('IgxGrid - Column Moving #grid', () => { expect(grid.getColumnByName('ID').pinned).toBeFalsy(); })); - + it('Pinning - Should not be able to programmatically move unpinned column if disablePinning is enabled for all unpinned columns', (async () => { // step 1 - pin some columns grid.getColumnByName('Address').pinned = true; diff --git a/projects/igniteui-angular/src/lib/grids/grid/column-resizing.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/column-resizing.spec.ts index b510df76d26..8342c14f665 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/column-resizing.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/column-resizing.spec.ts @@ -1,5 +1,5 @@ import { Component, DebugElement, OnInit, ViewChild } from '@angular/core'; -import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, ComponentFixture, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { Calendar } from '../../calendar/public_api'; @@ -8,7 +8,6 @@ import { UIInteractions } from '../../test-utils/ui-interactions.spec'; import { GridTemplateStrings, ColumnDefinitions } from '../../test-utils/template-strings.spec'; import { SampleTestData } from '../../test-utils/sample-test-data.spec'; import { MultiColumnHeadersComponent } from '../../test-utils/grid-samples.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { GridFunctions } from '../../test-utils/grid-functions.spec'; import { IgxCellHeaderTemplateDirective, IgxCellTemplateDirective } from '../columns/templates.directive'; import { IgxAvatarComponent } from '../../avatar/avatar.component'; @@ -21,8 +20,8 @@ describe('IgxGrid - Deferred Column Resizing #grid', () => { const COLUMN_HEADER_GROUP_CLASS = '.igx-grid-thead__item'; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ MultiColumnHeadersComponent, NoopAnimationsModule, @@ -33,7 +32,7 @@ describe('IgxGrid - Deferred Column Resizing #grid', () => { ColGridComponent, ColPercentageGridComponent ] - }); + }).compileComponents(); })); describe('Base tests: ', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/column-selection.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/column-selection.spec.ts index e8ad627d92a..98e69072263 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/column-selection.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/column-selection.spec.ts @@ -1,5 +1,4 @@ -import { TestBed, ComponentFixture, fakeAsync, tick } from '@angular/core/testing'; -import { configureTestSuite } from '../../test-utils/configure-suite'; +import { TestBed, ComponentFixture, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { IgxGridComponent } from './grid.component'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ProductsComponent, ColumnSelectionGroupTestComponent } from '../../test-utils/grid-samples.spec'; @@ -31,10 +30,12 @@ describe('IgxGrid - Column Selection #grid', () => { let fix: ComponentFixture; let grid: IgxGridComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [ProductsComponent, ColumnSelectionGroupTestComponent, NoopAnimationsModule] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ProductsComponent, ColumnSelectionGroupTestComponent, NoopAnimationsModule + ] + }).compileComponents(); })); describe('Base tests: ', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/column.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/column.spec.ts index 7f4ee5f57d5..591b01000ed 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/column.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/column.spec.ts @@ -17,7 +17,6 @@ import { IgxGridPercentColumnComponent, IgxGridDateTimeColumnComponent } from '../../test-utils/grid-samples.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; @@ -39,8 +38,8 @@ describe('IgxGrid - Column properties #grid', () => { const COLUMN_HEADER_CLASS = '.igx-grid-th'; const COLUMN_HEADER_GROUP_CLASS = '.igx-grid-thead__item'; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ ColumnCellFormatterComponent, ColumnHiddenFromMarkupComponent, @@ -58,7 +57,7 @@ describe('IgxGrid - Column properties #grid', () => { ResizableColumnsComponent, DOMAttributesAsSettersComponent ] - }); + }).compileComponents(); })); it('should correctly initialize column templates', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-add-row.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-add-row.spec.ts index 00d47b7d39d..c04441e4637 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-add-row.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-add-row.spec.ts @@ -1,7 +1,6 @@ import { IgxGridComponent } from './public_api'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { configureTestSuite } from '../../test-utils/configure-suite'; +import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { DebugElement } from '@angular/core'; import { GridFunctions, GridSummaryFunctions } from '../../test-utils/grid-functions.spec'; import { @@ -38,8 +37,9 @@ describe('IgxGrid - Row Adding #grid', () => { const endEvent = new AnimationEvent('animationend'); animationElem.dispatchEvent(endEvent); }; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxAddRowComponent, @@ -48,7 +48,7 @@ describe('IgxGrid - Row Adding #grid', () => { ColumnLayoutTestComponent, DefaultGridMasterDetailComponent ] - }); + }).compileComponents(); })); describe('General tests', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-cell-editing.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-cell-editing.spec.ts index 7cfb9e4dc46..3dc024909d5 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-cell-editing.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-cell-editing.spec.ts @@ -1,9 +1,8 @@ -import { TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './public_api'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition'; import { GridFunctions } from '../../test-utils/grid-functions.spec'; import { @@ -25,8 +24,9 @@ const CELL_CLASS_IN_EDIT_MODE = 'igx-grid__td--editing'; const EDITED_CELL_CSS_CLASS = 'igx-grid__td--edited'; describe('IgxGrid - Cell Editing #grid', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, CellEditingTestComponent, @@ -34,7 +34,7 @@ describe('IgxGrid - Cell Editing #grid', () => { ColumnEditablePropertyTestComponent, SelectionWithTransactionsComponent ] - }); + }).compileComponents(); })); describe('Base Tests', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-cell-selection.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-cell-selection.spec.ts index a3a6f9795f0..0f4e5dae2ae 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-cell-selection.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-cell-selection.spec.ts @@ -1,7 +1,6 @@ -import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, ComponentFixture, waitForAsync } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './public_api'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { SelectionWithScrollsComponent, SelectionWithTransactionsComponent, @@ -20,8 +19,8 @@ import { DropPosition } from '../moving/moving.service'; import { IgxGridGroupByRowComponent } from './groupby-row.component'; describe('IgxGrid - Cell selection #grid', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, SelectionWithScrollsComponent, @@ -29,7 +28,7 @@ describe('IgxGrid - Cell selection #grid', () => { CellSelectionNoneComponent, CellSelectionSingleComponent ] - }); + }).compileComponents(); })); describe('Base', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-clipboard.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-clipboard.spec.ts index 09e9552301e..72a109ee81e 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-clipboard.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-clipboard.spec.ts @@ -1,8 +1,7 @@ -import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './public_api'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { IgxGridClipboardComponent } from '../../test-utils/grid-samples.spec'; import { CancelableEventArgs } from '../../core/utils'; import { take } from 'rxjs/operators'; @@ -14,10 +13,12 @@ describe('IgxGrid - Clipboard #grid', () => { let fix: ComponentFixture; let grid: IgxGridComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [IgxGridClipboardComponent, NoopAnimationsModule] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + IgxGridClipboardComponent, NoopAnimationsModule + ] + }).compileComponents(); })); beforeEach(() => { @@ -35,7 +36,7 @@ describe('IgxGrid - Clipboard #grid', () => { const eventData = dispatchCopyEventOnGridBody(fix); expect(copySpy).toHaveBeenCalledTimes(1); expect(eventData). - + toEqual('ProductNameHeader\tDownloads\tReleased\r\n** Ignite UI for JavaScript **\t254\tfalse\r\n** NetAdvantage **\t127\ttrue\r\n'); }); diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-collapsible-columns.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-collapsible-columns.spec.ts index a7cbe6fefc7..fa9b478f5c1 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-collapsible-columns.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-collapsible-columns.spec.ts @@ -1,7 +1,6 @@ -import { TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { IgxGridComponent } from './grid.component'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { CollapsibleColumnGroupTestComponent, CollapsibleGroupsTemplatesTestComponent, @@ -23,15 +22,15 @@ describe('IgxGrid - multi-column headers #grid', () => { let countryCol; let emptyCol; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, CollapsibleColumnGroupTestComponent, CollapsibleGroupsTemplatesTestComponent, CollapsibleGroupsDynamicColComponent ] - }); + }).compileComponents(); })); describe('Base Tests', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts index 9fb2b661cfe..0376cf7b08f 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts @@ -1,4 +1,4 @@ -import { fakeAsync, TestBed, tick, flush, ComponentFixture } from '@angular/core/testing'; +import { fakeAsync, TestBed, tick, flush, ComponentFixture, waitForAsync } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './grid.component'; import { UIInteractions } from '../../test-utils/ui-interactions.spec'; @@ -30,8 +30,8 @@ import { IgxDateTimeEditorDirective } from '../../directives/date-time-editor/da import { QueryBuilderSelectors } from '../../query-builder/query-builder.common'; describe('IgxGrid - Advanced Filtering #grid - ', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxGridAdvancedFilteringColumnGroupComponent, @@ -42,7 +42,7 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => { IgxGridAdvancedFilteringDynamicColumnsComponent, IgxGridAdvancedFilteringWithToolbarComponent ] - }); + }).compileComponents(); })); describe('General tests - ', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts index 1f10776b013..eb96e37a594 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-ui.spec.ts @@ -1,11 +1,10 @@ import { DebugElement } from '@angular/core'; -import { fakeAsync, TestBed, tick, flush, ComponentFixture } from '@angular/core/testing'; +import { fakeAsync, TestBed, tick, flush, ComponentFixture, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxInputDirective } from '../../directives/input/input.directive'; import { IgxGridComponent } from './grid.component'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { IgxNumberFilteringOperand, IgxDateFilteringOperand, @@ -66,9 +65,8 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => { registerLocaleData(localeDe); registerLocaleData(localeFr); - - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxGridFilteringComponent, @@ -78,7 +76,7 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => { IgxGridDatesFilteringComponent, IgxGridFilteringNumericComponent ] - }); + }).compileComponents(); })); describe(null, () => { @@ -3191,8 +3189,8 @@ describe('IgxGrid - Filtering Row UI actions #grid', () => { }); describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxGridFilteringComponent, @@ -3203,7 +3201,7 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => { IgxGridExternalESFComponent, IgxGridExternalESFTemplateComponent ] - }); + }).compileComponents(); })); describe(null, () => { @@ -7035,13 +7033,13 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => { describe('IgxGrid - Custom Filtering Strategy #grid', () => { let fix: ComponentFixture; let grid: IgxGridComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, CustomFilteringStrategyComponent ] - }); + }).compileComponents(); })); beforeEach(fakeAsync(() => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering.spec.ts index ea11c13df6a..5a6c9d66863 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering.spec.ts @@ -1,9 +1,8 @@ -import { TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { FilteringLogic, IFilteringExpression } from '../../data-operations/filtering-expression.interface'; import { IgxGridComponent } from './grid.component'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { IgxChipComponent } from '../../chips/public_api'; import { IgxStringFilteringOperand, @@ -21,12 +20,12 @@ import { NoopFilteringStrategy } from '../../data-operations/filtering-strategy' import { ExpressionUI } from '../filtering/excel-style/common'; describe('IgxGrid - Filtering actions #grid', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ IgxGridFilteringComponent, NoopAnimationsModule ] - }); + }).compileComponents(); })); let fix; let grid; @@ -1159,13 +1158,13 @@ describe('IgxGrid - Filtering actions #grid', () => { }); describe('IgxGrid - Filtering expression tree bindings #grid', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxGridFilteringBindingComponent ] - }); + }).compileComponents(); })); let fix; let grid: IgxGridComponent; diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav-headers.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav-headers.spec.ts index a78181b71ee..d7a37146f98 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav-headers.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav-headers.spec.ts @@ -1,10 +1,9 @@ -import { TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './grid.component'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; import { clearGridSubs, setupGridScrollDetection } from '../../test-utils/helper-utils.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { SelectionWithScrollsComponent, MRLTestComponent, @@ -24,10 +23,12 @@ describe('IgxGrid - Headers Keyboard navigation #grid', () => { let fix; let grid: IgxGridComponent; let gridHeader: IgxGridHeaderRowComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [SelectionWithScrollsComponent, NoopAnimationsModule] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + SelectionWithScrollsComponent, NoopAnimationsModule + ] + }).compileComponents(); })); beforeEach(() => { @@ -727,10 +728,12 @@ describe('IgxGrid - Headers Keyboard navigation #grid', () => { let fix; let grid: IgxGridComponent; let gridHeader: IgxGridHeaderRowComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [MRLTestComponent, NoopAnimationsModule] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + MRLTestComponent, NoopAnimationsModule + ] + }).compileComponents(); })); beforeEach(() => { @@ -929,10 +932,12 @@ describe('IgxGrid - Headers Keyboard navigation #grid', () => { let fix; let grid: IgxGridComponent; let gridHeader: IgxGridHeaderRowComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [ColumnGroupsNavigationTestComponent, NoopAnimationsModule] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ColumnGroupsNavigationTestComponent, NoopAnimationsModule + ] + }).compileComponents(); })); beforeEach(() => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts index 98865bad8c4..ebfbc56b650 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts @@ -1,4 +1,4 @@ -import { TestBed } from '@angular/core/testing'; +import { TestBed, waitForAsync } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './grid.component'; import { IGridCellEventArgs, IActiveNodeChangeEventArgs } from '../common/events'; @@ -25,10 +25,12 @@ describe('IgxGrid - Keyboard navigation #grid', () => { let fix; let grid: IgxGridComponent; let gridContent: DebugElement; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoScrollsComponent, NoopAnimationsModule] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoScrollsComponent, NoopAnimationsModule + ] + }).compileComponents(); })); beforeEach(() => { @@ -206,10 +208,12 @@ describe('IgxGrid - Keyboard navigation #grid', () => { let fix; let grid: IgxGridComponent; let gridContent: DebugElement; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, VirtualGridComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + VirtualGridComponent, NoopAnimationsModule + ] + }).compileComponents(); })); beforeEach(() => { @@ -686,10 +690,12 @@ describe('IgxGrid - Keyboard navigation #grid', () => { }); describe('Group By navigation ', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [IgxGridGroupByComponent, NoopAnimationsModule] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + IgxGridGroupByComponent, NoopAnimationsModule + ] + }).compileComponents(); })); let fix; diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-mrl-keyboard-nav.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-mrl-keyboard-nav.spec.ts index b9ba2d1ae66..13fa654dde0 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-mrl-keyboard-nav.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-mrl-keyboard-nav.spec.ts @@ -4,7 +4,6 @@ import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './grid.component'; import { SampleTestData } from '../../test-utils/sample-test-data.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec'; import { clearGridSubs, setupGridScrollDetection } from '../../test-utils/helper-utils.spec'; import { DefaultSortingStrategy, SortingDirection } from '../../data-operations/sorting-strategy'; @@ -22,9 +21,7 @@ const CELL_BLOCK = `.${GRID_MRL_BLOCK}`; describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => { let fix: ComponentFixture; - configureTestSuite(); - - beforeAll(waitForAsync(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [NoopAnimationsModule, ColumnLayoutTestComponent] }).compileComponents(); diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts index bc7a2bd02cd..b3120ebdc5f 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts @@ -8,7 +8,6 @@ import { IgxColumnComponent } from '../columns/column.component'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; import { IgxStringFilteringOperand, IgxNumberFilteringOperand } from '../../data-operations/filtering-condition'; import { TransactionType, Transaction } from '../../services/public_api'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { DefaultSortingStrategy, SortingDirection } from '../../data-operations/sorting-strategy'; import { clearGridSubs, setElementSize, setupGridScrollDetection } from '../../test-utils/helper-utils.spec'; import { GridFunctions, GridSummaryFunctions } from '../../test-utils/grid-functions.spec'; @@ -37,8 +36,8 @@ const COLUMN_HEADER_GROUP_CLASS = '.igx-grid-thead__item'; const DEBOUNCETIME = 30; describe('IgxGrid - Row Editing #grid', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxGridRowEditingComponent, @@ -50,7 +49,7 @@ describe('IgxGrid - Row Editing #grid', () => { IgxGridCustomRowEditTemplateComponent, VirtualGridComponent ] - }); + }).compileComponents(); })); describe('General tests', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-row-pinning.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-row-pinning.spec.ts index 7c8d7bb8ba7..bc7e5b42feb 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-row-pinning.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-row-pinning.spec.ts @@ -1,11 +1,10 @@ import { ViewChild, Component, DebugElement, OnInit, QueryList } from '@angular/core'; -import { TestBed } from '@angular/core/testing'; +import { TestBed, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './grid.component'; import { IgxGridDetailTemplateDirective } from '../public_api'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { ColumnPinningPosition, RowPinningPosition } from '../common/enums'; import { SampleTestData } from '../../test-utils/sample-test-data.spec'; import { GridFunctions } from '../../test-utils/grid-functions.spec'; @@ -26,9 +25,8 @@ describe('Row Pinning #grid', () => { let fix; let grid: IgxGridComponent; - - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, GridRowConditionalStylingComponent, @@ -38,7 +36,7 @@ describe('Row Pinning #grid', () => { GridRowPinningWithTransactionsComponent, GridRowPinningWithInitialPinningComponent ] - }); + }).compileComponents(); })); describe('', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-summary.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-summary.spec.ts index 6506ab34d91..b40998cd154 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-summary.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-summary.spec.ts @@ -1,11 +1,10 @@ import { Component, DebugElement, ViewChild } from '@angular/core'; -import { fakeAsync, TestBed, tick, ComponentFixture, flush } from '@angular/core/testing'; +import { fakeAsync, TestBed, tick, ComponentFixture, flush, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './grid.component'; import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec'; import { GridFunctions, GridSummaryFunctions } from '../../test-utils/grid-functions.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { ProductsComponent, SummaryColumnComponent, @@ -32,8 +31,8 @@ describe('IgxGrid - Summaries #grid', () => { const EMPTY_SUMMARY_CLASS = 'igx-grid-summary--empty'; const DEBOUNCETIME = 30; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, CustomSummariesComponent, @@ -43,7 +42,7 @@ describe('IgxGrid - Summaries #grid', () => { SummariesGroupByComponent, SummariesGroupByTransactionsComponent ] - }); + }).compileComponents(); })); describe('Base tests: ', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-toolbar.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-toolbar.spec.ts index c844b346d9f..a1e0c06b827 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-toolbar.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-toolbar.spec.ts @@ -1,9 +1,8 @@ import { Component, ViewChild } from '@angular/core'; -import { TestBed, fakeAsync, ComponentFixture, tick } from '@angular/core/testing'; +import { TestBed, fakeAsync, ComponentFixture, tick, waitForAsync } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AbsoluteScrollStrategy, GlobalPositionStrategy, IgxCsvExporterService, IgxExcelExporterService } from '../../services/public_api'; import { IgxGridComponent } from './public_api'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { GridFunctions } from "../../test-utils/grid-functions.spec"; import { By } from "@angular/platform-browser"; import { IgxGridToolbarComponent } from '../toolbar/grid-toolbar.component'; @@ -35,8 +34,9 @@ const DATA = [ ]; describe('IgxGrid - Grid Toolbar #grid - ', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, DefaultToolbarComponent, @@ -46,7 +46,7 @@ describe('IgxGrid - Grid Toolbar #grid - ', () => { IgxExcelExporterService, IgxCsvExporterService ] - }); + }).compileComponents(); })); describe('Basic Tests - ', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-validation.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-validation.spec.ts index 9a4ca70578f..d66bc8239c1 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-validation.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-validation.spec.ts @@ -1,4 +1,4 @@ -import { fakeAsync, flush, TestBed, tick } from '@angular/core/testing'; +import { fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { Validators } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; @@ -6,7 +6,6 @@ import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators' import { IgxInputDirective } from '../../directives/input/input.directive'; import { IgxTooltipTargetDirective } from '../../directives/tooltip/tooltip-target.directive'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-functions.spec'; import { IgxGridCustomEditorsComponent, @@ -21,8 +20,8 @@ import { IgxGridComponent } from './grid.component'; describe('IgxGrid - Validation #grid', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxGridValidationTestBaseComponent, @@ -30,7 +29,7 @@ describe('IgxGrid - Validation #grid', () => { IgxGridCustomEditorsComponent, IgxTreeGridValidationTestComponent ] - }); + }).compileComponents(); })); describe('Basic Validation - ', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.crud.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.crud.spec.ts index a8490204787..ef2a2639de1 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.crud.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.crud.spec.ts @@ -1,9 +1,8 @@ import { Component, ViewChild } from '@angular/core'; -import { TestBed, fakeAsync } from '@angular/core/testing'; +import { TestBed, fakeAsync, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { IgxGridComponent } from './grid.component'; import { wait } from '../../test-utils/ui-interactions.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IGridEditEventArgs } from '../common/events'; @@ -14,10 +13,12 @@ describe('IgxGrid - CRUD operations #grid', () => { let grid; let data; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, DefaultCRUDGridComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, DefaultCRUDGridComponent + ] + }).compileComponents(); })); beforeEach(fakeAsync(() => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.groupby.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.groupby.spec.ts index 1f38b49654f..a3d968f03d0 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.groupby.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.groupby.spec.ts @@ -12,7 +12,6 @@ import { IgxGridRowComponent } from './grid-row.component'; import { IgxChipComponent } from '../../chips/chip.component'; import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec'; import { DefaultSortingStrategy, ISortingExpression, SortingDirection } from '../../data-operations/sorting-strategy'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { DataParent, SampleTestData } from '../../test-utils/sample-test-data.spec'; import { MultiColumnHeadersWithGroupingComponent } from '../../test-utils/grid-samples.spec'; import { GridSelectionFunctions, GridFunctions, GRID_SCROLL_CLASS } from '../../test-utils/grid-functions.spec'; @@ -34,8 +33,8 @@ describe('IgxGrid - GroupBy #grid', () => { const DISABLED_CHIP = 'igx-chip--disabled'; const CHIP = 'igx-chip'; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, DefaultGridComponent, @@ -49,7 +48,7 @@ describe('IgxGrid - GroupBy #grid', () => { GridGroupByStateComponent, MultiColumnHeadersWithGroupingComponent ] - }); + }).compileComponents(); })); const checkGroups = (groupRows, expectedGroupOrder, grExpr?) => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.master-detail.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.master-detail.spec.ts index befa0a1dda2..55fc5e47ff1 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.master-detail.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.master-detail.spec.ts @@ -1,5 +1,5 @@ import { Component, ViewChild, OnInit, DebugElement, QueryList, TemplateRef } from '@angular/core'; -import { TestBed, ComponentFixture, fakeAsync, tick } from '@angular/core/testing'; +import { TestBed, ComponentFixture, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { configureTestSuite } from '../../test-utils/configure-suite'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { By } from '@angular/platform-browser'; @@ -32,15 +32,15 @@ describe('IgxGrid Master Detail #grid', () => { let fix: ComponentFixture; let grid: IgxGridComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, DefaultGridMasterDetailComponent, AllExpandedGridMasterDetailComponent, MRLMasterDetailComponent ] - }); + }).compileComponents(); })); describe('Basic', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.integration.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.integration.spec.ts index 355a3db62a4..72569e18ea7 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.integration.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.integration.spec.ts @@ -1,5 +1,4 @@ -import { configureTestSuite } from '../../test-utils/configure-suite'; -import { TestBed, waitForAsync, ComponentFixture } from '@angular/core/testing'; +import { TestBed, waitForAsync, ComponentFixture } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxGridComponent } from './grid.component'; @@ -30,8 +29,9 @@ describe('IgxGrid - multi-row-layout Integration #grid - ', () => { let fixture: ComponentFixture; let grid: IgxGridComponent; const COLUMN_HEADER_CLASS = '.igx-grid-th'; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, ColumnLayoutPinningTestComponent, @@ -40,7 +40,7 @@ describe('IgxGrid - multi-row-layout Integration #grid - ', () => { ColumnLayoutGroupingTestComponent, ColumnLayoutResizingTestComponent ] - }); + }).compileComponents(); })); describe('Hiding ', () => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.spec.ts index 99f6964f9ac..cbaee4b0fcd 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.multi-row-layout.spec.ts @@ -1,4 +1,4 @@ -import { TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { IgxGridComponent } from './grid.component'; import { Component, ViewChild } from '@angular/core'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; @@ -7,7 +7,6 @@ import { By } from '@angular/platform-browser'; import { SampleTestData } from '../../test-utils/sample-test-data.spec'; import { wait } from '../../test-utils/ui-interactions.spec'; import { DefaultSortingStrategy, SortingDirection } from '../../data-operations/sorting-strategy'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { ICellPosition } from '../common/events'; import { GridFunctions, GRID_MRL_BLOCK } from '../../test-utils/grid-functions.spec'; import { IgxColumnGroupComponent } from '../columns/column-group.component'; @@ -18,14 +17,15 @@ const GRID_MRL_BLOCK_CLASS = `.${GRID_MRL_BLOCK}`; describe('IgxGrid - multi-row-layout #grid', () => { const DEBOUNCE_TIME = 60; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, ColumnLayoutTestComponent, ColumnLayoutAndGroupsTestComponent ] - }); + }).compileComponents(); })); it('should initialize a grid with 1 column group', fakeAsync(() => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.nested.props.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.nested.props.spec.ts index 89b15856800..fe0a7974229 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.nested.props.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.nested.props.spec.ts @@ -1,5 +1,4 @@ -import { configureTestSuite } from '../../test-utils/configure-suite'; -import { TestBed, ComponentFixture, fakeAsync } from '@angular/core/testing'; +import { TestBed, ComponentFixture, fakeAsync, waitForAsync } from '@angular/core/testing'; import { IgxGridComponent } from './grid.component'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition'; @@ -207,10 +206,12 @@ describe('Grid - nested data source properties #grid', () => { fixture.detectChanges(); }; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NestedPropertiesGridComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, NestedPropertiesGridComponent + ] + }).compileComponents(); })); beforeEach(fakeAsync(() => { @@ -339,10 +340,12 @@ describe('Grid nested data advanced editing #grid', () => { fixture.detectChanges(); }; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NestedPropertiesGrid2Component] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, NestedPropertiesGrid2Component + ] + }).compileComponents(); })); beforeEach(() => { @@ -497,10 +500,12 @@ describe('Edit cell with data of type Array #grid', () => { fixture.detectChanges(); }; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NestedPropertyGridComponent] - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, NestedPropertyGridComponent + ] + }).compileComponents(); })); beforeEach(fakeAsync(() => { diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.pagination.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.pagination.spec.ts index 010ae6454ba..ce7b4d1ed96 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.pagination.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.pagination.spec.ts @@ -1,9 +1,8 @@ -import { TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { GridWithUndefinedDataComponent } from '../../test-utils/grid-samples.spec'; import { PagingComponent, RemotePagingComponent } from '../../test-utils/grid-base-components.spec'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { wait } from '../../test-utils/ui-interactions.spec'; import { IgxNumberFilteringOperand } from '../../data-operations/filtering-condition'; import { GridFunctions, PAGER_CLASS } from '../../test-utils/grid-functions.spec'; @@ -31,12 +30,16 @@ const verifyGridPager = (fix, rowsCount, firstCellValue, pagerText, buttonsVisib }; describe('IgxGrid - Grid Paging #grid', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, PagingComponent, + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, + PagingComponent, GridWithUndefinedDataComponent, - RemotePagingComponent] - }); + RemotePagingComponent + ] + }).compileComponents(); })); let fix; diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.sorting.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.sorting.spec.ts index dd924f4b7df..3611ecc5a7d 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.sorting.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.sorting.spec.ts @@ -1,7 +1,6 @@ -import { TestBed, fakeAsync, tick } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { IgxGridComponent } from './grid.component'; import { DefaultSortingStrategy, FormattedValuesSortingStrategy, SortingDirection } from '../../data-operations/sorting-strategy'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { GridFunctions } from '../../test-utils/grid-functions.spec'; import { GridDeclaredColumnsComponent, SortByParityComponent, GridWithPrimaryKeyComponent, SortByAnotherColumnComponent, SortOnInitComponent, IgxGridFormattedValuesSortingComponent } from '../../test-utils/grid-samples.spec'; @@ -16,8 +15,8 @@ describe('IgxGrid - Grid Sorting #grid', () => { let fixture; let grid: IgxGridComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ GridDeclaredColumnsComponent, SortByParityComponent, @@ -25,7 +24,7 @@ describe('IgxGrid - Grid Sorting #grid', () => { NoopAnimationsModule, IgxGridFormattedValuesSortingComponent ] - }); + }).compileComponents(); })); beforeEach(() => { @@ -630,7 +629,7 @@ describe('IgxGrid - Grid Sorting #grid', () => { // Verify that the grid is NOT sorted. expect(GridFunctions.getValueFromCellElement(GridFunctions.getCurrentCellFromGrid(grid, 0, 1))).toEqual('Jane'); - + expect(GridFunctions.getValueFromCellElement(GridFunctions.getCurrentCellFromGrid(grid, grid.data.length - 1, 1))).toEqual('Connor'); expect(GridFunctions.getColumnSortingIndex(firstHeaderCell)).toEqual(1); @@ -647,7 +646,7 @@ describe('IgxGrid - Grid Sorting #grid', () => { // Verify that the grid is NOT sorted. expect(GridFunctions.getValueFromCellElement(GridFunctions.getCurrentCellFromGrid(grid, 0, 1))).toEqual('Jane'); - + expect(GridFunctions.getValueFromCellElement(GridFunctions.getCurrentCellFromGrid(grid, grid.data.length - 1, 1))).toEqual('Connor'); expect(GridFunctions.getColumnSortingIndex(firstHeaderCell)).toEqual(1); diff --git a/projects/igniteui-angular/src/lib/grids/grid/row-drag.directive.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/row-drag.directive.spec.ts index 1b7be355e42..7d272f46d73 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/row-drag.directive.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/row-drag.directive.spec.ts @@ -1,9 +1,8 @@ import { Component, ViewChild, DebugElement, QueryList, TemplateRef } from '@angular/core'; -import { TestBed, ComponentFixture } from '@angular/core/testing'; +import { TestBed, ComponentFixture, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; import { DataParent, SampleTestData } from '../../test-utils/sample-test-data.spec'; import { Point } from '../../services/public_api'; @@ -59,14 +58,16 @@ describe('Row Drag Tests', () => { let rows: IgxRowDirective[]; let dragRows: DebugElement[]; let rowToDrag: IgxRowDirective; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxGridRowDraggableComponent ] - }); + }).compileComponents(); })); + beforeEach(() => { fixture = TestBed.createComponent(IgxGridRowDraggableComponent); grid = fixture.componentInstance.instance; @@ -407,13 +408,14 @@ describe('Row Drag Tests', () => { let grid: IgxGridComponent; let rows: IgxRowDirective[]; let dragRows: DebugElement[]; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxGridRowCustomGhostDraggableComponent ] - }); + }).compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(IgxGridRowCustomGhostDraggableComponent); @@ -492,13 +494,14 @@ describe('Row Drag Tests', () => { let dragGridRows: IgxRowDirective[]; let dropGridRows: IgxRowDirective[]; let dragRows: DebugElement[]; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxGridFeaturesRowDragComponent ] - }); + }).compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(IgxGridFeaturesRowDragComponent); @@ -944,14 +947,15 @@ describe('Row Drag Tests', () => { let dragGrid: IgxHierarchicalGridComponent; let dragRows: DebugElement[]; let pointerMoveToDropEvent: PointerEvent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxHierarchicalGridTestComponent, IgxHierarchicalGridCustomGhostTestComponent ] - }); + }).compileComponents(); })); it('should be able to drag row on every hierarchical level', () => { fixture = TestBed.createComponent(IgxHierarchicalGridTestComponent); @@ -1093,13 +1097,14 @@ describe('Row Drag Tests', () => { let dragGrid: IgxTreeGridComponent; let dragRows: DebugElement[]; let pointerMoveToDropEvent: PointerEvent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxTreeGridTestComponent ] - }); + }).compileComponents(); })); beforeEach(() => { fixture = TestBed.createComponent(IgxTreeGridTestComponent); diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-add-row.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-add-row.spec.ts index b78c525c4a4..265d9764ece 100644 --- a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-add-row.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-add-row.spec.ts @@ -1,6 +1,5 @@ -import { TestBed } from '@angular/core/testing'; +import { TestBed, waitForAsync } from '@angular/core/testing'; import { IgxHierarchicalGridComponent } from './public_api'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { IgxActionStripComponent } from '../../action-strip/public_api'; import { IgxHierarchicalGridActionStripComponent } from '../../test-utils/hierarchical-grid-components.spec'; @@ -17,10 +16,13 @@ describe('IgxHierarchicalGrid - Add Row UI #tGrid', () => { const endEvent = new AnimationEvent('animationend'); animationElem.dispatchEvent(endEvent); }; - configureTestSuite((() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, IgxHierarchicalGridActionStripComponent] - }); + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, IgxHierarchicalGridActionStripComponent + ] + }).compileComponents(); })); describe(' Basic', () => { diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.navigation.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.navigation.spec.ts index 86bb053cfac..179485e48fd 100644 --- a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.navigation.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.navigation.spec.ts @@ -11,7 +11,6 @@ import { clearGridSubs, setupHierarchicalGridScrollDetection } from '../../test- import { GridFunctions } from '../../test-utils/grid-functions.spec'; import { IgxGridCellComponent } from '../cell.component'; import { IGridCellEventArgs, IgxColumnComponent, IPathSegment } from '../public_api'; -import { IgxHierarchicalGridNavigationService } from './hierarchical-grid-navigation.service'; const DEBOUNCE_TIME = 50; const GRID_CONTENT_CLASS = '.igx-grid__tbody-content'; @@ -24,7 +23,7 @@ describe('IgxHierarchicalGrid Navigation', () => { const defaultTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL; configureTestSuite(); - beforeAll(waitForAsync(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.virtualization.spec.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.virtualization.spec.ts index 20b6e94edef..77585a088cc 100644 --- a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.virtualization.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.virtualization.spec.ts @@ -1,5 +1,4 @@ -import { configureTestSuite } from '../../test-utils/configure-suite'; -import { TestBed } from '@angular/core/testing'; +import { TestBed, waitForAsync } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { Component, ViewChild } from '@angular/core'; import { IgxHierarchicalGridComponent } from './hierarchical-grid.component'; @@ -20,14 +19,15 @@ import { firstValueFrom } from 'rxjs'; describe('IgxHierarchicalGrid Virtualization #hGrid', () => { let fixture; let hierarchicalGrid: IgxHierarchicalGridComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxHierarchicalGridTestBaseComponent, IgxHierarchicalGridDefaultComponent ] - }); + }).compileComponents(); })); beforeEach(() => { @@ -439,14 +439,15 @@ describe('IgxHierarchicalGrid Virtualization #hGrid', () => { }); describe('IgxHierarchicalGrid Virtualization Custom Scenarios #hGrid', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxHierarchicalGridTestBaseComponent, IgxHierarchicalGridNoScrollTestComponent ] - }); + }).compileComponents(); })); it('should show scrollbar after expanding a row with data loaded after initial view initialization', async () => { diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts index 58edcbce8e2..ccadda4f213 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-data-selector.spec.ts @@ -1,5 +1,5 @@ import { DebugElement } from "@angular/core"; -import { fakeAsync, TestBed } from "@angular/core/testing"; +import { fakeAsync, TestBed, waitForAsync } from "@angular/core/testing"; import { By } from "@angular/platform-browser"; import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { IgxCheckboxComponent } from "../../checkbox/checkbox.component"; @@ -7,7 +7,6 @@ import { SortingDirection } from "../../data-operations/sorting-strategy"; import { IgxExpansionPanelHeaderComponent } from '../../expansion-panel/expansion-panel-header.component'; import { IgxExpansionPanelComponent } from '../../expansion-panel/expansion-panel.component'; import { IgxInputDirective } from "../../input-group/public_api"; -import { configureTestSuite } from "../../test-utils/configure-suite"; import { IgxPivotGridTestBaseComponent } from "../../test-utils/pivot-grid-samples.spec"; import { UIInteractions, wait } from "../../test-utils/ui-interactions.spec"; import { PivotGridType } from "../common/grid.interface"; @@ -22,11 +21,13 @@ import { setElementSize } from '../../test-utils/helper-utils.spec'; describe("Pivot data selector", () => { - configureTestSuite(() => { - return TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, IgxPivotDataSelectorComponent], - }); - }); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, IgxPivotDataSelectorComponent + ] + }).compileComponents(); + })); it("should initialize standalone before a grid is set ", () => { const fixture = TestBed.createComponent(IgxPivotDataSelectorComponent); @@ -41,14 +42,14 @@ describe("Pivot data selector integration", () => { let selector: IgxPivotDataSelectorComponent; let pivotItems: (IPivotDimension | IPivotValue)[]; - configureTestSuite(() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxPivotGridTestBaseComponent ] - }); - }); + }).compileComponents(); + })); beforeEach(fakeAsync(() => { fixture = TestBed.createComponent(IgxPivotGridTestBaseComponent); diff --git a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-keyboard-nav.spec.ts b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-keyboard-nav.spec.ts index 4d73ef8cd31..316aeb956a9 100644 --- a/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-keyboard-nav.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-keyboard-nav.spec.ts @@ -1,7 +1,6 @@ -import { TestBed, fakeAsync, ComponentFixture } from '@angular/core/testing'; +import { TestBed, fakeAsync, ComponentFixture, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { GridFunctions } from '../../test-utils/grid-functions.spec'; import { IgxPivotGridMultipleRowComponent, IgxPivotGridTestBaseComponent } from '../../test-utils/pivot-grid-samples.spec'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; @@ -19,13 +18,14 @@ describe('IgxPivotGrid - Keyboard navigation #pivotGrid', () => { describe('General Keyboard Navigation', () => { let fixture: ComponentFixture; let pivotGrid: IgxPivotGridComponent; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxPivotGridMultipleRowComponent ] - }); + }).compileComponents(); })); beforeEach(fakeAsync(() => { @@ -265,13 +265,14 @@ describe('IgxPivotGrid - Keyboard navigation #pivotGrid', () => { }); describe('Row Dimension Expand/Collapse Keyboard Interactions', () => { let fixture: ComponentFixture; - configureTestSuite((() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxPivotGridTestBaseComponent ] - }); + }).compileComponents(); })); beforeEach(fakeAsync(() => { diff --git a/projects/igniteui-angular/src/lib/grids/state.directive.spec.ts b/projects/igniteui-angular/src/lib/grids/state.directive.spec.ts index f247c370d02..998ca85f70b 100644 --- a/projects/igniteui-angular/src/lib/grids/state.directive.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/state.directive.spec.ts @@ -1,4 +1,4 @@ -import { TestBed } from '@angular/core/testing'; +import { TestBed, waitForAsync } from '@angular/core/testing'; import { IgxGridComponent } from './grid/public_api'; import { Component, TemplateRef, ViewChild } from '@angular/core'; import { SampleTestData } from '../test-utils/sample-test-data.spec'; @@ -11,7 +11,6 @@ import { IgxBooleanFilteringOperand } from '../data-operations/filtering-conditi import { IGroupingState } from '../data-operations/groupby-state.interface'; import { IGroupByExpandState } from '../data-operations/groupby-expand-state.interface'; import { GridSelectionMode } from './common/enums'; -import { configureTestSuite } from '../test-utils/configure-suite'; import { FilteringLogic } from '../data-operations/filtering-expression.interface'; import { DefaultSortingStrategy, ISortingExpression, SortingDirection } from '../data-operations/sorting-strategy'; import { GridSelectionRange } from './common/types'; @@ -21,15 +20,15 @@ import { IgxColumnComponent, IgxColumnGroupComponent, IgxColumnLayoutComponent, import { IColumnState, IGridState } from './state-base.directive'; describe('IgxGridState - input properties #grid', () => { - configureTestSuite((() => { - return TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, IgxGridStateComponent, IgxGridStateWithOptionsComponent, IgxGridStateWithDetailsComponent ] - }); + }).compileComponents(); })); it('should initialize an IgxGridState with default options object', () => { diff --git a/projects/igniteui-angular/src/lib/list/list.component.spec.ts b/projects/igniteui-angular/src/lib/list/list.component.spec.ts index 4b427f3c7d8..8b730256a3a 100644 --- a/projects/igniteui-angular/src/lib/list/list.component.spec.ts +++ b/projects/igniteui-angular/src/lib/list/list.component.spec.ts @@ -1,5 +1,5 @@ import { QueryList } from '@angular/core'; -import { fakeAsync, TestBed, tick } from '@angular/core/testing'; +import { fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { IgxListItemComponent } from './list-item.component'; import { IgxListPanState } from './list.common'; @@ -27,13 +27,13 @@ import { ListDirectivesComponent, ListWithSelectedItemComponent } from '../test-utils/list-components.spec'; -import { configureTestSuite } from '../test-utils/configure-suite'; import { wait } from '../test-utils/ui-interactions.spec'; import { GridFunctions } from '../test-utils/grid-functions.spec'; describe('List', () => { - configureTestSuite(() => { - return TestBed.configureTestingModule({ + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ CustomEmptyListComponent, EmptyListComponent, @@ -48,8 +48,8 @@ describe('List', () => { ListDirectivesComponent, ListWithSelectedItemComponent ] - }); - }); + }).compileComponents(); + })); it('should initialize igx-list with item and header', () => { const fixture = TestBed.createComponent(ListWithHeaderComponent); From caf41252368301efc1394c5206dd961721a37b41 Mon Sep 17 00:00:00 2001 From: Konstantin Dinev Date: Fri, 28 Mar 2025 10:01:57 +0200 Subject: [PATCH 2/8] refactor(tests): removing some other configureTestSuite() calls --- .../progressbar/linearbar.component.spec.ts | 9 +------- .../services/direction/directionality.spec.ts | 6 ++--- .../lib/splitter/splitter.component.spec.ts | 23 ++++++++----------- .../bottom-nav/bottom-nav.component.spec.ts | 21 ++++++++--------- .../src/lib/tabs/tabs/tabs.component.spec.ts | 21 ++++++++--------- 5 files changed, 32 insertions(+), 48 deletions(-) diff --git a/projects/igniteui-angular/src/lib/progressbar/linearbar.component.spec.ts b/projects/igniteui-angular/src/lib/progressbar/linearbar.component.spec.ts index a775a449c13..1397b5cbacd 100644 --- a/projects/igniteui-angular/src/lib/progressbar/linearbar.component.spec.ts +++ b/projects/igniteui-angular/src/lib/progressbar/linearbar.component.spec.ts @@ -1,6 +1,5 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IgxLinearProgressBarComponent } from './progressbar.component'; -import { configureTestSuite } from '../test-utils/configure-suite'; import { hasClass } from "../test-utils/helper-utils.spec"; describe('IgxLinearProgressBarComponent', () => { @@ -8,19 +7,13 @@ describe('IgxLinearProgressBarComponent', () => { let progress: IgxLinearProgressBarComponent; let linearBar: HTMLElement; - configureTestSuite(); - - beforeAll(waitForAsync(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [IgxLinearProgressBarComponent] }).compileComponents(); })); beforeEach(() => { - TestBed.configureTestingModule({ - imports: [IgxLinearProgressBarComponent] - }).compileComponents(); - fixture = TestBed.createComponent(IgxLinearProgressBarComponent); progress = fixture.componentInstance; fixture.detectChanges(); diff --git a/projects/igniteui-angular/src/lib/services/direction/directionality.spec.ts b/projects/igniteui-angular/src/lib/services/direction/directionality.spec.ts index e832d628a63..7e8d3ec93d6 100644 --- a/projects/igniteui-angular/src/lib/services/direction/directionality.spec.ts +++ b/projects/igniteui-angular/src/lib/services/direction/directionality.spec.ts @@ -10,10 +10,10 @@ interface FakeDoc { describe('IgxDirectionality', () => { describe('DI', () => { - beforeAll(waitForAsync(() => + beforeEach(waitForAsync(() => TestBed.configureTestingModule({ - imports: [InjectsIgxDirectionalityComponent] -}).compileComponents() + imports: [InjectsIgxDirectionalityComponent] + }).compileComponents() )); it('should inject the document through the injectionToken properly', () => { diff --git a/projects/igniteui-angular/src/lib/splitter/splitter.component.spec.ts b/projects/igniteui-angular/src/lib/splitter/splitter.component.spec.ts index 07e6dabb7b5..18cc35d02ac 100644 --- a/projects/igniteui-angular/src/lib/splitter/splitter.component.spec.ts +++ b/projects/igniteui-angular/src/lib/splitter/splitter.component.spec.ts @@ -1,4 +1,3 @@ -import { configureTestSuite } from '../test-utils/configure-suite'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { Component, ViewChild, DebugElement } from '@angular/core'; import { SplitterType, IgxSplitterComponent, ISplitterBarResizeEventArgs } from './splitter.component'; @@ -6,22 +5,22 @@ import { By } from '@angular/platform-browser'; import { UIInteractions } from '../test-utils/ui-interactions.spec'; import { IgxSplitterPaneComponent } from './splitter-pane/splitter-pane.component'; - const SPLITTERBAR_CLASS = 'igx-splitter-bar'; const SPLITTERBAR_DIV_CLASS = '.igx-splitter-bar'; const SPLITTER_BAR_VERTICAL_CLASS = 'igx-splitter-bar--vertical'; const COLLAPSIBLE_CLASS = 'igx-splitter-bar--collapsible'; describe('IgxSplitter', () => { - configureTestSuite(); - beforeAll(waitForAsync(() => TestBed.configureTestingModule({ - imports: [ - SplitterTestComponent - ] -}).compileComponents())); + beforeEach(waitForAsync(() => + TestBed.configureTestingModule({ + imports: [ + SplitterTestComponent + ] + }).compileComponents() + )); let fixture: ComponentFixture; let splitter: IgxSplitterComponent; - + beforeEach(waitForAsync(() => { fixture = TestBed.createComponent(SplitterTestComponent); fixture.detectChanges(); @@ -326,8 +325,7 @@ describe('IgxSplitter', () => { }); describe('IgxSplitter pane toggle', () => { - configureTestSuite(); - beforeAll(waitForAsync(() => TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => TestBed.configureTestingModule({ imports: [ SplitterTogglePaneComponent ] @@ -430,8 +428,7 @@ describe('IgxSplitter pane toggle', () => { }); describe('IgxSplitter pane collapse', () => { - configureTestSuite(); - beforeAll(waitForAsync(() => TestBed.configureTestingModule({ + beforeEach(waitForAsync(() => TestBed.configureTestingModule({ imports: [ SplitterCollapsedPaneComponent ] diff --git a/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts b/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts index ed3fd90bafc..1a65f4d3977 100644 --- a/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts +++ b/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts @@ -3,7 +3,6 @@ import { TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { Router } from '@angular/router'; import { Location } from '@angular/common'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { BottomTabBarTestComponent, TabBarRoutingTestComponent, TabBarTabsOnlyModeTestComponent, @@ -18,20 +17,18 @@ import { RoutingTestGuard } from '../../test-utils/routing-test-guard.spec'; import { RoutingView1Component, RoutingView2Component, RoutingView3Component, RoutingView4Component, RoutingView5Component } from '../../test-utils/routing-view-components.spec'; describe('IgxBottomNav', () => { - configureTestSuite(); const tabItemNormalCssClass = 'igx-bottom-nav__menu-item'; const tabItemSelectedCssClass = 'igx-bottom-nav__menu-item--selected'; - - beforeAll(waitForAsync(() => { - const testRoutes = [ - { path: 'view1', component: RoutingView1Component, canActivate: [RoutingTestGuard] }, - { path: 'view2', component: RoutingView2Component, canActivate: [RoutingTestGuard] }, - { path: 'view3', component: RoutingView3Component, canActivate: [RoutingTestGuard] }, - { path: 'view4', component: RoutingView4Component, canActivate: [RoutingTestGuard] }, - { path: 'view5', component: RoutingView5Component, canActivate: [RoutingTestGuard] }, - ]; - + const testRoutes = [ + { path: 'view1', component: RoutingView1Component, canActivate: [RoutingTestGuard] }, + { path: 'view2', component: RoutingView2Component, canActivate: [RoutingTestGuard] }, + { path: 'view3', component: RoutingView3Component, canActivate: [RoutingTestGuard] }, + { path: 'view4', component: RoutingView4Component, canActivate: [RoutingTestGuard] }, + { path: 'view5', component: RoutingView5Component, canActivate: [RoutingTestGuard] }, + ]; + + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, diff --git a/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts b/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts index f4441d67dbb..50ff21c6647 100644 --- a/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts +++ b/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts @@ -15,7 +15,6 @@ import { TabsTestHtmlAttributesComponent, TabsTestSelectedTabComponent, TabsWithPrefixSuffixTestComponent, TemplatedTabsTestComponent } from '../../test-utils/tabs-components.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; import { IgxTabContentComponent } from './tab-content.component'; import { RoutingTestGuard } from '../../test-utils/routing-test-guard.spec'; @@ -29,21 +28,19 @@ const KEY_ENTER_EVENT = new KeyboardEvent('keydown', { key: 'Enter', bubbles: tr const KEY_SPACE_EVENT = new KeyboardEvent('keydown', { key: ' ', bubbles: true }); describe('IgxTabs', () => { - configureTestSuite({ checkLeaks: true }); const tabItemNormalCssClass = 'igx-tabs__header-item'; const tabItemSelectedCssClass = 'igx-tabs__header-item--selected'; const headerScrollCssClass = 'igx-tabs__header-scroll'; - - beforeAll(waitForAsync(() => { - const testRoutes = [ - { path: 'view1', component: RoutingView1Component, canActivate: [RoutingTestGuard] }, - { path: 'view2', component: RoutingView2Component, canActivate: [RoutingTestGuard] }, - { path: 'view3', component: RoutingView3Component, canActivate: [RoutingTestGuard] }, - { path: 'view4', component: RoutingView4Component, canActivate: [RoutingTestGuard] }, - { path: 'view5', component: RoutingView5Component, canActivate: [RoutingTestGuard] } - ]; - + const testRoutes = [ + { path: 'view1', component: RoutingView1Component, canActivate: [RoutingTestGuard] }, + { path: 'view2', component: RoutingView2Component, canActivate: [RoutingTestGuard] }, + { path: 'view3', component: RoutingView3Component, canActivate: [RoutingTestGuard] }, + { path: 'view4', component: RoutingView4Component, canActivate: [RoutingTestGuard] }, + { path: 'view5', component: RoutingView5Component, canActivate: [RoutingTestGuard] } + ]; + + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, From c4d316c9d342254da388b03f493a41d3f28ac309 Mon Sep 17 00:00:00 2001 From: Konstantin Dinev Date: Fri, 28 Mar 2025 10:17:17 +0200 Subject: [PATCH 3/8] chore(*): seeing if tabs and bottom nav need to be reverted --- .../src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts | 4 +++- .../igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts b/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts index 1a65f4d3977..34aab0ebe3d 100644 --- a/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts +++ b/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts @@ -15,8 +15,10 @@ import { IgxBottomNavComponent, IgxBottomNavItemComponent } from './public_api'; import { UIInteractions } from '../../test-utils/ui-interactions.spec'; import { RoutingTestGuard } from '../../test-utils/routing-test-guard.spec'; import { RoutingView1Component, RoutingView2Component, RoutingView3Component, RoutingView4Component, RoutingView5Component } from '../../test-utils/routing-view-components.spec'; +import { configureTestSuite } from '../../test-utils/configure-suite'; describe('IgxBottomNav', () => { + configureTestSuite(); const tabItemNormalCssClass = 'igx-bottom-nav__menu-item'; const tabItemSelectedCssClass = 'igx-bottom-nav__menu-item--selected'; @@ -28,7 +30,7 @@ describe('IgxBottomNav', () => { { path: 'view5', component: RoutingView5Component, canActivate: [RoutingTestGuard] }, ]; - beforeEach(waitForAsync(() => { + beforeAll(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, diff --git a/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts b/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts index 50ff21c6647..27e388cf40b 100644 --- a/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts +++ b/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts @@ -19,6 +19,7 @@ import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; import { IgxTabContentComponent } from './tab-content.component'; import { RoutingTestGuard } from '../../test-utils/routing-test-guard.spec'; import { RoutingView1Component, RoutingView2Component, RoutingView3Component, RoutingView4Component, RoutingView5Component } from '../../test-utils/routing-view-components.spec'; +import { configureTestSuite } from '../../test-utils/configure-suite'; const KEY_RIGHT_EVENT = new KeyboardEvent('keydown', { key: 'ArrowRight', bubbles: true }); const KEY_LEFT_EVENT = new KeyboardEvent('keydown', { key: 'ArrowLeft', bubbles: true }); @@ -28,6 +29,7 @@ const KEY_ENTER_EVENT = new KeyboardEvent('keydown', { key: 'Enter', bubbles: tr const KEY_SPACE_EVENT = new KeyboardEvent('keydown', { key: ' ', bubbles: true }); describe('IgxTabs', () => { + configureTestSuite(); const tabItemNormalCssClass = 'igx-tabs__header-item'; const tabItemSelectedCssClass = 'igx-tabs__header-item--selected'; @@ -40,7 +42,7 @@ describe('IgxTabs', () => { { path: 'view5', component: RoutingView5Component, canActivate: [RoutingTestGuard] } ]; - beforeEach(waitForAsync(() => { + beforeAll(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, From d54028f645ddb4e38d8d2848b06b8cfd2515d3be Mon Sep 17 00:00:00 2001 From: Konstantin Dinev Date: Fri, 28 Mar 2025 10:44:42 +0200 Subject: [PATCH 4/8] refactor(test): qb tests running on a beforeEach setup --- .../src/lib/date-common/util/date-time.util.spec.ts | 3 +++ .../src/lib/query-builder/query-builder.component.spec.ts | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/igniteui-angular/src/lib/date-common/util/date-time.util.spec.ts b/projects/igniteui-angular/src/lib/date-common/util/date-time.util.spec.ts index a3d653a49cc..4777e412448 100644 --- a/projects/igniteui-angular/src/lib/date-common/util/date-time.util.spec.ts +++ b/projects/igniteui-angular/src/lib/date-common/util/date-time.util.spec.ts @@ -1,6 +1,8 @@ import { DateTimeUtil } from './date-time.util'; import { DatePart, DatePartInfo } from '../../directives/date-time-editor/date-time-editor.common'; import { DataType } from '../../data-operations/data-util'; +import { registerLocaleData } from '@angular/common'; +import localeBg from "@angular/common/locales/bg"; const reduceToDictionary = (parts: DatePartInfo[]) => parts.reduce((obj, x) => { obj[x.type] = x; @@ -8,6 +10,7 @@ const reduceToDictionary = (parts: DatePartInfo[]) => parts.reduce((obj, x) => { }, {}); describe(`DateTimeUtil Unit tests`, () => { + registerLocaleData(localeBg); describe('Date Time Parsing', () => { it('should correctly parse all date time parts (base)', () => { let result = DateTimeUtil.parseDateTimeFormat('dd/MM/yyyy HH:mm:ss:SS a'); diff --git a/projects/igniteui-angular/src/lib/query-builder/query-builder.component.spec.ts b/projects/igniteui-angular/src/lib/query-builder/query-builder.component.spec.ts index 497ff573299..1c2fca265f9 100644 --- a/projects/igniteui-angular/src/lib/query-builder/query-builder.component.spec.ts +++ b/projects/igniteui-angular/src/lib/query-builder/query-builder.component.spec.ts @@ -1,6 +1,5 @@ import { waitForAsync, TestBed, ComponentFixture, fakeAsync, tick, flush } from '@angular/core/testing'; import { FilteringExpressionsTree, FilteringLogic, IExpressionTree, IgxChipComponent, IgxComboComponent, IgxDateFilteringOperand, IgxNumberFilteringOperand, IgxQueryBuilderComponent, IgxQueryBuilderHeaderComponent, IgxQueryBuilderSearchValueTemplateDirective } from 'igniteui-angular'; -import { configureTestSuite } from '../test-utils/configure-suite'; import { Component, OnInit, ViewChild } from '@angular/core'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { By } from '@angular/platform-browser'; @@ -12,10 +11,9 @@ import { NgTemplateOutlet } from '@angular/common'; import { QueryBuilderSelectors } from './query-builder.common'; describe('IgxQueryBuilder', () => { - configureTestSuite(); let fix: ComponentFixture; let queryBuilder: IgxQueryBuilderComponent; - beforeAll(waitForAsync(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, From 030ef063fd27891bebc4fd986d23a7687c895131 Mon Sep 17 00:00:00 2001 From: Konstantin Dinev Date: Fri, 28 Mar 2025 10:45:31 +0200 Subject: [PATCH 5/8] refactor(tests): tabs and bottom nav tests --- .../src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts | 4 +--- .../src/lib/tabs/tabs/tabs.component.spec.ts | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts b/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts index 34aab0ebe3d..1a65f4d3977 100644 --- a/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts +++ b/projects/igniteui-angular/src/lib/tabs/bottom-nav/bottom-nav.component.spec.ts @@ -15,10 +15,8 @@ import { IgxBottomNavComponent, IgxBottomNavItemComponent } from './public_api'; import { UIInteractions } from '../../test-utils/ui-interactions.spec'; import { RoutingTestGuard } from '../../test-utils/routing-test-guard.spec'; import { RoutingView1Component, RoutingView2Component, RoutingView3Component, RoutingView4Component, RoutingView5Component } from '../../test-utils/routing-view-components.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; describe('IgxBottomNav', () => { - configureTestSuite(); const tabItemNormalCssClass = 'igx-bottom-nav__menu-item'; const tabItemSelectedCssClass = 'igx-bottom-nav__menu-item--selected'; @@ -30,7 +28,7 @@ describe('IgxBottomNav', () => { { path: 'view5', component: RoutingView5Component, canActivate: [RoutingTestGuard] }, ]; - beforeAll(waitForAsync(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, diff --git a/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts b/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts index 27e388cf40b..6abb3ebd87a 100644 --- a/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts +++ b/projects/igniteui-angular/src/lib/tabs/tabs/tabs.component.spec.ts @@ -19,7 +19,6 @@ import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; import { IgxTabContentComponent } from './tab-content.component'; import { RoutingTestGuard } from '../../test-utils/routing-test-guard.spec'; import { RoutingView1Component, RoutingView2Component, RoutingView3Component, RoutingView4Component, RoutingView5Component } from '../../test-utils/routing-view-components.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; const KEY_RIGHT_EVENT = new KeyboardEvent('keydown', { key: 'ArrowRight', bubbles: true }); const KEY_LEFT_EVENT = new KeyboardEvent('keydown', { key: 'ArrowLeft', bubbles: true }); @@ -29,7 +28,6 @@ const KEY_ENTER_EVENT = new KeyboardEvent('keydown', { key: 'Enter', bubbles: tr const KEY_SPACE_EVENT = new KeyboardEvent('keydown', { key: ' ', bubbles: true }); describe('IgxTabs', () => { - configureTestSuite(); const tabItemNormalCssClass = 'igx-tabs__header-item'; const tabItemSelectedCssClass = 'igx-tabs__header-item--selected'; @@ -42,7 +40,8 @@ describe('IgxTabs', () => { { path: 'view5', component: RoutingView5Component, canActivate: [RoutingTestGuard] } ]; - beforeAll(waitForAsync(() => { + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, From df505ea05512ba3e2dec203e6b909dbed915ea1d Mon Sep 17 00:00:00 2001 From: Konstantin Dinev Date: Fri, 28 Mar 2025 10:58:09 +0200 Subject: [PATCH 6/8] refactor(tests): drag and drop tests --- .../src/lib/directives/drag-drop/drag-drop.spec.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/projects/igniteui-angular/src/lib/directives/drag-drop/drag-drop.spec.ts b/projects/igniteui-angular/src/lib/directives/drag-drop/drag-drop.spec.ts index 6a3acf17d69..2fc26885b7c 100644 --- a/projects/igniteui-angular/src/lib/directives/drag-drop/drag-drop.spec.ts +++ b/projects/igniteui-angular/src/lib/directives/drag-drop/drag-drop.spec.ts @@ -2,7 +2,6 @@ import { Component, ViewChildren, QueryList, ViewChild, ElementRef, TemplateRef, import { TestBed, ComponentFixture, waitForAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { UIInteractions, wait} from '../../test-utils/ui-interactions.spec'; -import { configureTestSuite } from '../../test-utils/configure-suite'; import { first } from 'rxjs/operators'; import { IgxInsertDropStrategy, IgxAppendDropStrategy, IgxPrependDropStrategy } from './drag-drop.strategy'; import { @@ -22,8 +21,7 @@ describe('General igxDrag/igxDrop', () => { let dropAreaRects = { top: 0, left: 0, right: 0, bottom: 0}; let dragDirsRects = [{ top: 0, left: 0, right: 0, bottom: 0}]; - configureTestSuite({ checkLeaks: true }); - beforeAll(waitForAsync(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [TestDragDropComponent] }) @@ -1393,8 +1391,7 @@ describe('General igxDrag/igxDrop', () => { }); describe('Linked igxDrag/igxDrop ', () => { - configureTestSuite(); - beforeAll(waitForAsync(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [ TestDragDropLinkedSingleComponent, @@ -1876,8 +1873,7 @@ describe('Linked igxDrag/igxDrop ', () => { }); describe('Nested igxDrag elements', () => { - configureTestSuite(); - beforeAll(waitForAsync(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ imports: [TestDragDropNestedComponent] }) From 4455244a4ea7cfb5ac0623e8b7b942a95c4369e7 Mon Sep 17 00:00:00 2001 From: Konstantin Dinev Date: Fri, 28 Mar 2025 11:22:48 +0200 Subject: [PATCH 7/8] chore(*): adding some comp selectors --- .../src/lib/test-utils/hierarchical-grid-components.spec.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/igniteui-angular/src/lib/test-utils/hierarchical-grid-components.spec.ts b/projects/igniteui-angular/src/lib/test-utils/hierarchical-grid-components.spec.ts index 6e611b87043..5477623eb44 100644 --- a/projects/igniteui-angular/src/lib/test-utils/hierarchical-grid-components.spec.ts +++ b/projects/igniteui-angular/src/lib/test-utils/hierarchical-grid-components.spec.ts @@ -19,6 +19,7 @@ import { IgxCellHeaderTemplateDirective } from '../grids/columns/templates.direc import { IgxPaginatorDirective } from '../paginator/paginator-interfaces'; @Component({ + selector: 'igx-hierarchical-grid-test-base', template: ` @@ -93,6 +94,7 @@ export class IgxHierarchicalGridTestBaseComponent { } @Component({ + selector: 'igx-hierarchical-grid-with-transaction-provider', template: ` From db165f8f05bc6ed93fe555c5cdf76fc989045e2b Mon Sep 17 00:00:00 2001 From: skrustev Date: Thu, 3 Apr 2025 10:29:06 +0300 Subject: [PATCH 8/8] tests(prograssBar): Fix tests for Circular and Linear Bars not clearing test bed. --- .../src/lib/progressbar/circularbar.component.spec.ts | 6 ++++++ .../src/lib/progressbar/linearbar.component.spec.ts | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts b/projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts index 61beaa2f377..f59318b868e 100644 --- a/projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts +++ b/projects/igniteui-angular/src/lib/progressbar/circularbar.component.spec.ts @@ -27,6 +27,12 @@ describe('IgxCircularProgressBarComponent', () => { circularBar = fixture.debugElement.nativeElement; }); + afterEach(() => { + // Remove elements manually from DOM, because CircularBar overrides the id the TestBed uses + fixture.elementRef.nativeElement.remove(); + fixture.destroy(); + }); + it('should initialize with default attributes', () => { expect(progress.cssClass).toBe('igx-circular-bar'); expect(progress.textVisibility).toBe(true); diff --git a/projects/igniteui-angular/src/lib/progressbar/linearbar.component.spec.ts b/projects/igniteui-angular/src/lib/progressbar/linearbar.component.spec.ts index 1397b5cbacd..583f1260ae9 100644 --- a/projects/igniteui-angular/src/lib/progressbar/linearbar.component.spec.ts +++ b/projects/igniteui-angular/src/lib/progressbar/linearbar.component.spec.ts @@ -20,6 +20,12 @@ describe('IgxLinearProgressBarComponent', () => { linearBar = fixture.debugElement.nativeElement; }); + afterEach(() => { + // Remove elements manually from DOM, because LinearBar overrides the id the TestBed uses + fixture.elementRef.nativeElement.remove(); + fixture.destroy(); + }); + it('should initialize with default attributes', () => { expect(progress.valueMin).toBe(0); expect(progress.cssClass).toBe('igx-linear-bar');