refactor types

Author: acatalina

src/helpers/findByAPI.js

@@ -21,7 +21,7 @@ const makeFindQuery = <Text, Result>(
 ): Promise<Result> => waitFor(() => getQuery(instance)(text), waitForOptions);
 
 export const findByTestId = (instance: ReactTestInstance) => (
-  testId: string,
+  testId: string | RegExp,
   waitForOptions: WaitForOptions = {}
 ) => makeFindQuery(instance, getByTestId, testId, waitForOptions);
 

src/helpers/getByAPI.js

@@ -134,7 +134,7 @@ export const getByDisplayValue = (instance: ReactTestInstance) =>
   };
 
 export const getByTestId = (instance: ReactTestInstance) =>
-  function getByTestIdFn(testID: string) {
+  function getByTestIdFn(testID: string | RegExp) {
     try {
       const results = getAllByTestId(instance)(testID);
       if (results.length === 1) {

src/helpers/queryByAPI.js

@@ -48,7 +48,7 @@ export const queryByDisplayValue = (instance: ReactTestInstance) =>
   };
 
 export const queryByTestId = (instance: ReactTestInstance) =>
-  function queryByTestIdFn(testID: string) {
+  function queryByTestIdFn(testID: string | RegExp) {
     try {
       return getByTestId(instance)(testID);
     } catch (error) {

typings/__tests__/index.test.tsx

@@ -41,6 +41,7 @@ const getBy: ReactTestInstance[] = [
   tree.getByDisplayValue('my value'),
   tree.getByDisplayValue(/value/g),
   tree.getByTestId('test-id'),
+  tree.getByTestId(/test-id/),
   tree.getByA11yLabel('label'),
   tree.getByLabelText('label'),
   tree.getByA11yHint('label'),
@@ -89,6 +90,7 @@ const queryBy: Array<ReactTestInstance | null> = [
   tree.queryByDisplayValue('my value'),
   tree.queryByDisplayValue(/value/g),
   tree.queryByTestId('test-id'),
+  tree.queryByTestId(/test-id/),
   tree.queryByA11yHint('label'),
   tree.queryByHintText('label'),
   tree.queryByA11yLabel('label'),
@@ -112,7 +114,7 @@ const queryAllBy: ReactTestInstance[][] = [
   tree.queryAllByDisplayValue('my value'),
   tree.queryAllByDisplayValue(/value/g),
   tree.queryAllByTestId('test-id'),
-  tree.queryAllByTestId(/value/),
+  tree.queryAllByTestId(/test-id/),
   tree.queryAllByA11yLabel('label'),
   tree.queryAllByLabelText('label'),
   tree.queryAllByA11yHint('label'),
@@ -143,7 +145,7 @@ const findBy: Promise<ReactTestInstance>[] = [
   tree.findByDisplayValue(/value/g),
   tree.findByDisplayValue(/value/g, { timeout: 10, interval: 10 }),
   tree.findByTestId('test-id'),
-  tree.findByTestId('test-id', { timeout: 10, interval: 10 }),
+  tree.findByTestId(/test-id/, { timeout: 10, interval: 10 }),
   tree.findByA11yLabel('label'),
   tree.findByA11yLabel('label', { timeout: 10, interval: 10 }),
   tree.findByLabelText('label'),
@@ -179,7 +181,7 @@ const findAllBy: Promise<ReactTestInstance[]>[] = [
   tree.findAllByDisplayValue(/View/g),
   tree.findAllByDisplayValue(/View/g, { timeout: 10, interval: 10 }),
   tree.findAllByTestId('test-id'),
-  tree.findAllByTestId(/value/, { timeout: 10, interval: 10 }),
+  tree.findAllByTestId(/test-id/, { timeout: 10, interval: 10 }),
   tree.findAllByA11yLabel('label'),
   tree.findAllByA11yLabel('label', { timeout: 10, interval: 10 }),
   tree.findAllByLabelText('label'),

typings/index.d.ts

@@ -18,7 +18,7 @@ interface GetByAPI {
   getByText: (text: string | RegExp) => ReactTestInstance;
   getByPlaceholderText: (placeholder: string | RegExp) => ReactTestInstance;
   getByDisplayValue: (value: string | RegExp) => ReactTestInstance;
-  getByTestId: (testID: string) => ReactTestInstance;
+  getByTestId: (testID: string | RegExp) => ReactTestInstance;
   getAllByTestId: (testID: string | RegExp) => Array<ReactTestInstance>;
   getAllByText: (text: string | RegExp) => Array<ReactTestInstance>;
   getAllByPlaceholderText: (
@@ -69,7 +69,7 @@ interface QueryByAPI {
     placeholder: string | RegExp
   ) => ReactTestInstance | null;
   queryByDisplayValue: (value: string | RegExp) => ReactTestInstance | null;
-  queryByTestId: (testID: string) => ReactTestInstance | null;
+  queryByTestId: (testID: string | RegExp) => ReactTestInstance | null;
   queryAllByTestId: (testID: string | RegExp) => Array<ReactTestInstance> | [];
   queryAllByText: (text: string | RegExp) => Array<ReactTestInstance> | [];
   queryAllByPlaceholderText: (
@@ -137,7 +137,7 @@ interface FindByAPI {
     value: string | RegExp,
     waitForOptions?: WaitForOptions
   ) => FindReturn;
-  findByTestId: (testID: string, waitForOptions?: WaitForOptions) => FindReturn;
+  findByTestId: (testID: string | RegExp, waitForOptions?: WaitForOptions) => FindReturn;
   findAllByText: (
     text: string | RegExp,
     waitForOptions?: WaitForOptions