refactor: tweaks

Author: mdjastrzebski

src/helpers/accessiblity.ts

@@ -176,6 +176,13 @@ export function getAccessibilityCheckedState(
   return ariaChecked ?? accessibilityState?.checked;
 }
 
+export function getAccessibilitySelectedState(
+  element: ReactTestInstance
+): NonNullable<AccessibilityState['selected']> {
+  const { accessibilityState, 'aria-selected': ariaSelected } = element.props;
+  return ariaSelected ?? accessibilityState?.selected ?? false;
+}
+
 export function getAccessibilityValue(
   element: ReactTestInstance
 ): AccessibilityValue | undefined {

src/matchers/__tests__/to-be-selected.test.tsx

@@ -30,9 +30,7 @@ test('.toBeSelected() error messages', () => {
     .toThrowErrorMatchingInlineSnapshot(`
     "expect(element).toBeSelected()
 
-    Expected the element to have accessibility state selected:
-
-    Received element is not selected:
+    Received element is not selected
       <View
         accessibilityState={
           {
@@ -46,9 +44,7 @@ test('.toBeSelected() error messages', () => {
     .toThrowErrorMatchingInlineSnapshot(`
     "expect(element).not.toBeSelected()
 
-    Expected the element not to have accessibility state selected:
-
-    Received element is selected:
+    Received element is selected
       <View
         accessibilityState={
           {
@@ -63,9 +59,7 @@ test('.toBeSelected() error messages', () => {
   ).toThrowErrorMatchingInlineSnapshot(`
     "expect(element).toBeSelected()
 
-    Expected the element to have accessibility state selected:
-
-    Received element is not selected:
+    Received element is not selected
       <View
         testID="no-accessibilityState"
       />"

src/matchers/to-be-selected.ts

@@ -1,7 +1,7 @@
 import { ReactTestInstance } from 'react-test-renderer';
 import { matcherHint } from 'jest-matcher-utils';
-import { getAccessibilityState } from '../helpers/accessiblity';
-import { checkHostElement, formatElement, formatMessage } from './utils';
+import { getAccessibilitySelectedState } from '../helpers/accessiblity';
+import { checkHostElement, formatElement } from './utils';
 
 export function toBeSelected(
   this: jest.MatcherContext,
@@ -10,23 +10,15 @@ export function toBeSelected(
   checkHostElement(element, toBeSelected, this);
 
   return {
-    pass: getAccessibilityState(element)?.selected === true,
+    pass: getAccessibilitySelectedState(element),
     message: () => {
       const is = this.isNot ? 'is' : 'is not';
-      const matcher = matcherHint(
-        `${this.isNot ? '.not' : ''}.toBeSelected`,
-        'element',
-        ''
-      );
-      return formatMessage(
-        matcher,
-        `Expected the element ${
-          this.isNot ? 'not to' : 'to'
-        } have accessibility state selected`,
+      return [
+        matcherHint(`${this.isNot ? '.not' : ''}.toBeSelected`, 'element', ''),
         '',
         `Received element ${is} selected`,
-        formatElement(element)
-      );
+        formatElement(element),
+      ].join('\n');
     },
   };
 }