Skip to content

Commit bc0c443

Browse files
crisbetocrisbeto
authored
test(multiple): remove animations module from tests (#30497)
Removes the `BrowserAnimationsModule` from all of our unit tests.
1 parent f2cf229 commit bc0c443

File tree

9 files changed

+23
-52
lines changed

9 files changed

+23
-52
lines changed

‎src/cdk/accordion/accordion-item.spec.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
import {waitForAsync, TestBed, ComponentFixture} from '@angular/core/testing';
22
import {Component} from '@angular/core';
33
import {By} from '@angular/platform-browser';
4-
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
54
import {CdkAccordionModule, CdkAccordionItem} from './public-api';
65

76
describe('CdkAccordionItem', () => {
87
beforeEach(waitForAsync(() => {
98
TestBed.configureTestingModule({
10-
imports: [
11-
BrowserAnimationsModule,
12-
CdkAccordionModule,
13-
SingleItem,
14-
ItemGroupWithoutAccordion,
15-
ItemGroupWithAccordion,
16-
],
9+
imports: [CdkAccordionModule, SingleItem, ItemGroupWithoutAccordion, ItemGroupWithAccordion],
1710
});
1811
}));
1912

‎src/cdk/accordion/accordion.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
import {waitForAsync, TestBed} from '@angular/core/testing';
22
import {Component, QueryList, ViewChild, ViewChildren} from '@angular/core';
33
import {By} from '@angular/platform-browser';
4-
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
54
import {CdkAccordion} from './accordion';
65
import {CdkAccordionItem} from './accordion-item';
76
import {CdkAccordionModule} from './accordion-module';
87

98
describe('CdkAccordion', () => {
109
beforeEach(waitForAsync(() => {
1110
TestBed.configureTestingModule({
12-
imports: [BrowserAnimationsModule, CdkAccordionModule, SetOfItems, NestedItems],
11+
imports: [CdkAccordionModule, SetOfItems, NestedItems],
1312
});
1413
}));
1514

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import {FormControl, FormsModule, NgForm, ReactiveFormsModule, Validators} from
3737
import {MatFormFieldModule} from '@angular/material/form-field';
3838
import {MatInputModule} from '@angular/material/input';
3939
import {By} from '@angular/platform-browser';
40-
import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations';
4140
import {MatChipEvent, MatChipGrid, MatChipInputEvent, MatChipRow, MatChipsModule} from './index';
41+
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
4242

4343
describe('MatChipGrid', () => {
4444
let chipGridDebugElement: DebugElement;
@@ -339,7 +339,7 @@ describe('MatChipGrid', () => {
339339
let fixture: ComponentFixture<StandardChipGrid>;
340340

341341
beforeEach(() => {
342-
fixture = createComponent(StandardChipGrid, undefined, 'rtl');
342+
fixture = createComponent(StandardChipGrid, 'rtl');
343343
});
344344

345345
it('should focus previous column when press RIGHT ARROW', () => {
@@ -1015,9 +1015,6 @@ describe('MatChipGrid', () => {
10151015

10161016
function createComponent<T>(
10171017
component: Type<T>,
1018-
animationsModule:
1019-
| Type<NoopAnimationsModule>
1020-
| Type<BrowserAnimationsModule> = NoopAnimationsModule,
10211018
direction: Direction = 'ltr',
10221019
): ComponentFixture<T> {
10231020
directionality = {
@@ -1032,7 +1029,7 @@ describe('MatChipGrid', () => {
10321029
MatChipsModule,
10331030
MatFormFieldModule,
10341031
MatInputModule,
1035-
animationsModule,
1032+
NoopAnimationsModule,
10361033
],
10371034
providers: [{provide: Directionality, useValue: directionality}],
10381035
declarations: [component],

‎src/material/dialog/dialog.spec.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {
3838
tick,
3939
} from '@angular/core/testing';
4040
import {By} from '@angular/platform-browser';
41-
import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations';
41+
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
4242
import {Subject} from 'rxjs';
4343
import {CLOSE_ANIMATION_DURATION, OPEN_ANIMATION_DURATION} from './dialog-container';
4444
import {
@@ -2043,12 +2043,7 @@ describe('MatDialog with animations enabled', () => {
20432043

20442044
beforeEach(fakeAsync(() => {
20452045
TestBed.configureTestingModule({
2046-
imports: [
2047-
MatDialogModule,
2048-
BrowserAnimationsModule,
2049-
ComponentWithChildViewContainer,
2050-
DirectiveWithViewContainer,
2051-
],
2046+
imports: [MatDialogModule, ComponentWithChildViewContainer, DirectiveWithViewContainer],
20522047
});
20532048

20542049
dialog = TestBed.inject(MatDialog);
@@ -2102,7 +2097,7 @@ describe('MatDialog with explicit injector provided', () => {
21022097

21032098
beforeEach(fakeAsync(() => {
21042099
TestBed.configureTestingModule({
2105-
imports: [MatDialogModule, BrowserAnimationsModule, ModuleBoundDialogParentComponent],
2100+
imports: [MatDialogModule, ModuleBoundDialogParentComponent],
21062101
});
21072102

21082103
overlayContainerElement = TestBed.inject(OverlayContainer).getContainerElement();

‎src/material/expansion/accordion.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
import {Component, QueryList, ViewChild, ViewChildren} from '@angular/core';
99
import {TestBed, inject, waitForAsync} from '@angular/core/testing';
1010
import {By} from '@angular/platform-browser';
11-
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
1211
import {
1312
MatAccordion,
1413
MatExpansionModule,
@@ -22,7 +21,6 @@ describe('MatAccordion', () => {
2221
beforeEach(waitForAsync(() => {
2322
TestBed.configureTestingModule({
2423
imports: [
25-
BrowserAnimationsModule,
2624
MatExpansionModule,
2725
AccordionWithHideToggle,
2826
AccordionWithTogglePosition,

‎src/material/input/input.spec.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import {
3636
} from '@angular/material/form-field';
3737
import {MatIconModule} from '@angular/material/icon';
3838
import {By} from '@angular/platform-browser';
39-
import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations';
4039
import {MAT_INPUT_VALUE_ACCESSOR, MatInput, MatInputModule} from './index';
4140

4241
describe('MatMdcInput without forms', () => {
@@ -1656,17 +1655,15 @@ function configureTestingModule(
16561655
providers?: Provider[];
16571656
imports?: any[];
16581657
declarations?: any[];
1659-
animations?: boolean;
16601658
} = {},
16611659
) {
1662-
const {providers = [], imports = [], declarations = [], animations = true} = options;
1660+
const {providers = [], imports = [], declarations = []} = options;
16631661
TestBed.configureTestingModule({
16641662
imports: [
16651663
FormsModule,
16661664
MatFormFieldModule,
16671665
MatIconModule,
16681666
MatInputModule,
1669-
animations ? BrowserAnimationsModule : NoopAnimationsModule,
16701667
ReactiveFormsModule,
16711668
...imports,
16721669
],

‎src/material/sidenav/drawer.spec.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
waitForAsync,
1919
} from '@angular/core/testing';
2020
import {By} from '@angular/platform-browser';
21-
import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations';
21+
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
2222
import {MatDrawer, MatDrawerContainer, MatSidenavModule} from './index';
2323

2424
describe('MatDrawer', () => {
@@ -517,14 +517,12 @@ describe('MatDrawer', () => {
517517

518518
it('should not throw when a two-way binding is toggled quickly while animating', fakeAsync(() => {
519519
TestBed.resetTestingModule().configureTestingModule({
520-
imports: [MatSidenavModule, BrowserAnimationsModule, DrawerOpenBinding],
520+
imports: [MatSidenavModule, DrawerOpenBinding],
521521
});
522522

523523
const fixture = TestBed.createComponent(DrawerOpenBinding);
524524
fixture.detectChanges();
525525

526-
// Note that we need actual timeouts and the `BrowserAnimationsModule`
527-
// in order to test it correctly.
528526
setTimeout(() => {
529527
fixture.componentInstance.isOpen = !fixture.componentInstance.isOpen;
530528
fixture.changeDetectorRef.markForCheck();
@@ -1019,7 +1017,7 @@ describe('MatDrawerContainer', () => {
10191017

10201018
it('should not animate when the sidenav is open on load', fakeAsync(() => {
10211019
TestBed.resetTestingModule().configureTestingModule({
1022-
imports: [MatSidenavModule, BrowserAnimationsModule, DrawerSetToOpenedTrue],
1020+
imports: [MatSidenavModule, DrawerSetToOpenedTrue],
10231021
});
10241022

10251023
const fixture = TestBed.createComponent(DrawerSetToOpenedTrue);

‎src/material/tabs/tab-group.spec.ts

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
waitForAsync,
1212
} from '@angular/core/testing';
1313
import {By} from '@angular/platform-browser';
14-
import {BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations';
14+
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
1515
import {Observable} from 'rxjs';
1616
import {
1717
MAT_TABS_CONFIG,
@@ -1026,12 +1026,7 @@ describe('MatTabGroup', () => {
10261026
describe('nested MatTabGroup with enabled animations', () => {
10271027
beforeEach(fakeAsync(() => {
10281028
TestBed.configureTestingModule({
1029-
imports: [
1030-
MatTabsModule,
1031-
BrowserAnimationsModule,
1032-
NestedTabs,
1033-
TabsWithCustomAnimationDuration,
1034-
],
1029+
imports: [MatTabsModule, NestedTabs, TabsWithCustomAnimationDuration],
10351030
});
10361031
}));
10371032

@@ -1066,7 +1061,7 @@ describe('MatTabGroup with ink bar fit to content', () => {
10661061

10671062
beforeEach(fakeAsync(() => {
10681063
TestBed.configureTestingModule({
1069-
imports: [MatTabsModule, BrowserAnimationsModule, TabGroupWithInkBarFitToContent],
1064+
imports: [MatTabsModule, TabGroupWithInkBarFitToContent],
10701065
});
10711066
}));
10721067

@@ -1108,7 +1103,7 @@ describe('MatTabNavBar with a default config', () => {
11081103

11091104
beforeEach(fakeAsync(() => {
11101105
TestBed.configureTestingModule({
1111-
imports: [MatTabsModule, BrowserAnimationsModule, SimpleTabsTestApp],
1106+
imports: [MatTabsModule, SimpleTabsTestApp],
11121107
providers: [
11131108
{
11141109
provide: MAT_TABS_CONFIG,
@@ -1139,7 +1134,7 @@ describe('MatTabNavBar with a default config', () => {
11391134
describe('MatTabGroup labels aligned with a config', () => {
11401135
it('should work with start align', () => {
11411136
const fixture = TestBed.configureTestingModule({
1142-
imports: [MatTabsModule, BrowserAnimationsModule, TabsWithAlignConfig],
1137+
imports: [MatTabsModule, TabsWithAlignConfig],
11431138
providers: [
11441139
{
11451140
provide: MAT_TABS_CONFIG,
@@ -1155,7 +1150,7 @@ describe('MatTabGroup labels aligned with a config', () => {
11551150

11561151
it('should work with center align', () => {
11571152
const fixture = TestBed.configureTestingModule({
1158-
imports: [MatTabsModule, BrowserAnimationsModule, TabsWithAlignConfig],
1153+
imports: [MatTabsModule, TabsWithAlignConfig],
11591154
providers: [
11601155
{
11611156
provide: MAT_TABS_CONFIG,
@@ -1171,7 +1166,7 @@ describe('MatTabGroup labels aligned with a config', () => {
11711166

11721167
it('should work with end align', () => {
11731168
const fixture = TestBed.configureTestingModule({
1174-
imports: [MatTabsModule, BrowserAnimationsModule, TabsWithAlignConfig],
1169+
imports: [MatTabsModule, TabsWithAlignConfig],
11751170
providers: [
11761171
{
11771172
provide: MAT_TABS_CONFIG,
@@ -1187,7 +1182,7 @@ describe('MatTabGroup labels aligned with a config', () => {
11871182

11881183
it('should not add align if default config doesnt set align', () => {
11891184
const fixture = TestBed.configureTestingModule({
1190-
imports: [MatTabsModule, BrowserAnimationsModule, TabsWithAlignConfig],
1185+
imports: [MatTabsModule, TabsWithAlignConfig],
11911186
}).createComponent(TabsWithAlignConfig);
11921187
fixture.detectChanges();
11931188

@@ -1206,7 +1201,7 @@ describe('MatTabGroup labels aligned with a config', () => {
12061201

12071202
it('should not break if config sets align on already aligned tabs', () => {
12081203
const fixture = TestBed.configureTestingModule({
1209-
imports: [MatTabsModule, BrowserAnimationsModule, TabsWithAlignCenter],
1204+
imports: [MatTabsModule, TabsWithAlignCenter],
12101205
providers: [{provide: MAT_TABS_CONFIG, useValue: {alignTabs: 'end'}}],
12111206
}).createComponent(TabsWithAlignCenter);
12121207
fixture.detectChanges();

‎src/material/tabs/tab-nav-bar/tab-nav-bar.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {Component, QueryList, ViewChild, ViewChildren} from '@angular/core';
1010
import {ComponentFixture, TestBed, fakeAsync, tick, waitForAsync} from '@angular/core/testing';
1111
import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions} from '@angular/material/core';
1212
import {By} from '@angular/platform-browser';
13-
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
1413
import {Subject} from 'rxjs';
1514
import {MAT_TABS_CONFIG} from '../index';
1615
import {MatTabsModule} from '../module';
@@ -512,7 +511,7 @@ describe('MatTabNavBar with a default config', () => {
512511

513512
beforeEach(fakeAsync(() => {
514513
TestBed.configureTestingModule({
515-
imports: [MatTabsModule, BrowserAnimationsModule, TabLinkWithNgIf],
514+
imports: [MatTabsModule, TabLinkWithNgIf],
516515
providers: [{provide: MAT_TABS_CONFIG, useValue: {fitInkBarToContent: true}}],
517516
});
518517
}));
@@ -534,7 +533,7 @@ describe('MatTabNavBar with a default config', () => {
534533
describe('MatTabNavBar with enabled animations', () => {
535534
beforeEach(fakeAsync(() => {
536535
TestBed.configureTestingModule({
537-
imports: [MatTabsModule, BrowserAnimationsModule, TabsWithCustomAnimationDuration],
536+
imports: [MatTabsModule, TabsWithCustomAnimationDuration],
538537
});
539538
}));
540539

0 commit comments

Comments
 (0)