From 706ba7e9c30999168189c8e3ad356d47c29ef51a Mon Sep 17 00:00:00 2001
From: Miles Malerba <mmalerba@google.com>
Date: Mon, 12 Dec 2022 22:34:57 +0000
Subject: [PATCH] fixup! fix(material/form-field): allow getting harness by
 validity

---
 src/material/form-field/testing/form-field-harness-filters.ts | 2 +-
 src/material/form-field/testing/form-field-harness.ts         | 2 +-
 src/material/form-field/testing/shared.spec.ts                | 4 ++--
 src/material/legacy-form-field/testing/form-field-harness.ts  | 2 +-
 tools/public_api_guard/material/form-field-testing.md         | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/material/form-field/testing/form-field-harness-filters.ts b/src/material/form-field/testing/form-field-harness-filters.ts
index f0039ea64df4..ead796b38adf 100644
--- a/src/material/form-field/testing/form-field-harness-filters.ts
+++ b/src/material/form-field/testing/form-field-harness-filters.ts
@@ -15,5 +15,5 @@ export interface FormFieldHarnessFilters extends BaseHarnessFilters {
   /** Filters based on whether the form field has error messages. */
   hasErrors?: boolean;
   /** Filters based on whether the form field value is valid. */
-  valid?: boolean;
+  isValid?: boolean;
 }
diff --git a/src/material/form-field/testing/form-field-harness.ts b/src/material/form-field/testing/form-field-harness.ts
index 448841c05b96..ae9bf4e78c23 100644
--- a/src/material/form-field/testing/form-field-harness.ts
+++ b/src/material/form-field/testing/form-field-harness.ts
@@ -251,7 +251,7 @@ export class MatFormFieldHarness extends _MatFormFieldHarnessBase<
       )
       .addOption(
         'valid',
-        options.valid,
+        options.isValid,
         async (harness, valid) => (await harness.isControlValid()) === valid,
       );
   }
diff --git a/src/material/form-field/testing/shared.spec.ts b/src/material/form-field/testing/shared.spec.ts
index 81ae034766f5..b4e5e0a786f9 100644
--- a/src/material/form-field/testing/shared.spec.ts
+++ b/src/material/form-field/testing/shared.spec.ts
@@ -198,13 +198,13 @@ export function runHarnessTests(
   });
 
   it('should be able to get form-field by validity', async () => {
-    let invalid = await loader.getAllHarnesses(formFieldHarness.with({valid: false}));
+    let invalid = await loader.getAllHarnesses(formFieldHarness.with({isValid: false}));
     expect(invalid.length).toBe(0);
 
     fixture.componentInstance.requiredControl.setValue('');
     dispatchFakeEvent(fixture.nativeElement.querySelector('#with-errors input'), 'blur');
 
-    invalid = await loader.getAllHarnesses(formFieldHarness.with({valid: false}));
+    invalid = await loader.getAllHarnesses(formFieldHarness.with({isValid: false}));
     expect(invalid.length).toBe(1);
   });
 
diff --git a/src/material/legacy-form-field/testing/form-field-harness.ts b/src/material/legacy-form-field/testing/form-field-harness.ts
index 8431a6ab20b9..8d011c74294a 100644
--- a/src/material/legacy-form-field/testing/form-field-harness.ts
+++ b/src/material/legacy-form-field/testing/form-field-harness.ts
@@ -60,7 +60,7 @@ export class MatLegacyFormFieldHarness extends _MatFormFieldHarnessBase<
       )
       .addOption(
         'valid',
-        options.valid,
+        options.isValid,
         async (harness, valid) => (await harness.isControlValid()) === valid,
       );
   }
diff --git a/tools/public_api_guard/material/form-field-testing.md b/tools/public_api_guard/material/form-field-testing.md
index 2e92006fbc4c..63bc03460e3c 100644
--- a/tools/public_api_guard/material/form-field-testing.md
+++ b/tools/public_api_guard/material/form-field-testing.md
@@ -28,6 +28,7 @@ export type FormFieldControlHarness = MatInputHarness | MatSelectHarness | MatDa
 export interface FormFieldHarnessFilters extends BaseHarnessFilters {
     floatingLabelText?: string | RegExp;
     hasErrors?: boolean;
+    isValid?: boolean;
 }
 
 // @public