fix rebase issues

Author: mmalerba

src/material-experimental/mdc-input/harness/input-harness-filters.ts

@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-export type InputHarnessFilters = {
-  id?: string;
-  name?: string;
+import {BaseHarnessFilters} from '@angular/cdk-experimental/testing';
+
+export interface InputHarnessFilters extends BaseHarnessFilters {
   value?: string;
-};
+}

src/material-experimental/mdc-input/harness/input-harness.spec.ts

@@ -46,12 +46,13 @@ function runTests() {
   });
 
   it('should load input with specific id', async () => {
-    const inputs = await loader.getAllHarnesses(inputHarness.with({id: 'myTextarea'}));
+    const inputs = await loader.getAllHarnesses(inputHarness.with({selector: '#myTextarea'}));
     expect(inputs.length).toBe(1);
   });
 
   it('should load input with specific name', async () => {
-    const inputs = await loader.getAllHarnesses(inputHarness.with({name: 'favorite-food'}));
+    const inputs = await loader.getAllHarnesses(
+        inputHarness.with({selector: '[name="favorite-food"]'}));
     expect(inputs.length).toBe(1);
   });
 
@@ -157,14 +158,14 @@ function runTests() {
   });
 
   it('should be able to focus input', async () => {
-    const input = await loader.getHarness(inputHarness.with({name: 'favorite-food'}));
+    const input = await loader.getHarness(inputHarness.with({selector: '[name="favorite-food"]'}));
     expect(getActiveElementTagName()).not.toBe('input');
     await input.focus();
     expect(getActiveElementTagName()).toBe('input');
   });
 
   it('should be able to blur input', async () => {
-    const input = await loader.getHarness(inputHarness.with({name: 'favorite-food'}));
+    const input = await loader.getHarness(inputHarness.with({selector: '[name="favorite-food"]'}));
     expect(getActiveElementTagName()).not.toBe('input');
     await input.focus();
     expect(getActiveElementTagName()).toBe('input');

src/material-experimental/mdc-input/harness/input-harness.ts

@@ -26,11 +26,7 @@ export class MatInputHarness extends ComponentHarness {
    * @return a `HarnessPredicate` configured with the given options.
    */
   static with(options: InputHarnessFilters = {}): HarnessPredicate<MatInputHarness> {
-    // TODO(devversion): "name" and "id" can be removed once components#16848 is merged.
-    return new HarnessPredicate(MatInputHarness)
-        .addOption(
-            'name', options.name, async (harness, name) => (await harness.getName()) === name)
-        .addOption('id', options.id, async (harness, id) => (await harness.getId()) === id)
+    return new HarnessPredicate(MatInputHarness, options)
         .addOption(
             'value', options.value, async (harness, value) => (await harness.getValue()) === value);
   }