Skip to content

Commit b694cc4

Browse files
committed
test(multiple): remove noop module from tests
Removes the `NoopAnimationsModule` from all tests since it's not necessary in most cases. For the cases where it's relevant, it has been replaced with our own token for disabling animations.
1 parent 4e0ea8e commit b694cc4

File tree

52 files changed

+146
-312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+146
-312
lines changed

src/cdk/text-field/autosize.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
} from '@angular/core/testing';
1010
import {FormsModule} from '@angular/forms';
1111
import {By} from '@angular/platform-browser';
12-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
1312
import {dispatchFakeEvent} from '../testing/private';
1413
import {CdkTextareaAutosize} from './autosize';
1514
import {TextFieldModule} from './text-field-module';
@@ -24,7 +23,6 @@ describe('CdkTextareaAutosize', () => {
2423
imports: [
2524
FormsModule,
2625
TextFieldModule,
27-
NoopAnimationsModule,
2826
AutosizeTextAreaWithContent,
2927
AutosizeTextAreaWithValue,
3028
AutosizeTextareaWithNgModel,

src/material/autocomplete/autocomplete.spec.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ import {
3535
} from '@angular/core/testing';
3636
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
3737
import {By} from '@angular/platform-browser';
38-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
3938
import {EMPTY, Observable, Subject, Subscription} from 'rxjs';
4039
import {map, startWith} from 'rxjs/operators';
41-
import {MatOption, MatOptionSelectionChange} from '../core';
40+
import {MATERIAL_ANIMATIONS, MatOption, MatOptionSelectionChange} from '../core';
4241
import {MatFormField, MatFormFieldModule} from '../form-field';
4342
import {MatInputModule} from '../input';
4443
import {
@@ -65,10 +64,12 @@ describe('MatAutocomplete', () => {
6564
MatInputModule,
6665
FormsModule,
6766
ReactiveFormsModule,
68-
NoopAnimationsModule,
6967
OverlayModule,
7068
],
71-
providers,
69+
providers: [
70+
...providers,
71+
{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}},
72+
],
7273
declarations: [component],
7374
});
7475

src/material/autocomplete/autocomplete.zone.spec.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import {
1313
} from '@angular/core';
1414
import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
1515
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
16-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
1716
import {Subscription} from 'rxjs';
18-
import {MatOption} from '../core';
17+
import {MATERIAL_ANIMATIONS, MatOption} from '../core';
1918
import {MatFormField, MatFormFieldModule} from '../form-field';
2019
import {MatInputModule} from '../input';
2120
import {MatAutocomplete} from './autocomplete';
@@ -32,10 +31,13 @@ describe('MatAutocomplete Zone.js integration', () => {
3231
MatInputModule,
3332
FormsModule,
3433
ReactiveFormsModule,
35-
NoopAnimationsModule,
3634
OverlayModule,
3735
],
38-
providers: [provideZoneChangeDetection(), ...providers],
36+
providers: [
37+
provideZoneChangeDetection(),
38+
...providers,
39+
{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}},
40+
],
3941
declarations: [component],
4042
});
4143

src/material/autocomplete/testing/autocomplete-harness.spec.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {Component} from '@angular/core';
22
import {MatAutocompleteModule} from '../module';
33
import {ComponentFixture, TestBed} from '@angular/core/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
65
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
76
import {MatAutocompleteHarness} from './autocomplete-harness';
87

@@ -11,10 +10,6 @@ describe('MatAutocompleteHarness', () => {
1110
let loader: HarnessLoader;
1211

1312
beforeEach(() => {
14-
TestBed.configureTestingModule({
15-
imports: [NoopAnimationsModule, MatAutocompleteModule, AutocompleteHarnessTest],
16-
});
17-
1813
fixture = TestBed.createComponent(AutocompleteHarnessTest);
1914
fixture.detectChanges();
2015
loader = TestbedHarnessEnvironment.loader(fixture);

src/material/bottom-sheet/bottom-sheet.spec.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ import {
3030
tick,
3131
} from '@angular/core/testing';
3232
import {By} from '@angular/platform-browser';
33-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
3433

3534
import {MAT_BOTTOM_SHEET_DEFAULT_OPTIONS, MatBottomSheet} from './bottom-sheet';
3635
import {MAT_BOTTOM_SHEET_DATA, MatBottomSheetConfig} from './bottom-sheet-config';
3736
import {MatBottomSheetModule} from './bottom-sheet-module';
3837
import {MatBottomSheetRef} from './bottom-sheet-ref';
38+
import {MATERIAL_ANIMATIONS} from '../core';
3939

4040
describe('MatBottomSheet', () => {
4141
let bottomSheet: MatBottomSheet;
@@ -50,7 +50,6 @@ describe('MatBottomSheet', () => {
5050
TestBed.configureTestingModule({
5151
imports: [
5252
MatBottomSheetModule,
53-
NoopAnimationsModule,
5453
ComponentWithChildViewContainer,
5554
ComponentWithTemplateRef,
5655
ContentElementDialog,
@@ -60,7 +59,10 @@ describe('MatBottomSheet', () => {
6059
BottomSheetWithInjectedData,
6160
ShadowDomComponent,
6261
],
63-
providers: [{provide: Location, useClass: SpyLocation}],
62+
providers: [
63+
{provide: Location, useClass: SpyLocation},
64+
{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}},
65+
],
6466
});
6567

6668
bottomSheet = TestBed.inject(MatBottomSheet);
@@ -877,7 +879,8 @@ describe('MatBottomSheet with parent MatBottomSheet', () => {
877879

878880
beforeEach(fakeAsync(() => {
879881
TestBed.configureTestingModule({
880-
imports: [MatBottomSheetModule, NoopAnimationsModule, ComponentThatProvidesMatBottomSheet],
882+
imports: [MatBottomSheetModule, ComponentThatProvidesMatBottomSheet],
883+
providers: [{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}}],
881884
});
882885

883886
parentBottomSheet = TestBed.inject(MatBottomSheet);
@@ -957,13 +960,11 @@ describe('MatBottomSheet with default options', () => {
957960
};
958961

959962
TestBed.configureTestingModule({
960-
imports: [
961-
MatBottomSheetModule,
962-
NoopAnimationsModule,
963-
ComponentWithChildViewContainer,
964-
DirectiveWithViewContainer,
963+
imports: [MatBottomSheetModule, ComponentWithChildViewContainer, DirectiveWithViewContainer],
964+
providers: [
965+
{provide: MAT_BOTTOM_SHEET_DEFAULT_OPTIONS, useValue: defaultConfig},
966+
{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}},
965967
],
966-
providers: [{provide: MAT_BOTTOM_SHEET_DEFAULT_OPTIONS, useValue: defaultConfig}],
967968
});
968969

969970
bottomSheet = TestBed.inject(MatBottomSheet);

src/material/bottom-sheet/testing/bottom-sheet-harness.spec.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
33
import {HarnessLoader} from '@angular/cdk/testing';
44
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
55
import {MatBottomSheet, MatBottomSheetConfig, MatBottomSheetModule} from '../../bottom-sheet';
6-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
76
import {MatBottomSheetHarness} from './bottom-sheet-harness';
87

98
describe('MatBottomSheetHarness', () => {
109
let fixture: ComponentFixture<BottomSheetHarnessTest>;
1110
let loader: HarnessLoader;
1211

1312
beforeEach(() => {
14-
TestBed.configureTestingModule({
15-
imports: [MatBottomSheetModule, NoopAnimationsModule, BottomSheetHarnessTest],
16-
});
17-
1813
fixture = TestBed.createComponent(BottomSheetHarnessTest);
1914
fixture.detectChanges();
2015
loader = TestbedHarnessEnvironment.documentRootLoader(fixture);

src/material/chips/chip-grid.spec.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {MatFormFieldModule} from '../form-field';
3838
import {MatInputModule} from '../input';
3939
import {By} from '@angular/platform-browser';
4040
import {MatChipEvent, MatChipGrid, MatChipInputEvent, MatChipRow, MatChipsModule} from './index';
41-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
41+
import {MATERIAL_ANIMATIONS} from '../core';
4242

4343
describe('MatChipGrid', () => {
4444
let chipGridDebugElement: DebugElement;
@@ -1031,9 +1031,11 @@ describe('MatChipGrid', () => {
10311031
MatChipsModule,
10321032
MatFormFieldModule,
10331033
MatInputModule,
1034-
NoopAnimationsModule,
10351034
],
1036-
providers: [{provide: Directionality, useValue: directionality}],
1035+
providers: [
1036+
{provide: Directionality, useValue: directionality},
1037+
{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}},
1038+
],
10371039
declarations: [component],
10381040
});
10391041

src/material/chips/chip-input.spec.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {Component, DebugElement, ViewChild} from '@angular/core';
1010
import {ComponentFixture, TestBed, fakeAsync, flush, waitForAsync} from '@angular/core/testing';
1111
import {MatFormFieldModule} from '../form-field';
1212
import {By} from '@angular/platform-browser';
13-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
1413
import {Subject} from 'rxjs';
1514
import {
1615
MAT_CHIPS_DEFAULT_OPTIONS,
@@ -20,6 +19,7 @@ import {
2019
MatChipsDefaultOptions,
2120
MatChipsModule,
2221
} from './index';
22+
import {MATERIAL_ANIMATIONS} from '../core';
2323

2424
describe('MatChipInput', () => {
2525
let fixture: ComponentFixture<TestChipInput>;
@@ -31,7 +31,7 @@ describe('MatChipInput', () => {
3131

3232
beforeEach(waitForAsync(() => {
3333
TestBed.configureTestingModule({
34-
imports: [PlatformModule, MatChipsModule, MatFormFieldModule, NoopAnimationsModule],
34+
imports: [PlatformModule, MatChipsModule, MatFormFieldModule],
3535
providers: [
3636
{
3737
provide: Directionality,
@@ -42,6 +42,7 @@ describe('MatChipInput', () => {
4242
};
4343
},
4444
},
45+
{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}},
4546
],
4647
declarations: [TestChipInput],
4748
});
@@ -216,13 +217,14 @@ describe('MatChipInput', () => {
216217
fixture.destroy();
217218

218219
TestBed.resetTestingModule().configureTestingModule({
219-
imports: [MatChipsModule, MatFormFieldModule, PlatformModule, NoopAnimationsModule],
220+
imports: [MatChipsModule, MatFormFieldModule, PlatformModule],
220221
declarations: [TestChipInput],
221222
providers: [
222223
{
223224
provide: MAT_CHIPS_DEFAULT_OPTIONS,
224225
useValue: {separatorKeyCodes: [COMMA]} as MatChipsDefaultOptions,
225226
},
227+
{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}},
226228
],
227229
});
228230

src/material/core/ripple/ripple.spec.ts

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ import {
77
dispatchMouseEvent,
88
dispatchTouchEvent,
99
} from '@angular/cdk/testing/private';
10-
import {Component, ViewChild, ViewEncapsulation} from '@angular/core';
10+
import {Component, Provider, ViewChild, ViewEncapsulation} from '@angular/core';
1111
import {ComponentFixture, TestBed} from '@angular/core/testing';
12-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
1312
import {
1413
MAT_RIPPLE_GLOBAL_OPTIONS,
1514
MatRipple,
@@ -18,6 +17,7 @@ import {
1817
RippleGlobalOptions,
1918
RippleState,
2019
} from './index';
20+
import {MATERIAL_ANIMATIONS} from '../animation/animation';
2121

2222
describe('MatRipple', () => {
2323
let fixture: ComponentFixture<any>;
@@ -494,14 +494,17 @@ describe('MatRipple', () => {
494494
function createTestComponent(
495495
rippleConfig: RippleGlobalOptions,
496496
testComponent: any = BasicRippleContainer,
497-
extraImports: any[] = [],
497+
extraProviders: Provider[] = [],
498498
) {
499499
// Reset the previously configured testing module to be able set new providers.
500500
// The testing module has been initialized in the root describe group for the ripples.
501501
TestBed.resetTestingModule();
502502
TestBed.configureTestingModule({
503-
imports: [MatRippleModule, ...extraImports, testComponent],
504-
providers: [{provide: MAT_RIPPLE_GLOBAL_OPTIONS, useValue: rippleConfig}],
503+
imports: [MatRippleModule, testComponent],
504+
providers: [
505+
{provide: MAT_RIPPLE_GLOBAL_OPTIONS, useValue: rippleConfig},
506+
...extraProviders,
507+
],
505508
});
506509

507510
fixture = TestBed.createComponent(testComponent);
@@ -585,10 +588,12 @@ describe('MatRipple', () => {
585588
expect(rippleTarget.querySelectorAll('.mat-ripple-element').length).toBe(0);
586589
});
587590

588-
it('should not mutate the global options when NoopAnimationsModule is present', () => {
591+
it('should not mutate the global options when animations are disabled', () => {
589592
const options: RippleGlobalOptions = {};
590593

591-
createTestComponent(options, RippleContainerWithoutBindings, [NoopAnimationsModule]);
594+
createTestComponent(options, RippleContainerWithoutBindings, [
595+
{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}},
596+
]);
592597

593598
expect(options.animation).toBeFalsy();
594599
});
@@ -600,7 +605,8 @@ describe('MatRipple', () => {
600605
beforeEach(() => {
601606
TestBed.resetTestingModule();
602607
TestBed.configureTestingModule({
603-
imports: [NoopAnimationsModule, MatRippleModule, BasicRippleContainer],
608+
imports: [MatRippleModule, BasicRippleContainer],
609+
providers: [{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}}],
604610
});
605611

606612
fixture = TestBed.createComponent(BasicRippleContainer);

src/material/datepicker/date-range-input.spec.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ import {
1515
Validator,
1616
Validators,
1717
} from '@angular/forms';
18-
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
1918
import {Subscription} from 'rxjs';
20-
import {ErrorStateMatcher, MatNativeDateModule} from '../core';
19+
import {ErrorStateMatcher, MATERIAL_ANIMATIONS, MatNativeDateModule} from '../core';
2120
import {MatFormField, MatFormFieldModule, MatLabel} from '../form-field';
2221
import {MatInputModule} from '../input';
2322
import {MatDateRangeInput} from './date-range-input';
@@ -33,12 +32,14 @@ describe('MatDateRangeInput', () => {
3332
MatDatepickerModule,
3433
MatFormFieldModule,
3534
MatInputModule,
36-
NoopAnimationsModule,
3735
ReactiveFormsModule,
3836
MatNativeDateModule,
3937
component,
4038
],
41-
providers,
39+
providers: [
40+
...providers,
41+
{provide: MATERIAL_ANIMATIONS, useValue: {animationsDisabled: true}},
42+
],
4243
});
4344

4445
return TestBed.createComponent(component);

0 commit comments

Comments
 (0)