fixup! feat(aria/combobox): add test harnesses

Author: ok7sai

goldens/aria/simple-combobox/testing/index.api.md

@@ -12,7 +12,7 @@ import { HarnessLoader } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
 
 // @public
-export class SimpleComboboxHarness extends ContentContainerComponentHarness {
+export class ComboboxHarness extends ContentContainerComponentHarness {
     blur(): Promise<void>;
     close(): Promise<void>;
     focus(): Promise<void>;
@@ -32,11 +32,11 @@ export class SimpleComboboxHarness extends ContentContainerComponentHarness {
     isOpen(): Promise<boolean>;
     open(): Promise<void>;
     setValue(value: string): Promise<void>;
-    static with(options?: SimpleComboboxHarnessFilters): HarnessPredicate<SimpleComboboxHarness>;
+    static with(options?: ComboboxHarnessFilters): HarnessPredicate<ComboboxHarness>;
 }
 
 // @public
-export interface SimpleComboboxHarnessFilters extends BaseHarnessFilters {
+export interface ComboboxHarnessFilters extends BaseHarnessFilters {
     disabled?: boolean;
     placeholder?: string | RegExp;
     value?: string | RegExp;

…sting/simple-combobox-harness-filters.ts …obox/testing/combobox-harness-filters.tssrc/aria/simple-combobox/testing/simple-combobox-harness-filters.ts renamed to src/aria/simple-combobox/testing/combobox-harness-filters.ts src/aria/simple-combobox/testing/simple-combobox-harness-filters.ts renamed to src/aria/simple-combobox/testing/combobox-harness-filters.ts

@@ -8,8 +8,8 @@
 
 import {BaseHarnessFilters} from '@angular/cdk/testing';
 
-/** A set of criteria that can be used to filter a list of `SimpleComboboxHarness` instances. */
-export interface SimpleComboboxHarnessFilters extends BaseHarnessFilters {
+/** A set of criteria that can be used to filter a list of `ComboboxHarness` instances. */
+export interface ComboboxHarnessFilters extends BaseHarnessFilters {
   /** Only find instances whose placeholder matches the given value. */
   placeholder?: string | RegExp;
   /** Only find instances whose value matches the given value. */

…/testing/simple-combobox-harness.spec.ts …ombobox/testing/combobox-harness.spec.tssrc/aria/simple-combobox/testing/simple-combobox-harness.spec.ts renamed to src/aria/simple-combobox/testing/combobox-harness.spec.ts src/aria/simple-combobox/testing/simple-combobox-harness.spec.ts renamed to src/aria/simple-combobox/testing/combobox-harness.spec.ts

@@ -13,10 +13,10 @@ import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Combobox, ComboboxPopup, ComboboxWidget} from '../index';
 import {Listbox, Option} from '../../listbox';
 import {ListboxHarness, ListboxOptionHarness} from '../../listbox/testing/listbox-harness';
-import {SimpleComboboxHarness} from './simple-combobox-harness';
+import {ComboboxHarness} from './combobox-harness';
 import {OverlayModule} from '@angular/cdk/overlay';
 
-describe('SimpleComboboxHarness', () => {
+describe('ComboboxHarness', () => {
   let fixture: ComponentFixture<any>;
   let loader: HarnessLoader;
 
@@ -27,22 +27,22 @@ describe('SimpleComboboxHarness', () => {
   }
 
   describe('Basic usage', () => {
-    beforeEach(() => setupTest(SimpleComboboxTestApp));
+    beforeEach(() => setupTest(ComboboxTestApp));
 
     it('should load combobox harness', async () => {
-      await expectAsync(loader.getHarness(SimpleComboboxHarness)).toBeResolved();
+      await expectAsync(loader.getHarness(ComboboxHarness)).toBeResolved();
     });
 
     it('should get and set values', async () => {
-      const combobox = await loader.getHarness(SimpleComboboxHarness);
+      const combobox = await loader.getHarness(ComboboxHarness);
       await combobox.setValue('California');
       fixture.detectChanges();
 
       expect(await combobox.getValue()).toBe('California');
     });
 
     it('should correctly report disabled state', async () => {
-      const combobox = await loader.getHarness(SimpleComboboxHarness);
+      const combobox = await loader.getHarness(ComboboxHarness);
       expect(await combobox.isDisabled()).toBeFalse();
 
       fixture.componentInstance.disabled.set(true);
@@ -52,7 +52,7 @@ describe('SimpleComboboxHarness', () => {
     });
 
     it('should open and close the popup', async () => {
-      const combobox = await loader.getHarness(SimpleComboboxHarness);
+      const combobox = await loader.getHarness(ComboboxHarness);
       expect(await combobox.isOpen()).toBeFalse();
 
       await combobox.open();
@@ -65,7 +65,7 @@ describe('SimpleComboboxHarness', () => {
     });
 
     it('should allow loading nested harnesses within the popup content via unified container API', async () => {
-      const combobox = await loader.getHarness(SimpleComboboxHarness);
+      const combobox = await loader.getHarness(ComboboxHarness);
       await combobox.open();
       fixture.detectChanges();
 
@@ -76,15 +76,15 @@ describe('SimpleComboboxHarness', () => {
     });
 
     it('should fail to resolve nested items when closed', async () => {
-      const combobox = await loader.getHarness(SimpleComboboxHarness);
+      const combobox = await loader.getHarness(ComboboxHarness);
       // Popup isn't open yet, so getPopupWidget should fail.
       await expectAsync(combobox.getPopupWidget(ListboxHarness)).toBeRejectedWithError(
         /Cannot retrieve popup content because the combobox is closed/,
       );
     });
 
     it('should support getting explicit popup loader for descendant matching', async () => {
-      const combobox = await loader.getHarness(SimpleComboboxHarness);
+      const combobox = await loader.getHarness(ComboboxHarness);
       await combobox.open();
       fixture.detectChanges();
 
@@ -95,7 +95,7 @@ describe('SimpleComboboxHarness', () => {
     });
 
     it('should support focusing and blurring', async () => {
-      const combobox = await loader.getHarness(SimpleComboboxHarness);
+      const combobox = await loader.getHarness(ComboboxHarness);
       await combobox.focus();
       expect(await combobox.isFocused()).toBeTrue();
 
@@ -106,8 +106,8 @@ describe('SimpleComboboxHarness', () => {
 
   describe('Overlay and Popover integrations', () => {
     it('should find and resolve harnesses nested inside standard CdkOverlay', async () => {
-      setupTest(SimpleComboboxOverlayTestApp);
-      const combobox = await loader.getHarness(SimpleComboboxHarness);
+      setupTest(ComboboxOverlayTestApp);
+      const combobox = await loader.getHarness(ComboboxHarness);
 
       await combobox.open();
       fixture.detectChanges();
@@ -119,8 +119,8 @@ describe('SimpleComboboxHarness', () => {
     });
 
     it('should resolve nested harnesses when using Native Popover API', async () => {
-      setupTest(SimpleComboboxNativePopoverTestApp);
-      const combobox = await loader.getHarness(SimpleComboboxHarness);
+      setupTest(ComboboxNativePopoverTestApp);
+      const combobox = await loader.getHarness(ComboboxHarness);
 
       await combobox.open();
       fixture.detectChanges();
@@ -153,7 +153,7 @@ describe('SimpleComboboxHarness', () => {
   `,
   imports: [Combobox, ComboboxPopup, ComboboxWidget, Listbox, Option],
 })
-class SimpleComboboxTestApp {
+class ComboboxTestApp {
   disabled = signal(false);
 }
 
@@ -174,7 +174,7 @@ class SimpleComboboxTestApp {
   `,
   imports: [Combobox, ComboboxPopup, ComboboxWidget, Listbox, Option, OverlayModule],
 })
-class SimpleComboboxOverlayTestApp {
+class ComboboxOverlayTestApp {
   popupExpanded = signal(false);
 }
 
@@ -195,6 +195,6 @@ class SimpleComboboxOverlayTestApp {
   `,
   imports: [Combobox, ComboboxPopup, ComboboxWidget, Listbox, Option, OverlayModule],
 })
-class SimpleComboboxNativePopoverTestApp {
+class ComboboxNativePopoverTestApp {
   popupExpanded = signal(false);
 }

…bobox/testing/simple-combobox-harness.ts …ple-combobox/testing/combobox-harness.tssrc/aria/simple-combobox/testing/simple-combobox-harness.ts renamed to src/aria/simple-combobox/testing/combobox-harness.ts src/aria/simple-combobox/testing/simple-combobox-harness.ts renamed to src/aria/simple-combobox/testing/combobox-harness.ts

@@ -14,19 +14,19 @@ import {
   HarnessPredicate,
   TestKey,
 } from '@angular/cdk/testing';
-import {SimpleComboboxHarnessFilters} from './simple-combobox-harness-filters';
+import {ComboboxHarnessFilters} from './combobox-harness-filters';
 
 /** Harness for interacting with a standard `ngCombobox` input element in tests. */
-export class SimpleComboboxHarness extends ContentContainerComponentHarness {
+export class ComboboxHarness extends ContentContainerComponentHarness {
   static hostSelector = '[ngCombobox]';
 
   /**
    * Gets a `HarnessPredicate` that can be used to search for a combobox with specific attributes.
    * @param options Options for filtering which combobox instances are considered a match.
    * @return a `HarnessPredicate` configured with the given options.
    */
-  static with(options: SimpleComboboxHarnessFilters = {}): HarnessPredicate<SimpleComboboxHarness> {
-    return new HarnessPredicate(SimpleComboboxHarness, options)
+  static with(options: ComboboxHarnessFilters = {}): HarnessPredicate<ComboboxHarness> {
+    return new HarnessPredicate(ComboboxHarness, options)
       .addOption('placeholder', options.placeholder, async (harness, placeholder) =>
         HarnessPredicate.stringMatches(await harness.getPlaceholder(), placeholder),
       )
@@ -108,8 +108,6 @@ export class SimpleComboboxHarness extends ContentContainerComponentHarness {
     if (value) {
       await host.sendKeys(value);
     }
-    // Trigger simulated standard input pipeline.
-    await host.dispatchEvent('input');
   }
 
   /** Gets the placeholder text of the combobox. */

src/aria/simple-combobox/testing/public-api.ts

@@ -6,5 +6,5 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-export * from './simple-combobox-harness';
-export * from './simple-combobox-harness-filters';
+export * from './combobox-harness';
+export * from './combobox-harness-filters';