chore: improve tests

Author: mdjastrzebski

src/queries/__tests__/predicate.test.tsx

@@ -4,8 +4,15 @@ import { ReactTestInstance } from 'react-test-renderer';
 import { render } from '../..';
 
 test('getByPredicate returns only native elements', () => {
-  const testIdPredicate = (testID: string) => (node: ReactTestInstance) => {
-    return node.props.testID === testID;
+  const testIdPredicate = (testID: string) => (element: ReactTestInstance) => {
+    return element.props.testID === testID;
+  };
+
+  const textInputPredicate = function matchTextInput(
+    element: ReactTestInstance
+  ) {
+    // @ts-expect-error - ReatTestInstance type is missing host element typing
+    return element.type === 'TextInput';
   };
 
   const { getByPredicate, getAllByPredicate } = render(
@@ -27,10 +34,56 @@ test('getByPredicate returns only native elements', () => {
   expect(getAllByPredicate(testIdPredicate('view'))).toHaveLength(1);
   expect(getAllByPredicate(testIdPredicate('button'))).toHaveLength(1);
 
-  expect(() => getByPredicate(testIdPredicate('myComponent'))).toThrowError(
-    /^Unable to find an element matching predicate: /i
-  );
-  expect(() => getAllByPredicate(testIdPredicate('myComponent'))).toThrowError(
-    /^Unable to find an element matching predicate: /i
+  expect(getByPredicate(textInputPredicate)).toBeTruthy();
+});
+
+test('getByPredicate error messages', () => {
+  function hasStylePredicate(element: ReactTestInstance) {
+    return element.props.style !== undefined;
+  }
+
+  const textInputPredicate = function textInputPredicate(
+    element: ReactTestInstance
+  ) {
+    // @ts-expect-error - ReatTestInstance type is missing host element typing
+    return element.type === 'TextInput';
+  };
+
+  const testIdPredicate = (testID: string) => (element: ReactTestInstance) => {
+    return element.props.testID === testID;
+  };
+
+  const { getByPredicate, getAllByPredicate } = render(
+    <View>
+      <Text testID="text">Text</Text>
+    </View>
   );
+
+  expect(() => getByPredicate(hasStylePredicate))
+    .toThrowErrorMatchingInlineSnapshot(`
+    "Unable to find an element matching predicate: function hasStylePredicate(element) {
+        return element.props.style !== undefined;
+      }"
+  `);
+
+  expect(() => getByPredicate(textInputPredicate))
+    .toThrowErrorMatchingInlineSnapshot(`
+    "Unable to find an element matching predicate: function textInputPredicate(element) {
+        // @ts-expect-error - ReatTestInstance type is missing host element typing
+        return element.type === 'TextInput';
+      }"
+  `);
+
+  expect(() => getByPredicate(testIdPredicate('myComponent')))
+    .toThrowErrorMatchingInlineSnapshot(`
+    "Unable to find an element matching predicate: element => {
+        return element.props.testID === testID;
+      }"
+  `);
+  expect(() => getAllByPredicate(testIdPredicate('myComponent')))
+    .toThrowErrorMatchingInlineSnapshot(`
+    "Unable to find an element matching predicate: element => {
+        return element.props.testID === testID;
+      }"
+  `);
 });

src/queries/predicate.ts

@@ -1,4 +1,6 @@
 import type { ReactTestInstance } from 'react-test-renderer';
+import { isHostElement } from '../helpers/component-tree';
+import { findAll } from '../helpers/findAll';
 import { makeQueries } from './makeQueries';
 import type {
   FindAllByQuery,
@@ -8,24 +10,25 @@ import type {
   QueryAllByQuery,
   QueryByQuery,
 } from './makeQueries';
+import { CommonQueryOptions } from './options';
 
 type PredicateFn = (instance: ReactTestInstance) => boolean;
-// Not used so far
-type PredicateQueryOptions = void;
-
-const queryAllByPredicate = (
-  instance: ReactTestInstance
-): ((
-  predicate: PredicateFn,
-  options?: PredicateQueryOptions
-) => Array<ReactTestInstance>) =>
-  function queryAllByTestIdFn(predicate) {
-    const results = instance.findAll(
-      (node) => typeof node.type === 'string' && predicate(node)
+type ByPredicateQueryOptions = CommonQueryOptions;
+
+function queryAllByPredicate(instance: ReactTestInstance) {
+  return function queryAllByPredicateFn(
+    predicate: PredicateFn,
+    options?: ByPredicateQueryOptions
+  ): Array<ReactTestInstance> {
+    const results = findAll(
+      instance,
+      (node) => isHostElement(node) && predicate(node),
+      options
     );
 
     return results;
   };
+}
 
 const getMultipleError = (predicate: PredicateFn) =>
   `Found multiple elements matching predicate: ${predicate}`;
@@ -40,12 +43,12 @@ const { getBy, getAllBy, queryBy, queryAllBy, findBy, findAllBy } = makeQueries(
 );
 
 export type ByTestIdQueries = {
-  getByPredicate: GetByQuery<PredicateFn, PredicateQueryOptions>;
-  getAllByPredicate: GetAllByQuery<PredicateFn, PredicateQueryOptions>;
-  queryByPredicate: QueryByQuery<PredicateFn, PredicateQueryOptions>;
-  queryAllByPredicate: QueryAllByQuery<PredicateFn, PredicateQueryOptions>;
-  findByPredicate: FindByQuery<PredicateFn, PredicateQueryOptions>;
-  findAllByPredicate: FindAllByQuery<PredicateFn, PredicateQueryOptions>;
+  getByPredicate: GetByQuery<PredicateFn, ByPredicateQueryOptions>;
+  getAllByPredicate: GetAllByQuery<PredicateFn, ByPredicateQueryOptions>;
+  queryByPredicate: QueryByQuery<PredicateFn, ByPredicateQueryOptions>;
+  queryAllByPredicate: QueryAllByQuery<PredicateFn, ByPredicateQueryOptions>;
+  findByPredicate: FindByQuery<PredicateFn, ByPredicateQueryOptions>;
+  findAllByPredicate: FindAllByQuery<PredicateFn, ByPredicateQueryOptions>;
 };
 
 export const bindByPredicateQueries = (