Skip to content

Commit 88b718e

Browse files
authored
build: remove init test environment calls from harness examples (#23853)
Removes the init test environment calls from the harness examples. This is meant to make the examples a little more readable, and easier to integrate within CLI projects (especially when are starting to use a plain CLI project as foundation for our StackBlitz examples). The CLI sets up the test environment in a global test init file, so we should make this assumption in our examples as well. This also helps with reducing duplication in our code base.
1 parent 4579377 commit 88b718e

File tree

70 files changed

+38
-351
lines changed

Some content is hidden

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

70 files changed

+38
-351
lines changed

src/components-examples/material-experimental/mdc-table/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,5 @@ ng_test_library(
5858

5959
ng_web_test_suite(
6060
name = "unit_tests",
61-
exclude_init_script = True,
6261
deps = [":unit_tests_lib"],
6362
)

src/components-examples/material-experimental/mdc-table/table-harness/table-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatTableHarness} from '@angular/material/table/testing';
44
import {HarnessLoader, parallel} from '@angular/cdk/testing';
5-
import {
6-
BrowserDynamicTestingModule,
7-
platformBrowserDynamicTesting,
8-
} from '@angular/platform-browser-dynamic/testing';
95
import {MatTableModule} from '@angular/material/table';
106
import {TableHarnessExample} from './table-harness-example';
117

128
describe('TableHarnessExample', () => {
139
let fixture: ComponentFixture<TableHarnessExample>;
1410
let loader: HarnessLoader;
1511

16-
beforeAll(() => {
17-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
18-
});
19-
2012
beforeEach(async () => {
2113
await TestBed.configureTestingModule({
2214
imports: [MatTableModule],

src/components-examples/material/autocomplete/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,5 @@ ng_test_library(
5252

5353
ng_web_test_suite(
5454
name = "unit_tests",
55-
exclude_init_script = True,
5655
deps = [":unit_tests_lib"],
5756
)

src/components-examples/material/autocomplete/autocomplete-harness/autocomplete-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatAutocompleteHarness} from '@angular/material/autocomplete/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {
6-
BrowserDynamicTestingModule,
7-
platformBrowserDynamicTesting,
8-
} from '@angular/platform-browser-dynamic/testing';
95
import {MatAutocompleteModule} from '@angular/material/autocomplete';
106
import {AutocompleteHarnessExample} from './autocomplete-harness-example';
117

128
describe('AutocompleteHarnessExample', () => {
139
let fixture: ComponentFixture<AutocompleteHarnessExample>;
1410
let loader: HarnessLoader;
1511

16-
beforeAll(() => {
17-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
18-
});
19-
2012
beforeEach(async () => {
2113
await TestBed.configureTestingModule({
2214
imports: [MatAutocompleteModule],

src/components-examples/material/badge/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,5 @@ ng_test_library(
4949

5050
ng_web_test_suite(
5151
name = "unit_tests",
52-
exclude_init_script = True,
5352
deps = [":unit_tests_lib"],
5453
)

src/components-examples/material/badge/badge-harness/badge-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatBadgeHarness} from '@angular/material/badge/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {
6-
BrowserDynamicTestingModule,
7-
platformBrowserDynamicTesting,
8-
} from '@angular/platform-browser-dynamic/testing';
95
import {MatBadgeModule} from '@angular/material/badge';
106
import {BadgeHarnessExample} from './badge-harness-example';
117

128
describe('BadgeHarnessExample', () => {
139
let fixture: ComponentFixture<BadgeHarnessExample>;
1410
let loader: HarnessLoader;
1511

16-
beforeAll(() => {
17-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
18-
});
19-
2012
beforeEach(async () => {
2113
await TestBed.configureTestingModule({
2214
imports: [MatBadgeModule],

src/components-examples/material/bottom-sheet/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,5 @@ ng_test_library(
5151

5252
ng_web_test_suite(
5353
name = "unit_tests",
54-
exclude_init_script = True,
5554
deps = [":unit_tests_lib"],
5655
)

src/components-examples/material/bottom-sheet/bottom-sheet-harness/bottom-sheet-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatBottomSheetHarness} from '@angular/material/bottom-sheet/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {
6-
BrowserDynamicTestingModule,
7-
platformBrowserDynamicTesting,
8-
} from '@angular/platform-browser-dynamic/testing';
95
import {MatBottomSheetModule} from '@angular/material/bottom-sheet';
106
import {BottomSheetHarnessExample} from './bottom-sheet-harness-example';
117
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
@@ -14,10 +10,6 @@ describe('BottomSheetHarnessExample', () => {
1410
let fixture: ComponentFixture<BottomSheetHarnessExample>;
1511
let loader: HarnessLoader;
1612

17-
beforeAll(() => {
18-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
19-
});
20-
2113
beforeEach(async () => {
2214
await TestBed.configureTestingModule({
2315
imports: [MatBottomSheetModule, NoopAnimationsModule],

src/components-examples/material/button-toggle/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,5 @@ ng_test_library(
4848

4949
ng_web_test_suite(
5050
name = "unit_tests",
51-
exclude_init_script = True,
5251
deps = [":unit_tests_lib"],
5352
)

src/components-examples/material/button-toggle/button-toggle-harness/button-toggle-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatButtonToggleGroupHarness} from '@angular/material/button-toggle/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {
6-
BrowserDynamicTestingModule,
7-
platformBrowserDynamicTesting,
8-
} from '@angular/platform-browser-dynamic/testing';
95
import {MatButtonToggleModule} from '@angular/material/button-toggle';
106
import {ButtonToggleHarnessExample} from './button-toggle-harness-example';
117

128
describe('ButtonToggleHarnessExample', () => {
139
let fixture: ComponentFixture<ButtonToggleHarnessExample>;
1410
let loader: HarnessLoader;
1511

16-
beforeAll(() => {
17-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
18-
});
19-
2012
beforeEach(async () => {
2113
await TestBed.configureTestingModule({
2214
imports: [MatButtonToggleModule],

src/components-examples/material/button/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,5 @@ ng_test_library(
4949

5050
ng_web_test_suite(
5151
name = "unit_tests",
52-
exclude_init_script = True,
5352
deps = [":unit_tests_lib"],
5453
)

src/components-examples/material/button/button-harness/button-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatButtonHarness} from '@angular/material/button/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {
6-
BrowserDynamicTestingModule,
7-
platformBrowserDynamicTesting,
8-
} from '@angular/platform-browser-dynamic/testing';
95
import {MatButtonModule} from '@angular/material/button';
106
import {ButtonHarnessExample} from './button-harness-example';
117

@@ -14,10 +10,6 @@ describe('ButtonHarnessExample', () => {
1410
let loader: HarnessLoader;
1511
let buttonHarness = MatButtonHarness;
1612

17-
beforeAll(() => {
18-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
19-
});
20-
2113
beforeEach(async () => {
2214
await TestBed.configureTestingModule({
2315
imports: [MatButtonModule],

src/components-examples/material/card/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,5 @@ ng_test_library(
5252

5353
ng_web_test_suite(
5454
name = "unit_tests",
55-
exclude_init_script = True,
5655
deps = [":unit_tests_lib"],
5756
)

src/components-examples/material/card/card-harness/card-harness-example.spec.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatButtonHarness} from '@angular/material/button/testing';
44
import {MatCardHarness} from '@angular/material/card/testing';
55
import {HarnessLoader, parallel} from '@angular/cdk/testing';
6-
import {
7-
BrowserDynamicTestingModule,
8-
platformBrowserDynamicTesting,
9-
} from '@angular/platform-browser-dynamic/testing';
106
import {MatCardModule} from '@angular/material/card';
117
import {CardHarnessExample} from './card-harness-example';
128

139
describe('CardHarnessExample', () => {
1410
let fixture: ComponentFixture<CardHarnessExample>;
1511
let loader: HarnessLoader;
16-
beforeAll(() => {
17-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
18-
});
12+
1913
beforeEach(async () => {
2014
await TestBed.configureTestingModule({
2115
imports: [MatCardModule],

src/components-examples/material/checkbox/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,5 @@ ng_test_library(
5151

5252
ng_web_test_suite(
5353
name = "unit_tests",
54-
exclude_init_script = True,
5554
deps = [":unit_tests_lib"],
5655
)

src/components-examples/material/checkbox/checkbox-harness/checkbox-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatCheckboxHarness} from '@angular/material/checkbox/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
55
import {ReactiveFormsModule} from '@angular/forms';
6-
import {
7-
BrowserDynamicTestingModule,
8-
platformBrowserDynamicTesting,
9-
} from '@angular/platform-browser-dynamic/testing';
106
import {MatCheckboxModule} from '@angular/material/checkbox';
117
import {CheckboxHarnessExample} from './checkbox-harness-example';
128

139
describe('CheckboxHarnessExample', () => {
1410
let fixture: ComponentFixture<CheckboxHarnessExample>;
1511
let loader: HarnessLoader;
1612

17-
beforeAll(() => {
18-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
19-
});
20-
2113
beforeEach(async () => {
2214
await TestBed.configureTestingModule({
2315
imports: [MatCheckboxModule, ReactiveFormsModule],

src/components-examples/material/chips/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,5 @@ ng_test_library(
5454

5555
ng_web_test_suite(
5656
name = "unit_tests",
57-
exclude_init_script = True,
5857
deps = [":unit_tests_lib"],
5958
)

src/components-examples/material/chips/chips-harness/chips-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatChipHarness, MatChipListboxHarness} from '@angular/material/chips/testing';
44
import {HarnessLoader, parallel} from '@angular/cdk/testing';
5-
import {
6-
BrowserDynamicTestingModule,
7-
platformBrowserDynamicTesting,
8-
} from '@angular/platform-browser-dynamic/testing';
95
import {ChipsHarnessExample} from './chips-harness-example';
106
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
117
import {MatChipsModule} from '@angular/material/chips';
@@ -14,10 +10,6 @@ describe('ChipsHarnessExample', () => {
1410
let fixture: ComponentFixture<ChipsHarnessExample>;
1511
let loader: HarnessLoader;
1612

17-
beforeAll(() => {
18-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
19-
});
20-
2113
beforeEach(async () => {
2214
await TestBed.configureTestingModule({
2315
imports: [MatChipsModule, NoopAnimationsModule],

src/components-examples/material/datepicker/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,5 @@ ng_test_library(
5858

5959
ng_web_test_suite(
6060
name = "unit_tests",
61-
exclude_init_script = True,
6261
deps = [":unit_tests_lib"],
6362
)

src/components-examples/material/datepicker/datepicker-harness/datepicker-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatDatepickerInputHarness} from '@angular/material/datepicker/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {
6-
BrowserDynamicTestingModule,
7-
platformBrowserDynamicTesting,
8-
} from '@angular/platform-browser-dynamic/testing';
95
import {MatDatepickerModule} from '@angular/material/datepicker';
106
import {DatepickerHarnessExample} from './datepicker-harness-example';
117
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
@@ -16,10 +12,6 @@ describe('DatepickerHarnessExample', () => {
1612
let fixture: ComponentFixture<DatepickerHarnessExample>;
1713
let loader: HarnessLoader;
1814

19-
beforeAll(() => {
20-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
21-
});
22-
2315
beforeEach(async () => {
2416
await TestBed.configureTestingModule({
2517
imports: [MatDatepickerModule, NoopAnimationsModule, MatNativeDateModule, FormsModule],

src/components-examples/material/dialog/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,5 @@ ng_test_library(
5252

5353
ng_web_test_suite(
5454
name = "unit_tests",
55-
exclude_init_script = True,
5655
deps = [":unit_tests_lib"],
5756
)

src/components-examples/material/dialog/dialog-harness/dialog-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
import {TestBed, ComponentFixture, waitForAsync} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatDialogHarness} from '@angular/material/dialog/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {
6-
BrowserDynamicTestingModule,
7-
platformBrowserDynamicTesting,
8-
} from '@angular/platform-browser-dynamic/testing';
95
import {MatDialogModule} from '@angular/material/dialog';
106
import {DialogHarnessExample} from './dialog-harness-example';
117
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
@@ -14,10 +10,6 @@ describe('DialogHarnessExample', () => {
1410
let fixture: ComponentFixture<DialogHarnessExample>;
1511
let loader: HarnessLoader;
1612

17-
beforeAll(() => {
18-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
19-
});
20-
2113
beforeEach(
2214
waitForAsync(async () => {
2315
await TestBed.configureTestingModule({

src/components-examples/material/divider/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,5 @@ ng_test_library(
4848

4949
ng_web_test_suite(
5050
name = "unit_tests",
51-
exclude_init_script = True,
5251
deps = [":unit_tests_lib"],
5352
)

src/components-examples/material/divider/divider-harness/divider-harness-example.spec.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
1-
import {TestBed, ComponentFixture} from '@angular/core/testing';
1+
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
33
import {MatDividerHarness} from '@angular/material/divider/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {
6-
BrowserDynamicTestingModule,
7-
platformBrowserDynamicTesting,
8-
} from '@angular/platform-browser-dynamic/testing';
95
import {MatDividerModule} from '@angular/material/divider';
106
import {DividerHarnessExample} from './divider-harness-example';
117

128
describe('DividerHarnessExample', () => {
139
let fixture: ComponentFixture<DividerHarnessExample>;
1410
let loader: HarnessLoader;
1511

16-
beforeAll(() => {
17-
TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
18-
});
19-
2012
beforeEach(async () => {
2113
await TestBed.configureTestingModule({
2214
imports: [MatDividerModule],

src/components-examples/material/expansion/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,5 @@ ng_test_library(
5252

5353
ng_web_test_suite(
5454
name = "unit_tests",
55-
exclude_init_script = True,
5655
deps = [":unit_tests_lib"],
5756
)

0 commit comments

Comments
 (0)