Skip to content

Commit 02d334c

Browse files
authored
fix(material-experimental/mdc-form-field): test harness referring to non-MDC harnesses (#20762)
The test harness for the MDC form field was referring to the non-MDC versions of `MatInput` and `MatSelect`. Furthermore, we were using the non-MDC input, select and autocomplete in tests.
1 parent cc310f9 commit 02d334c

File tree

3 files changed

+13
-36
lines changed

3 files changed

+13
-36
lines changed

src/material-experimental/mdc-form-field/testing/BUILD.bazel

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ ts_library(
1111
module_name = "@angular/material-experimental/mdc-form-field/testing",
1212
deps = [
1313
"//src/cdk/testing",
14+
"//src/material-experimental/mdc-input/testing",
15+
"//src/material-experimental/mdc-select/testing",
1416
"//src/material/form-field/testing",
1517
"//src/material/form-field/testing/control",
16-
"//src/material/input/testing",
17-
"//src/material/select/testing",
1818
],
1919
)
2020

@@ -31,16 +31,13 @@ ng_test_library(
3131
),
3232
deps = [
3333
":testing",
34-
"//src/cdk/overlay",
34+
"//src/material-experimental/mdc-autocomplete",
3535
"//src/material-experimental/mdc-form-field",
3636
"//src/material-experimental/mdc-input",
37-
"//src/material/autocomplete",
38-
"//src/material/core",
37+
"//src/material-experimental/mdc-input/testing",
38+
"//src/material-experimental/mdc-select",
39+
"//src/material-experimental/mdc-select/testing",
3940
"//src/material/form-field/testing:harness_tests_lib",
40-
"//src/material/input/testing",
41-
"//src/material/select",
42-
"//src/material/select/testing",
43-
"@npm//@angular/common",
4441
],
4542
)
4643

src/material-experimental/mdc-form-field/testing/form-field-harness.spec.ts

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,15 @@
1-
import {OverlayModule} from '@angular/cdk/overlay';
2-
import {CommonModule} from '@angular/common';
3-
import {NgModule} from '@angular/core';
41
import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';
52
import {MatInputModule} from '@angular/material-experimental/mdc-input';
6-
import {MatAutocompleteModule} from '@angular/material/autocomplete';
7-
import {MatCommonModule, MatOptionModule} from '@angular/material/core';
8-
import {MatInputHarness} from '@angular/material/input/testing';
9-
import {
10-
MAT_SELECT_SCROLL_STRATEGY_PROVIDER,
11-
MatSelect,
12-
MatSelectTrigger
13-
} from '@angular/material/select';
14-
import {MatSelectHarness} from '@angular/material/select/testing';
3+
import {MatAutocompleteModule} from '@angular/material-experimental/mdc-autocomplete';
4+
import {MatInputHarness} from '@angular/material-experimental/mdc-input/testing';
5+
import {MatSelectModule} from '@angular/material-experimental/mdc-select';
6+
import {MatSelectHarness} from '@angular/material-experimental/mdc-select/testing';
157
import {runHarnessTests} from '@angular/material/form-field/testing/shared.spec';
168
import {MatFormFieldHarness} from './form-field-harness';
179

18-
// TODO: remove this once there is a `MatSelect` module which does not come
19-
// with the form-field module provided. This is a copy of the `MatSelect` module
20-
// that does not provide any form-field module.
21-
@NgModule({
22-
imports: [CommonModule, OverlayModule, MatOptionModule, MatCommonModule],
23-
exports: [MatSelect, MatSelectTrigger, MatOptionModule, MatCommonModule],
24-
declarations: [MatSelect, MatSelectTrigger],
25-
providers: [MAT_SELECT_SCROLL_STRATEGY_PROVIDER]
26-
})
27-
export class SelectWithoutFormFieldModule {
28-
}
29-
3010
describe('MDC-based MatFormFieldHarness', () => {
3111
runHarnessTests(
32-
[MatFormFieldModule, MatAutocompleteModule, MatInputModule, SelectWithoutFormFieldModule], {
12+
[MatFormFieldModule, MatAutocompleteModule, MatInputModule, MatSelectModule], {
3313
formFieldHarness: MatFormFieldHarness as any,
3414
inputHarness: MatInputHarness,
3515
selectHarness: MatSelectHarness,

src/material-experimental/mdc-form-field/testing/form-field-harness.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import {
1515
} from '@angular/cdk/testing';
1616
import {FormFieldHarnessFilters} from '@angular/material/form-field/testing';
1717
import {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
18-
import {MatInputHarness} from '@angular/material/input/testing';
19-
import {MatSelectHarness} from '@angular/material/select/testing';
18+
import {MatInputHarness} from '@angular/material-experimental/mdc-input/testing';
19+
import {MatSelectHarness} from '@angular/material-experimental/mdc-select/testing';
2020

2121
// TODO(devversion): support datepicker harness once developed (COMP-203).
2222
// Also support chip list harness.

0 commit comments

Comments
 (0)