fix(material/form-field): allow getting harness by validity (#26232)

* fix(material/form-field): allow getting harness by validity * fixup! fix(material/form-field): allow getting harness by validity (cherry picked from commit 46a4db2)
angular · Dec 13, 2022 · 67db1a6 · 67db1a6
1 parent fee5d0b
commit 67db1a6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 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
@@ -14,4 +14,6 @@ export interface FormFieldHarnessFilters extends BaseHarnessFilters {
   floatingLabelText?: string | RegExp;
   /** Filters based on whether the form field has error messages. */
   hasErrors?: boolean;
+  /** Filters based on whether the form field value is valid. */
+  isValid?: boolean;
 }
diff --git a/src/material/form-field/testing/form-field-harness.ts b/src/material/form-field/testing/form-field-harness.ts
@@ -248,6 +248,11 @@ export class MatFormFieldHarness extends _MatFormFieldHarnessBase<
         'hasErrors',
         options.hasErrors,
         async (harness, hasErrors) => (await harness.hasErrors()) === hasErrors,
+      )
+      .addOption(
+        'isValid',
+        options.isValid,
+        async (harness, isValid) => (await harness.isControlValid()) === isValid,
       );
   }
 

diff --git a/src/material/form-field/testing/shared.spec.ts b/src/material/form-field/testing/shared.spec.ts
@@ -197,6 +197,17 @@ export function runHarnessTests(
     );
   });
 
+  it('should be able to get form-field by validity', async () => {
+    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({isValid: false}));
+    expect(invalid.length).toBe(1);
+  });
+
   it('should be able to get error harnesses from the form-field harness', async () => {
     const formFields = await loader.getAllHarnesses(formFieldHarness);
     expect(await formFields[1].getErrors()).toEqual([]);

diff --git a/src/material/legacy-form-field/testing/form-field-harness.ts b/src/material/legacy-form-field/testing/form-field-harness.ts
@@ -57,6 +57,11 @@ export class MatLegacyFormFieldHarness extends _MatFormFieldHarnessBase<
         'hasErrors',
         options.hasErrors,
         async (harness, hasErrors) => (await harness.hasErrors()) === hasErrors,
+      )
+      .addOption(
+        'isValid',
+        options.isValid,
+        async (harness, isValid) => (await harness.isControlValid()) === isValid,
       );
   }
 

diff --git 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