Skip to content

Commit 409948f

Browse files
authored
test(multiple): clean up some unnecessary imports (#31605)
Cleaning up some `imports` from `configureTestingModule` that aren't necessary now that we're fully standalone. This is an initial test to see if anything goes wrong. I'll roll it out to the other tests in a follow-up.
1 parent 471d323 commit 409948f

Some content is hidden

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

46 files changed

+23
-321
lines changed

src/cdk-experimental/accordion/accordion.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {Component, DebugElement, signal, model} from '@angular/core';
22
import {ComponentFixture, TestBed} from '@angular/core/testing';
33
import {By} from '@angular/platform-browser';
4-
import {BidiModule} from '@angular/cdk/bidi';
54
import {provideFakeDirectionality, runAccessibilityChecks} from '@angular/cdk/testing/private';
65
import {_IdGenerator} from '@angular/cdk/a11y';
76
import {
@@ -97,7 +96,6 @@ describe('CdkAccordionGroup', () => {
9796
beforeEach(() => {
9897
TestBed.configureTestingModule({
9998
providers: [provideFakeDirectionality('ltr'), _IdGenerator],
100-
imports: [BidiModule, AccordionGroupExample],
10199
});
102100

103101
fixture = TestBed.createComponent(AccordionGroupExample);

src/cdk-experimental/combobox/combobox.spec.ts

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,6 @@ describe('Combobox', () => {
2323
let applyButton: DebugElement;
2424
let applyButtonElement: HTMLElement;
2525

26-
beforeEach(waitForAsync(() => {
27-
TestBed.configureTestingModule({
28-
imports: [CdkComboboxModule, ComboboxToggle],
29-
});
30-
}));
31-
3226
beforeEach(() => {
3327
fixture = TestBed.createComponent(ComboboxToggle);
3428
fixture.detectChanges();
@@ -189,11 +183,7 @@ describe('Combobox', () => {
189183
let combobox: DebugElement;
190184
let comboboxInstance: CdkCombobox;
191185

192-
beforeEach(waitForAsync(() => {
193-
TestBed.configureTestingModule({
194-
imports: [CdkComboboxModule, ComboboxToggle],
195-
});
196-
}));
186+
beforeEach(waitForAsync(() => {}));
197187

198188
beforeEach(() => {
199189
fixture = TestBed.createComponent(ComboboxToggle);
@@ -259,11 +249,7 @@ describe('Combobox', () => {
259249
let comboboxInstance: CdkCombobox;
260250
let comboboxElement: HTMLElement;
261251

262-
beforeEach(waitForAsync(() => {
263-
TestBed.configureTestingModule({
264-
imports: [CdkComboboxModule, ComboboxToggle],
265-
});
266-
}));
252+
beforeEach(waitForAsync(() => {}));
267253

268254
beforeEach(() => {
269255
fixture = TestBed.createComponent(ComboboxToggle);

src/cdk-experimental/deferred-content/deferred-content.spec.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
import {Component, DebugElement, Directive, effect, inject, signal} from '@angular/core';
2-
import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
2+
import {ComponentFixture, TestBed} from '@angular/core/testing';
33
import {DeferredContent, DeferredContentAware} from './deferred-content';
44
import {By} from '@angular/platform-browser';
55

66
describe('DeferredContent', () => {
77
let fixture: ComponentFixture<TestComponent>;
88
let collapsible: DebugElement;
99

10-
beforeEach(waitForAsync(() => {
11-
TestBed.configureTestingModule({
12-
imports: [TestComponent],
13-
});
14-
}));
15-
1610
beforeEach(() => {
1711
fixture = TestBed.createComponent(TestComponent);
1812
collapsible = fixture.debugElement.query(By.directive(Collapsible));

src/cdk-experimental/listbox/listbox.spec.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component, DebugElement, signal} from '@angular/core';
22
import {CdkListbox, CdkOption} from './listbox';
33
import {ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/testing';
44
import {By} from '@angular/platform-browser';
5-
import {BidiModule, Direction} from '@angular/cdk/bidi';
5+
import {Direction} from '@angular/cdk/bidi';
66
import {provideFakeDirectionality, runAccessibilityChecks} from '@angular/cdk/testing/private';
77

88
interface ModifierKeys {
@@ -65,7 +65,6 @@ describe('CdkListbox', () => {
6565
}) {
6666
TestBed.configureTestingModule({
6767
providers: [provideFakeDirectionality(opts?.textDirection ?? 'ltr')],
68-
imports: [BidiModule, ListboxExample],
6968
});
7069

7170
fixture = TestBed.createComponent(ListboxExample);
@@ -98,7 +97,6 @@ describe('CdkListbox', () => {
9897
function setupDefaultListbox() {
9998
TestBed.configureTestingModule({
10099
providers: [provideFakeDirectionality('ltr')],
101-
imports: [BidiModule, DefaultListboxExample],
102100
});
103101

104102
const defaultFixture = TestBed.createComponent(DefaultListboxExample);

src/cdk-experimental/radio-group/radio-group.spec.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component, DebugElement, signal} from '@angular/core';
22
import {CdkRadioButton, CdkRadioGroup} from './radio-group';
33
import {ComponentFixture, TestBed} from '@angular/core/testing';
44
import {By} from '@angular/platform-browser';
5-
import {BidiModule, Direction} from '@angular/cdk/bidi';
5+
import {Direction} from '@angular/cdk/bidi';
66
import {provideFakeDirectionality, runAccessibilityChecks} from '@angular/cdk/testing/private';
77

88
describe('CdkRadioGroup', () => {
@@ -45,7 +45,6 @@ describe('CdkRadioGroup', () => {
4545
}) {
4646
TestBed.configureTestingModule({
4747
providers: [provideFakeDirectionality(opts?.textDirection ?? 'ltr')],
48-
imports: [BidiModule, RadioGroupExample],
4948
});
5049

5150
fixture = TestBed.createComponent(RadioGroupExample);
@@ -85,7 +84,6 @@ describe('CdkRadioGroup', () => {
8584
function setupDefaultRadioGroup() {
8685
TestBed.configureTestingModule({
8786
providers: [provideFakeDirectionality('ltr')],
88-
imports: [BidiModule, DefaultRadioGroupExample],
8987
});
9088

9189
const fixture = TestBed.createComponent(DefaultRadioGroupExample);

src/cdk-experimental/scrolling/virtual-scroll-viewport.spec.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {CdkVirtualScrollViewport, ScrollingModule} from '@angular/cdk/scrolling';
22
import {Component, Input, ViewChild, ViewEncapsulation} from '@angular/core';
3-
import {ComponentFixture, TestBed, fakeAsync, flush, waitForAsync} from '@angular/core/testing';
3+
import {ComponentFixture, TestBed, fakeAsync, flush} from '@angular/core/testing';
44
import {ScrollingModule as ExperimentalScrollingModule} from './scrolling-module';
55

66
describe('CdkVirtualScrollViewport', () => {
@@ -9,12 +9,6 @@ describe('CdkVirtualScrollViewport', () => {
99
let testComponent: AutoSizeVirtualScroll;
1010
let viewport: CdkVirtualScrollViewport;
1111

12-
beforeEach(waitForAsync(() => {
13-
TestBed.configureTestingModule({
14-
imports: [ScrollingModule, ExperimentalScrollingModule, AutoSizeVirtualScroll],
15-
});
16-
}));
17-
1812
beforeEach(() => {
1913
fixture = TestBed.createComponent(AutoSizeVirtualScroll);
2014
testComponent = fixture.componentInstance;

src/cdk-experimental/selection/selection.spec.ts

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {AsyncPipe} from '@angular/common';
22
import {CdkTableModule} from '@angular/cdk/table';
33
import {ChangeDetectorRef, Component, ElementRef, ViewChild, inject} from '@angular/core';
4-
import {waitForAsync, ComponentFixture, fakeAsync, flush, TestBed} from '@angular/core/testing';
4+
import {ComponentFixture, fakeAsync, flush, TestBed} from '@angular/core/testing';
55

66
import {CdkSelection} from './selection';
77
import {CdkSelectionModule} from './selection-module';
@@ -11,12 +11,6 @@ describe('CdkSelection', () => {
1111
let fixture: ComponentFixture<ListWithMultiSelection>;
1212
let component: ListWithMultiSelection;
1313

14-
beforeEach(waitForAsync(() => {
15-
TestBed.configureTestingModule({
16-
imports: [CdkSelectionModule, ListWithMultiSelection],
17-
});
18-
}));
19-
2014
beforeEach(() => {
2115
fixture = TestBed.createComponent(ListWithMultiSelection);
2216
component = fixture.componentInstance;
@@ -237,12 +231,6 @@ describe('CdkSelection with multiple = false', () => {
237231
let fixture: ComponentFixture<ListWithSingleSelection>;
238232
let component: ListWithSingleSelection;
239233

240-
beforeEach(waitForAsync(() => {
241-
TestBed.configureTestingModule({
242-
imports: [CdkSelectionModule, ListWithSingleSelection],
243-
});
244-
}));
245-
246234
beforeEach(() => {
247235
fixture = TestBed.createComponent(ListWithSingleSelection);
248236
component = fixture.componentInstance;
@@ -302,12 +290,6 @@ describe('cdkSelectionColumn', () => {
302290
let fixture: ComponentFixture<MultiSelectTableWithSelectionColumn>;
303291
let component: MultiSelectTableWithSelectionColumn;
304292

305-
beforeEach(waitForAsync(() => {
306-
TestBed.configureTestingModule({
307-
imports: [CdkSelectionModule, CdkTableModule, MultiSelectTableWithSelectionColumn],
308-
});
309-
}));
310-
311293
beforeEach(fakeAsync(() => {
312294
fixture = TestBed.createComponent(MultiSelectTableWithSelectionColumn);
313295
component = fixture.componentInstance;
@@ -397,12 +379,6 @@ describe('cdkSelectionColumn with multiple = false', () => {
397379
let fixture: ComponentFixture<SingleSelectTableWithSelectionColumn>;
398380
let component: SingleSelectTableWithSelectionColumn;
399381

400-
beforeEach(waitForAsync(() => {
401-
TestBed.configureTestingModule({
402-
imports: [CdkSelectionModule, CdkTableModule, SingleSelectTableWithSelectionColumn],
403-
});
404-
}));
405-
406382
beforeEach(() => {
407383
fixture = TestBed.createComponent(SingleSelectTableWithSelectionColumn);
408384
component = fixture.componentInstance;

src/cdk-experimental/table-scroll-container/table-scroll-container.spec.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,12 @@ describe('CdkTableScrollContainer', () => {
1818
let headerRows: HTMLElement[];
1919
let footerRows: HTMLElement[];
2020

21-
function createComponent<T>(
22-
componentType: Type<T>,
23-
declarations: any[] = [],
24-
): ComponentFixture<T> {
25-
TestBed.configureTestingModule({
26-
imports: [CdkTableModule, CdkTableScrollContainerModule, componentType, ...declarations],
27-
});
28-
21+
function createComponent<T>(componentType: Type<T>): ComponentFixture<T> {
2922
return TestBed.createComponent<T>(componentType);
3023
}
3124

32-
function setupTableTestApp(componentType: Type<any>, declarations: any[] = []) {
33-
fixture = createComponent(componentType, declarations);
25+
function setupTableTestApp(componentType: Type<any>) {
26+
fixture = createComponent(componentType);
3427
component = fixture.componentInstance;
3528
fixture.detectChanges();
3629

src/cdk-experimental/tabs/tabs.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Component, DebugElement, signal} from '@angular/core';
22
import {ComponentFixture, TestBed} from '@angular/core/testing';
33
import {By} from '@angular/platform-browser';
4-
import {BidiModule, Direction} from '@angular/cdk/bidi';
4+
import {Direction} from '@angular/cdk/bidi';
55
import {provideFakeDirectionality, runAccessibilityChecks} from '@angular/cdk/testing/private';
66
import {CdkTabs, CdkTabList, CdkTab, CdkTabPanel, CdkTabContent} from './tabs';
77

@@ -63,7 +63,6 @@ describe('CdkTabs', () => {
6363
function setupTestTabs(options: {textDirection?: Direction} = {}) {
6464
TestBed.configureTestingModule({
6565
providers: [provideFakeDirectionality(options.textDirection ?? 'ltr')],
66-
imports: [BidiModule, TestTabsComponent],
6766
});
6867

6968
fixture = TestBed.createComponent(TestTabsComponent);

src/cdk-experimental/tree/tree.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Component, signal} from '@angular/core';
22
import {ComponentFixture, TestBed} from '@angular/core/testing';
33
import {By} from '@angular/platform-browser';
4-
import {BidiModule, Direction} from '@angular/cdk/bidi';
4+
import {Direction} from '@angular/cdk/bidi';
55
import {provideFakeDirectionality, runAccessibilityChecks} from '@angular/cdk/testing/private';
66
import {CdkTree, CdkTreeItem, CdkTreeItemGroup, CdkTreeItemGroupContent} from './tree';
77

@@ -53,7 +53,6 @@ describe('CdkTree', () => {
5353

5454
function setupTestTree(textDirection: Direction = 'ltr') {
5555
TestBed.configureTestingModule({
56-
imports: [TestTreeComponent, BidiModule],
5756
providers: [provideFakeDirectionality(textDirection)],
5857
});
5958

0 commit comments

Comments
 (0)