refactor tests

Author: mdjastrzebski

packages/react-native/Libraries/Components/Touchable/TouchableHighlight.js

@@ -230,11 +230,15 @@ class TouchableHighlightImpl extends React.Component<
     const {onBlur, onFocus, ...eventHandlersWithoutBlurAndFocus} =
       this.state.pressability.getEventHandlers();
 
+    // The `disabled` prop takes precedence over `aria-disabled`, which in turn
+    // takes precedence over `accessibilityState.disabled`. The remaining
+    // `aria-*` state props are forwarded to `View`, which merges them.
+    const disabled = this.props.disabled ?? this.props['aria-disabled'];
     const accessibilityState: ?AccessibilityState =
-      this.props.disabled != null
+      disabled != null
         ? {
             ...this.props.accessibilityState,
-            disabled: this.props.disabled,
+            disabled,
           }
         : this.props.accessibilityState;
 
@@ -260,6 +264,10 @@ class TouchableHighlightImpl extends React.Component<
         accessibilityLanguage={this.props.accessibilityLanguage}
         accessibilityRole={this.props.accessibilityRole}
         accessibilityState={accessibilityState}
+        aria-busy={this.props['aria-busy']}
+        aria-checked={this.props['aria-checked']}
+        aria-expanded={this.props['aria-expanded']}
+        aria-selected={this.props['aria-selected']}
         accessibilityValue={accessibilityValue}
         accessibilityActions={this.props.accessibilityActions}
         onAccessibilityAction={this.props.onAccessibilityAction}

packages/react-native/Libraries/Image/Image.ios.js

@@ -205,7 +205,7 @@ let BaseImage: AbstractImageIOS = ({
     // In order for `aria-hidden` to work on iOS we must set `accessible` to
     // false (`accessibilityElementsHidden` is not enough).
     resolvedProps.accessible = false;
-  } else if (alt !== undefined) {
+  } else if (alt != null) {
     resolvedProps.accessible = true;
   } else if (accessible != null) {
     resolvedProps.accessible = accessible;

packages/react-native/Libraries/Image/__tests__/Image-itest.js

@@ -648,53 +648,11 @@ describe('<Image>', () => {
       });
     });
 
-    describe('aria-* accessibility state', () => {
-      (
-        [
-          [<Image aria-busy={true} accessible={true} />, 'busy:true'],
-          [<Image aria-disabled={true} accessible={true} />, 'disabled:true'],
-          [<Image aria-expanded={true} accessible={true} />, 'expanded:true'],
-          [<Image aria-selected={true} accessible={true} />, 'selected:true'],
-          [<Image aria-checked={true} accessible={true} />, 'checked:Checked'],
-        ] as const
-      ).forEach(([element, expected]) => {
-        it(`maps ${expected.split(':')[0]} into accessibilityState`, () => {
-          const root = Fantom.createRoot();
-
-          Fantom.runTask(() => {
-            root.render(element);
-          });
-
-          expect(
-            root
-              .getRenderedOutput({props: ['accessibilityState']})
-              .toJSONObject().props.accessibilityState,
-          ).toContain(expected);
-        });
-      });
-
-      it('takes precedence over the matching accessibilityState field', () => {
-        const root = Fantom.createRoot();
-
-        Fantom.runTask(() => {
-          root.render(
-            <Image
-              accessibilityState={{busy: false, disabled: true}}
-              aria-busy={true}
-              accessible={true}
-            />,
-          );
-        });
-
-        const accessibilityState = root
-          .getRenderedOutput({props: ['accessibilityState']})
-          .toJSONObject().props.accessibilityState;
-
-        expect(accessibilityState).toContain('busy:true');
-        // Fields not covered by an `aria-*` prop are preserved.
-        expect(accessibilityState).toContain('disabled:true');
-      });
-
+    describe('accessibilityState', () => {
+      // The `aria-*` to `accessibilityState` mapping is covered by
+      // `accessibilityPropsSuite`. This case cannot live there, because
+      // `Pressable` and `TouchableWithoutFeedback` always emit
+      // `accessibilityState`.
       it('is not set when no state props are provided', () => {
         const root = Fantom.createRoot();
 

packages/react-native/src/private/__tests__/utilities/accessibilityPropsSuite.js

@@ -310,6 +310,87 @@ export default function accessibilityPropsSuite(
           ).toEqual(true);
         });
       });
+
+      describe('aria-* aliases', () => {
+        it('\'aria-busy\' maps to "busy"', () => {
+          expect(
+            getAccessibilityProp(
+              <Component aria-busy={true} />,
+              'accessibilityState',
+            ).includes('busy:true'),
+          ).toEqual(true);
+        });
+
+        it('\'aria-disabled\' maps to "disabled"', () => {
+          expect(
+            getAccessibilityProp(
+              <Component aria-disabled={true} />,
+              'accessibilityState',
+            ).includes('disabled:true'),
+          ).toEqual(true);
+        });
+
+        it('\'aria-expanded\' maps to "expanded"', () => {
+          expect(
+            getAccessibilityProp(
+              <Component aria-expanded={true} />,
+              'accessibilityState',
+            ).includes('expanded:true'),
+          ).toEqual(true);
+        });
+
+        it('\'aria-selected\' maps to "selected"', () => {
+          expect(
+            getAccessibilityProp(
+              <Component aria-selected={true} />,
+              'accessibilityState',
+            ).includes('selected:true'),
+          ).toEqual(true);
+        });
+
+        describe('\'aria-checked\' maps to "checked"', () => {
+          it('when set to true', () => {
+            expect(
+              getAccessibilityProp(
+                <Component aria-checked={true} />,
+                'accessibilityState',
+              ).includes('checked:Checked'),
+            ).toEqual(true);
+          });
+
+          it('when set to false', () => {
+            expect(
+              getAccessibilityProp(
+                <Component aria-checked={false} />,
+                'accessibilityState',
+              ).includes('checked:Unchecked'),
+            ).toEqual(true);
+          });
+
+          it("when set to 'mixed'", () => {
+            expect(
+              getAccessibilityProp(
+                <Component aria-checked="mixed" />,
+                'accessibilityState',
+              ).includes('checked:Mixed'),
+            ).toEqual(true);
+          });
+        });
+
+        it('take precedence over the matching `accessibilityState` field', () => {
+          const accessibilityState = getAccessibilityProp(
+            <Component
+              accessibilityState={{busy: false, disabled: true}}
+              aria-busy={true}
+            />,
+            'accessibilityState',
+          );
+
+          expect(accessibilityState.includes('busy:true')).toEqual(true);
+          // Fields not covered by an `aria-*` prop are preserved.
+          expect(accessibilityState.includes('disabled:true')).toEqual(true);
+        });
+      });
     });
 
     describe('accessibilityActions', () => {