Skip to content

fix(material-experimental/mdc-form-field): test harness referring to non-MDC harnesses #20762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2020
Merged

fix(material-experimental/mdc-form-field): test harness referring to non-MDC harnesses #20762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/material-experimental/mdc-form-field/testing/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ ts_library(
module_name = "@angular/material-experimental/mdc-form-field/testing",
deps = [
"//src/cdk/testing",
"//src/material-experimental/mdc-input/testing",
"//src/material-experimental/mdc-select/testing",
"//src/material/form-field/testing",
"//src/material/form-field/testing/control",
"//src/material/input/testing",
"//src/material/select/testing",
],
)

Expand All @@ -31,16 +31,13 @@ ng_test_library(
),
deps = [
":testing",
"//src/cdk/overlay",
"//src/material-experimental/mdc-autocomplete",
"//src/material-experimental/mdc-form-field",
"//src/material-experimental/mdc-input",
"//src/material/autocomplete",
"//src/material/core",
"//src/material-experimental/mdc-input/testing",
"//src/material-experimental/mdc-select",
"//src/material-experimental/mdc-select/testing",
"//src/material/form-field/testing:harness_tests_lib",
"//src/material/input/testing",
"//src/material/select",
"//src/material/select/testing",
"@npm//@angular/common",
],
)

Expand Down
30 changes: 5 additions & 25 deletions src/material-experimental/mdc-form-field/testing/form-field-harness.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,15 @@
import {OverlayModule} from '@angular/cdk/overlay';
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';
import {MatInputModule} from '@angular/material-experimental/mdc-input';
import {MatAutocompleteModule} from '@angular/material/autocomplete';
import {MatCommonModule, MatOptionModule} from '@angular/material/core';
import {MatInputHarness} from '@angular/material/input/testing';
import {
MAT_SELECT_SCROLL_STRATEGY_PROVIDER,
MatSelect,
MatSelectTrigger
} from '@angular/material/select';
import {MatSelectHarness} from '@angular/material/select/testing';
import {MatAutocompleteModule} from '@angular/material-experimental/mdc-autocomplete';
import {MatInputHarness} from '@angular/material-experimental/mdc-input/testing';
import {MatSelectModule} from '@angular/material-experimental/mdc-select';
import {MatSelectHarness} from '@angular/material-experimental/mdc-select/testing';
import {runHarnessTests} from '@angular/material/form-field/testing/shared.spec';
import {MatFormFieldHarness} from './form-field-harness';

// TODO: remove this once there is a `MatSelect` module which does not come
// with the form-field module provided. This is a copy of the `MatSelect` module
// that does not provide any form-field module.
@NgModule({
imports: [CommonModule, OverlayModule, MatOptionModule, MatCommonModule],
exports: [MatSelect, MatSelectTrigger, MatOptionModule, MatCommonModule],
declarations: [MatSelect, MatSelectTrigger],
providers: [MAT_SELECT_SCROLL_STRATEGY_PROVIDER]
})
export class SelectWithoutFormFieldModule {
}

describe('MDC-based MatFormFieldHarness', () => {
runHarnessTests(
[MatFormFieldModule, MatAutocompleteModule, MatInputModule, SelectWithoutFormFieldModule], {
[MatFormFieldModule, MatAutocompleteModule, MatInputModule, MatSelectModule], {
formFieldHarness: MatFormFieldHarness as any,
inputHarness: MatInputHarness,
selectHarness: MatSelectHarness,
Expand Down
4 changes: 2 additions & 2 deletions src/material-experimental/mdc-form-field/testing/form-field-harness.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import {
} from '@angular/cdk/testing';
import {FormFieldHarnessFilters} from '@angular/material/form-field/testing';
import {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
import {MatInputHarness} from '@angular/material/input/testing';
import {MatSelectHarness} from '@angular/material/select/testing';
import {MatInputHarness} from '@angular/material-experimental/mdc-input/testing';
import {MatSelectHarness} from '@angular/material-experimental/mdc-select/testing';

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