feat(select,input,form-field): move test harnesses out of experimental

Moves the test harnesses for the `select`, `input` and `form-field` packages out of `material-experimental`.

Author: crisbeto

.github/CODEOWNERS

@@ -89,8 +89,6 @@
 
 # Material experimental package
 /src/material-experimental/*                       @jelbourn
-/src/material-experimental/input/**                @devversion
-/src/material-experimental/form-field/**           @devversion
 /src/material-experimental/mdc-autocomplete/**     @crisbeto
 /src/material-experimental/mdc-button/**           @andrewseguin
 /src/material-experimental/mdc-card/**             @mmalerba
@@ -112,7 +110,6 @@
 /src/material-experimental/mdc-theming/**          @mmalerba
 /src/material-experimental/mdc-typography/**       @mmalerba
 /src/material-experimental/popover-edit/**         @kseamon @andrewseguin
-/src/material-experimental/select/**               @crisbeto
 
 # CDK experimental package
 /src/cdk-experimental/*                            @jelbourn

src/material-experimental/config.bzl

@@ -1,7 +1,4 @@
 entryPoints = [
-    "form-field/testing",
-    "form-field/testing/control",
-    "input/testing",
     "mdc-autocomplete",
     "mdc-button",
     "mdc-button/testing",
@@ -22,14 +19,13 @@ entryPoints = [
     "mdc-slider",
     "mdc-tabs",
     "popover-edit",
-    "select/testing",
 ]
 
 # List of all non-testing entry-points of the Angular material-experimental package.
 MATERIAL_EXPERIMENTAL_ENTRYPOINTS = [
     ep
     for ep in entryPoints
-    if not ep.endswith("/testing")
+    if not "/testing" in ep
 ]
 
 # List of all testing entry-points of the Angular material-experimental package.

src/material/config.bzl

@@ -53,13 +53,17 @@ entryPoints = [
     "toolbar",
     "tooltip",
     "tree",
+    "form-field/testing",
+    "form-field/testing/control",
+    "input/testing",
+    "select/testing",
 ]
 
 # List of all non-testing entry-points of the Angular Material package.
 MATERIAL_ENTRYPOINTS = [
     ep
     for ep in entryPoints
-    if not ep.endswith("/testing")
+    if not "/testing" in ep
 ]
 
 # List of all testing entry-points of the Angular Material package.

src/material-experimental/form-field/testing/BUILD.bazel renamed to src/material/form-field/testing/BUILD.bazel

@@ -8,15 +8,20 @@ ts_library(
         ["**/*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
-    module_name = "@angular/material-experimental/form-field/testing",
+    module_name = "@angular/material/form-field/testing",
     deps = [
         "//src/cdk/testing",
-        "//src/material-experimental/form-field/testing/control",
-        "//src/material-experimental/input/testing",
-        "//src/material-experimental/select/testing",
+        "//src/material/form-field/testing/control",
+        "//src/material/input/testing",
+        "//src/material/select/testing",
     ],
 )
 
+filegroup(
+    name = "source-files",
+    srcs = glob(["**/*.ts"]),
+)
+
 ng_test_library(
     name = "harness_tests_lib",
     srcs = ["shared.spec.ts"],
@@ -39,12 +44,12 @@ ng_test_library(
     deps = [
         ":harness_tests_lib",
         ":testing",
-        "//src/material-experimental/input/testing",
-        "//src/material-experimental/select/testing",
         "//src/material/autocomplete",
         "//src/material/form-field",
         "//src/material/input",
+        "//src/material/input/testing",
         "//src/material/select",
+        "//src/material/select/testing",
     ],
 )
 

src/material-experimental/form-field/testing/control/BUILD.bazel renamed to src/material/form-field/testing/control/BUILD.bazel

@@ -5,6 +5,11 @@ load("//tools:defaults.bzl", "ts_library")
 ts_library(
     name = "control",
     srcs = glob(["**/*.ts"]),
-    module_name = "@angular/material-experimental/form-field/testing/control",
+    module_name = "@angular/material/form-field/testing/control",
     deps = ["//src/cdk/testing"],
 )
+
+filegroup(
+    name = "source-files",
+    srcs = glob(["**/*.ts"]),
+)

src/material-experimental/form-field/testing/control/form-field-control-harness.ts renamed to src/material/form-field/testing/control/form-field-control-harness.ts

@@ -8,4 +8,7 @@
 
 import {BaseHarnessFilters} from '@angular/cdk/testing';
 
-export interface FormFieldHarnessFilters extends BaseHarnessFilters {}
+export interface FormFieldHarnessFilters extends BaseHarnessFilters {
+  floatingLabelText?: string | RegExp;
+  hasErrors?: boolean;
+}

src/material-experimental/form-field/testing/control/index.ts renamed to src/material/form-field/testing/control/index.ts

@@ -1,5 +1,5 @@
-import {MatInputHarness} from '@angular/material-experimental/input/testing';
-import {MatSelectHarness} from '@angular/material-experimental/select/testing';
+import {MatInputHarness} from '@angular/material/input/testing';
+import {MatSelectHarness} from '@angular/material/select/testing';
 import {MatAutocompleteModule} from '@angular/material/autocomplete';
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {MatInputModule} from '@angular/material/input';

src/material-experimental/form-field/testing/form-field-harness-filters.ts renamed to src/material/form-field/testing/form-field-harness-filters.ts

@@ -13,11 +13,9 @@ import {
   HarnessQuery,
   TestElement
 } from '@angular/cdk/testing';
-import {
-  MatFormFieldControlHarness
-} from '@angular/material-experimental/form-field/testing/control';
-import {MatInputHarness} from '@angular/material-experimental/input/testing';
-import {MatSelectHarness} from '@angular/material-experimental/select/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 {FormFieldHarnessFilters} from './form-field-harness-filters';
 
 // TODO(devversion): support datepicker harness once developed (COMP-203).
@@ -37,14 +35,18 @@ export class MatFormFieldHarness extends ComponentHarness {
    * @return a `HarnessPredicate` configured with the given options.
    */
   static with(options: FormFieldHarnessFilters = {}): HarnessPredicate<MatFormFieldHarness> {
-    return new HarnessPredicate(MatFormFieldHarness, options);
+    return new HarnessPredicate(MatFormFieldHarness, options)
+      .addOption('floatingLabelText', options.floatingLabelText, async (harness, text) =>
+          HarnessPredicate.stringMatches(await harness.getLabel(), text))
+      .addOption('hasErrors', options.hasErrors, async (harness, hasErrors) =>
+          await harness.hasErrors() === hasErrors);
   }
 
   private _prefixContainer = this.locatorForOptional('.mat-form-field-prefix');
   private _suffixContainer = this.locatorForOptional('.mat-form-field-suffix');
   private _label = this.locatorForOptional('.mat-form-field-label');
   private _errors = this.locatorForAll('.mat-error');
-  private _hints = this.locatorForAll('mat-hint,.mat-hint');
+  private _hints = this.locatorForAll('mat-hint, .mat-hint');
 
   private _inputControl = this.locatorForOptional(MatInputHarness);
   private _selectControl = this.locatorForOptional(MatSelectHarness);
@@ -117,6 +119,11 @@ export class MatFormFieldHarness extends ComponentHarness {
     return (await this.host()).hasClass('mat-form-field-can-float');
   }
 
+  /** Whether the form-field has errors. */
+  async hasErrors(): Promise<boolean> {
+    return (await this.getErrorMessages()).length > 0;
+  }
+
   /** Whether the label is currently floating. */
   async isLabelFloating(): Promise<boolean> {
     return (await this.host()).hasClass('mat-form-field-should-float');

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

@@ -9,7 +9,7 @@
 // Re-export everything from the "form-field/testing/control" entry-point. To avoid
 // circular dependencies, harnesses for default form-field controls (i.e. input, select)
 // need to import the base form-field control harness through a separate entry-point.
-export * from '@angular/material-experimental/form-field/testing/control';
+export * from '@angular/material/form-field/testing/control';
 
 export * from './form-field-harness';
 export * from './form-field-harness-filters';

src/material-experimental/form-field/testing/form-field-harness.ts renamed to src/material/form-field/testing/form-field-harness.ts

@@ -8,14 +8,19 @@ ts_library(
         ["**/*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
-    module_name = "@angular/material-experimental/input/testing",
+    module_name = "@angular/material/input/testing",
     deps = [
         "//src/cdk/coercion",
         "//src/cdk/testing",
-        "//src/material-experimental/form-field/testing/control",
+        "//src/material/form-field/testing/control",
     ],
 )
 
+filegroup(
+    name = "source-files",
+    srcs = glob(["**/*.ts"]),
+)
+
 ng_test_library(
     name = "harness_tests_lib",
     srcs = ["shared.spec.ts"],

src/material-experimental/form-field/testing/index.ts renamed to src/material/form-field/testing/index.ts

@@ -9,5 +9,6 @@
 import {BaseHarnessFilters} from '@angular/cdk/testing';
 
 export interface InputHarnessFilters extends BaseHarnessFilters {
-  value?: string;
+  value?: string | RegExp;
+  placeholder?: string | RegExp;
 }

src/material-experimental/form-field/testing/public-api.ts renamed to src/material/form-field/testing/public-api.ts

@@ -7,9 +7,7 @@
  */
 
 import {HarnessPredicate} from '@angular/cdk/testing';
-import {
-  MatFormFieldControlHarness
-} from '@angular/material-experimental/form-field/testing/control';
+import {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
 import {InputHarnessFilters} from './input-harness-filters';
 
 /** Harness for interacting with a standard Material inputs in tests. */
@@ -27,8 +25,12 @@ export class MatInputHarness extends MatFormFieldControlHarness {
    */
   static with(options: InputHarnessFilters = {}): HarnessPredicate<MatInputHarness> {
     return new HarnessPredicate(MatInputHarness, options)
-        .addOption(
-            'value', options.value, async (harness, value) => (await harness.getValue()) === value);
+        .addOption('value', options.value, async (harness, value) => {
+          return (await harness.getValue()) === value;
+        })
+        .addOption('placeholder', options.placeholder, async (harness, placeholder) => {
+          return (await harness.getPlaceholder()) === placeholder;
+        });
   }
 
   /** Whether the input is disabled. */
@@ -67,7 +69,7 @@ export class MatInputHarness extends MatFormFieldControlHarness {
     return (await (await this.host()).getProperty('type'))!;
   }
 
-  /** Gets the placeholder of the input. / */
+  /** Gets the placeholder of the input. */
   async getPlaceholder(): Promise<string> {
     // The "placeholder" property of the native input is never undefined.
     return (await (await this.host()).getProperty('placeholder'))!;

src/material-experimental/form-field/testing/shared.spec.ts renamed to src/material/form-field/testing/shared.spec.ts

@@ -8,14 +8,19 @@ ts_library(
         ["**/*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
-    module_name = "@angular/material-experimental/select/testing",
+    module_name = "@angular/material/select/testing",
     deps = [
         "//src/cdk/coercion",
         "//src/cdk/testing",
-        "//src/material-experimental/form-field/testing/control",
+        "//src/material/form-field/testing/control",
     ],
 )
 
+filegroup(
+    name = "source-files",
+    srcs = glob(["**/*.ts"]),
+)
+
 ng_test_library(
     name = "harness_tests_lib",
     srcs = ["shared.spec.ts"],

src/material-experimental/input/testing/BUILD.bazel renamed to src/material/input/testing/BUILD.bazel

@@ -6,23 +6,20 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {HarnessPredicate, TestElement} from '@angular/cdk/testing';
-import {
-  MatFormFieldControlHarness
-} from '@angular/material-experimental/form-field/testing/control';
+import {HarnessPredicate} from '@angular/cdk/testing';
+import {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
 import {SelectHarnessFilters} from './select-harness-filters';
-import {MatSelectOptionHarness, MatSelectOptionGroupHarness} from './option-harness';
-
-/** Selector for the select panel. */
-const PANEL_SELECTOR = '.mat-select-panel';
+import {
+  MatSelectOptionHarness,
+  MatSelectOptionGroupHarness,
+  OptionHarnessFilters,
+} from './option-harness';
 
 /** Harness for interacting with a standard mat-select in tests. */
 export class MatSelectHarness extends MatFormFieldControlHarness {
   private _documentRootLocator = this.documentRootLocatorFactory();
-  private _panel = this._documentRootLocator.locatorFor(PANEL_SELECTOR);
   private _backdrop = this._documentRootLocator.locatorFor('.cdk-overlay-backdrop');
-  private _optionalPanel = this._documentRootLocator.locatorForOptional(PANEL_SELECTOR);
-  private _options = this._documentRootLocator.locatorForAll(MatSelectOptionHarness);
+  private _optionalPanel = this._documentRootLocator.locatorForOptional('.mat-select-panel');
   private _groups = this._documentRootLocator.locatorForAll(MatSelectOptionGroupHarness);
   private _trigger = this.locatorFor('.mat-select-trigger');
   private _value = this.locatorFor('.mat-select-value');
@@ -80,14 +77,9 @@ export class MatSelectHarness extends MatFormFieldControlHarness {
     return (await this.host()).blur();
   }
 
-  /** Gets the select panel. */
-  async getPanel(): Promise<TestElement> {
-    return this._panel();
-  }
-
   /** Gets the options inside the select panel. */
-  async getOptions(): Promise<MatSelectOptionHarness[]> {
-    return this._options();
+  async getOptions(filter: OptionHarnessFilters = {}): Promise<MatSelectOptionHarness[]> {
+    return this._documentRootLocator.locatorForAll(MatSelectOptionHarness.with(filter))();
   }
 
   /** Gets the groups of options inside the panel. */
@@ -107,6 +99,19 @@ export class MatSelectHarness extends MatFormFieldControlHarness {
     }
   }
 
+  /** Selects the options that match the passed-in filter. */
+  async select(filter: OptionHarnessFilters = {}): Promise<void> {
+    await this.open();
+
+    const [isMultiple, options] = await Promise.all([this.isMultiple(), this.getOptions(filter)]);
+
+    if (isMultiple) {
+      await Promise.all(options.map(option => option.click()));
+    } else if (options.length) {
+      await options[0].click();
+    }
+  }
+
   /** Closes the select's panel. */
   async close(): Promise<void> {
     if (await this.isOpen()) {

src/material-experimental/input/testing/index.ts renamed to src/material/input/testing/index.ts

@@ -136,12 +136,6 @@ export function runHarnessTests(
     expect(await select.isOpen()).toBe(false);
   });
 
-  it('should be able to get the select panel', async () => {
-    const select = await loader.getHarness(selectHarness.with({selector: '#single-selection'}));
-    await select.open();
-    expect(await select.getPanel()).toBeTruthy();
-  });
-
   it('should be able to get the select options', async () => {
     const select = await loader.getHarness(selectHarness.with({selector: '#single-selection'}));
     await select.open();

src/material-experimental/input/testing/input-harness-filters.ts renamed to src/material/input/testing/input-harness-filters.ts

@@ -168,14 +168,14 @@ System.config({
     '@angular/material/tooltip': 'dist/packages/material/tooltip/index.js',
     '@angular/material/tree': 'dist/packages/material/tree/index.js',
 
-    '@angular/material-experimental/form-field/testing':
-      'dist/packages/material-experimental/form-field/testing/index.js',
-    '@angular/material-experimental/form-field/testing/control':
-      'dist/packages/material-experimental/form-field/testing/control/index.js',
-    '@angular/material-experimental/form-field/testing/shared.spec':
-      'dist/packages/material-experimental/form-field/testing/shared.spec.js',
-    '@angular/material-experimental/input/testing':
-        'dist/packages/material-experimental/input/testing/index.js',
+    '@angular/material/form-field/testing':
+      'dist/packages/material/form-field/testing/index.js',
+    '@angular/material/form-field/testing/control':
+      'dist/packages/material/form-field/testing/control/index.js',
+    '@angular/material/form-field/testing/shared.spec':
+      'dist/packages/material/form-field/testing/shared.spec.js',
+    '@angular/material/input/testing':
+        'dist/packages/material/input/testing/index.js',
     '@angular/material-experimental/mdc-autocomplete':
         'dist/packages/material-experimental/mdc-autocomplete/index.js',
     '@angular/material-experimental/mdc-button':
@@ -204,10 +204,10 @@ System.config({
         'dist/packages/material-experimental/mdc-progress-bar/index.js',
     '@angular/material-experimental/popover-edit':
         'dist/packages/material-experimental/popover-edit/index.js',
-    '@angular/material-experimental/select/testing':
-      'dist/packages/material-experimental/select/testing/index.js',
-    '@angular/material-experimental/select/testing/shared.spec':
-      'dist/packages/material-experimental/select/testing/shared.spec.js',
+    '@angular/material/select/testing':
+      'dist/packages/material/select/testing/index.js',
+    '@angular/material/select/testing/shared.spec':
+      'dist/packages/material/select/testing/shared.spec.js',
   },
   packages: {
     // Thirdparty barrels.