code review changes

Author: mdjastrzebski

src/user-event/accessibility-action/__tests__/accessibility-action.test.tsx

@@ -24,7 +24,7 @@ async function renderViewWithActions(props: React.ComponentProps<typeof View> =
 }
 
 describe('userEvent.accessibilityAction', () => {
-  it('triggers the onAccessibilityAction handler with the given action name', async () => {
+  test('triggers the onAccessibilityAction handler with the given action name', async () => {
     const user = userEvent.setup();
     const { events } = await renderViewWithActions();
 
@@ -37,7 +37,7 @@ describe('userEvent.accessibilityAction', () => {
     });
   });
 
-  it('supports the direct (setup-less) call form', async () => {
+  test('supports the direct (setup-less) call form', async () => {
     const { events } = await renderViewWithActions();
 
     await userEvent.accessibilityAction(screen.getByTestId('view'), 'activate');
@@ -46,7 +46,7 @@ describe('userEvent.accessibilityAction', () => {
     expect(lastEventPayload(events, 'accessibilityAction').nativeEvent.actionName).toBe('activate');
   });
 
-  it('throws when the action is not declared in accessibilityActions', async () => {
+  test('throws when the action is not declared in accessibilityActions', async () => {
     const user = userEvent.setup();
     await renderViewWithActions();
 
@@ -55,7 +55,7 @@ describe('userEvent.accessibilityAction', () => {
     );
   });
 
-  it('throws when the element declares no accessibility actions', async () => {
+  test('throws when the element declares no accessibility actions', async () => {
     const user = userEvent.setup();
     await renderViewWithActions({ accessibilityActions: undefined });
 
@@ -64,7 +64,7 @@ describe('userEvent.accessibilityAction', () => {
     );
   });
 
-  it('throws when the element is disabled', async () => {
+  test('throws when the element is disabled', async () => {
     const user = userEvent.setup();
     await renderViewWithActions({ 'aria-disabled': true });
 
@@ -73,7 +73,7 @@ describe('userEvent.accessibilityAction', () => {
     );
   });
 
-  it('throws when the element is disabled via accessibilityState', async () => {
+  test('throws when the element is disabled via accessibilityState', async () => {
     const user = userEvent.setup();
     await renderViewWithActions({ accessibilityState: { disabled: true } });
 

src/user-event/accessibility-action/accessibility-action.ts

@@ -6,6 +6,7 @@ import type { TestInstance } from 'test-renderer';
 
 import { buildAccessibilityActionEvent } from '../../event-builder';
 import { computeAriaDisabled } from '../../helpers/accessibility';
+import { isTestInstance } from '../../helpers/component-tree';
 import { ErrorWithStack } from '../../helpers/errors';
 import type { StringWithAutocomplete } from '../../types';
 import type { UserEventInstance } from '../setup';
@@ -39,18 +40,28 @@ export async function accessibilityAction(
   instance: TestInstance,
   actionName: AccessibilityActionName,
 ): Promise<void> {
+  if (!isTestInstance(instance)) {
+    throw new ErrorWithStack(
+      `accessibilityAction() works only with host instances.`,
+      accessibilityAction,
+    );
+  }
+
   const actions = instance.props.accessibilityActions as
     | ReadonlyArray<AccessibilityActionInfo>
     | undefined;
 
-  if (!actions?.some((action) => action.name === actionName)) {
-    const declared = actions?.map((action) => action.name);
+  if (!actions?.length) {
+    throw new ErrorWithStack(
+      `accessibilityAction() called with action "${actionName}", but the element declares no accessibility actions in the "accessibilityActions" prop.`,
+      accessibilityAction,
+    );
+  }
+
+  if (!actions.some((action) => action.name === actionName)) {
+    const declared = actions.map((action) => `"${action.name}"`).join(', ');
     throw new ErrorWithStack(
-      `accessibilityAction() called with action "${actionName}", but the element does not declare it in the "accessibilityActions" prop. ${
-        declared?.length
-          ? `Declared actions: ${declared.map((name) => `"${name}"`).join(', ')}.`
-          : 'The element declares no accessibility actions.'
-      }`,
+      `accessibilityAction() called with action "${actionName}", but the element does not declare it in the "accessibilityActions" prop. Declared actions: ${declared}.`,
       accessibilityAction,
     );
   }