From 88dbed3a8bc7ea93894f45e2031818156e1cbff5 Mon Sep 17 00:00:00 2001
From: acatalina <accarrasco@gmail.com>
Date: Mon, 7 Sep 2020 09:09:26 +0100
Subject: [PATCH 1/6] getAllByTestId supports a regex matcher

---
 src/__tests__/getByApi.test.js | 14 ++++++++++++++
 src/helpers/getByAPI.js        | 14 ++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/__tests__/getByApi.test.js b/src/__tests__/getByApi.test.js
index db66b1c69..d39836c6e 100644
--- a/src/__tests__/getByApi.test.js
+++ b/src/__tests__/getByApi.test.js
@@ -35,3 +35,17 @@ test('getByTestId returns only native elements', () => {
     'No instances found with testID: myComponent'
   );
 });
+
+test('getAllByTestId supports a regex matcher', () => {
+  const { getAllByTestId } = render(
+    <View>
+      <Text testID="text">Text</Text>
+      <TextInput testID="textInput" />
+      <View testID="view" />
+      <Button testID="button" title="Button" onPress={jest.fn()} />
+      <MyComponent testID="myComponent" />
+    </View>
+  );
+
+  expect(getAllByTestId(/text/)).toHaveLength(2);
+});
diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index 18409d052..12722641e 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -89,6 +89,16 @@ const getTextInputNodeByDisplayValue = (node, value) => {
   }
 };
 
+const getNodeByTestId = (node, testID) => {
+  try {
+    return typeof testID === 'string'
+      ? testID === node.props.testID
+      : testID.test(node.props.testID);
+  } catch (error) {
+    throw createLibraryNotSupportedError(error);
+  }
+};
+
 export const getByText = (instance: ReactTestInstance) =>
   function getByTextFn(text: string | RegExp) {
     try {
@@ -183,9 +193,9 @@ export const getAllByDisplayValue = (instance: ReactTestInstance) =>
   };
 
 export const getAllByTestId = (instance: ReactTestInstance) =>
-  function getAllByTestIdFn(testID: string): ReactTestInstance[] {
+  function getAllByTestIdFn(testID: string | RegExp): ReactTestInstance[] {
     const results = instance
-      .findAllByProps({ testID })
+      .findAll((node) => getNodeByTestId(node, testID))
       .filter((element) => typeof element.type === 'string');
 
     if (results.length === 0) {

From 46b556311d8f9d991a5d5e2dc706e9f030468a9f Mon Sep 17 00:00:00 2001
From: acatalina <accarrasco@gmail.com>
Date: Mon, 7 Sep 2020 09:09:38 +0100
Subject: [PATCH 2/6] update typings

---
 src/helpers/findByAPI.js         | 2 +-
 src/helpers/queryByAPI.js        | 2 +-
 typings/__tests__/index.test.tsx | 4 +++-
 typings/index.d.ts               | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/helpers/findByAPI.js b/src/helpers/findByAPI.js
index 6234a1182..d2070ea20 100644
--- a/src/helpers/findByAPI.js
+++ b/src/helpers/findByAPI.js
@@ -26,7 +26,7 @@ export const findByTestId = (instance: ReactTestInstance) => (
 ) => makeFindQuery(instance, getByTestId, testId, waitForOptions);
 
 export const findAllByTestId = (instance: ReactTestInstance) => (
-  testId: string,
+  testId: string | RegExp,
   waitForOptions: WaitForOptions = {}
 ) => makeFindQuery(instance, getAllByTestId, testId, waitForOptions);
 
diff --git a/src/helpers/queryByAPI.js b/src/helpers/queryByAPI.js
index fe1076e28..e374bb06d 100644
--- a/src/helpers/queryByAPI.js
+++ b/src/helpers/queryByAPI.js
@@ -87,7 +87,7 @@ export const queryAllByDisplayValue = (instance: ReactTestInstance) => (
 };
 
 export const queryAllByTestId = (instance: ReactTestInstance) => (
-  testID: string
+  testID: string | RegExp
 ) => {
   try {
     return getAllByTestId(instance)(testID);
diff --git a/typings/__tests__/index.test.tsx b/typings/__tests__/index.test.tsx
index 45d118a01..1744b388a 100644
--- a/typings/__tests__/index.test.tsx
+++ b/typings/__tests__/index.test.tsx
@@ -64,6 +64,7 @@ const getAllBy: ReactTestInstance[][] = [
   tree.getAllByDisplayValue('my value'),
   tree.getAllByDisplayValue(/value/g),
   tree.getAllByTestId('test-id'),
+  tree.getAllByTestId(/value/g),
   tree.getAllByA11yLabel('label'),
   tree.getAllByLabelText('label'),
   tree.getAllByA11yHint('label'),
@@ -111,6 +112,7 @@ const queryAllBy: ReactTestInstance[][] = [
   tree.queryAllByDisplayValue('my value'),
   tree.queryAllByDisplayValue(/value/g),
   tree.queryAllByTestId('test-id'),
+  tree.queryAllByTestId(/value/),
   tree.queryAllByA11yLabel('label'),
   tree.queryAllByLabelText('label'),
   tree.queryAllByA11yHint('label'),
@@ -177,7 +179,7 @@ const findAllBy: Promise<ReactTestInstance[]>[] = [
   tree.findAllByDisplayValue(/View/g),
   tree.findAllByDisplayValue(/View/g, { timeout: 10, interval: 10 }),
   tree.findAllByTestId('test-id'),
-  tree.findAllByTestId('test-id', { timeout: 10, interval: 10 }),
+  tree.findAllByTestId(/value/, { timeout: 10, interval: 10 }),
   tree.findAllByA11yLabel('label'),
   tree.findAllByA11yLabel('label', { timeout: 10, interval: 10 }),
   tree.findAllByLabelText('label'),
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 074a178aa..83b03ec74 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -19,7 +19,7 @@ interface GetByAPI {
   getByPlaceholderText: (placeholder: string | RegExp) => ReactTestInstance;
   getByDisplayValue: (value: string | RegExp) => ReactTestInstance;
   getByTestId: (testID: string) => ReactTestInstance;
-  getAllByTestId: (testID: string) => Array<ReactTestInstance>;
+  getAllByTestId: (testID: string | RegExp) => Array<ReactTestInstance>;
   getAllByText: (text: string | RegExp) => Array<ReactTestInstance>;
   getAllByPlaceholderText: (
     placeholder: string | RegExp
@@ -70,7 +70,7 @@ interface QueryByAPI {
   ) => ReactTestInstance | null;
   queryByDisplayValue: (value: string | RegExp) => ReactTestInstance | null;
   queryByTestId: (testID: string) => ReactTestInstance | null;
-  queryAllByTestId: (testID: string) => Array<ReactTestInstance> | [];
+  queryAllByTestId: (testID: string | RegExp) => Array<ReactTestInstance> | [];
   queryAllByText: (text: string | RegExp) => Array<ReactTestInstance> | [];
   queryAllByPlaceholderText: (
     placeholder: string | RegExp
@@ -151,7 +151,7 @@ interface FindByAPI {
     waitForOptions?: WaitForOptions
   ) => FindAllReturn;
   findAllByTestId: (
-    testID: string,
+    testID: string | RegExp,
     waitForOptions?: WaitForOptions
   ) => FindAllReturn;
 }

From eee4b718981fd6630139ec6843424d3a96f5251a Mon Sep 17 00:00:00 2001
From: acatalina <accarrasco@gmail.com>
Date: Mon, 7 Sep 2020 09:20:04 +0100
Subject: [PATCH 3/6] docs: update

---
 website/docs/Queries.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/Queries.md b/website/docs/Queries.md
index ded8da31c..43dfcdb82 100644
--- a/website/docs/Queries.md
+++ b/website/docs/Queries.md
@@ -98,7 +98,7 @@ const element = getByDisplayValue('username');
 
 > getByTestId, getAllByTestId, queryByTestId, queryAllByTestId, findByTestId, findAllByTestId
 
-Returns a `ReactTestInstance` with matching `testID` prop.
+Returns a `ReactTestInstance` with matching `testID` prop. `testID` – may be a string or a regular expression.
 
 ```jsx
 import { render } from '@testing-library/react-native';

From b4bf2899d0c72e1a1b109de1b1a310c8b8971735 Mon Sep 17 00:00:00 2001
From: acatalina <accarrasco@gmail.com>
Date: Mon, 7 Sep 2020 09:25:20 +0100
Subject: [PATCH 4/6] refactor types

---
 src/helpers/findByAPI.js         | 2 +-
 src/helpers/getByAPI.js          | 2 +-
 src/helpers/queryByAPI.js        | 2 +-
 typings/__tests__/index.test.tsx | 8 +++++---
 typings/index.d.ts               | 6 +++---
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/helpers/findByAPI.js b/src/helpers/findByAPI.js
index d2070ea20..7cb8b4699 100644
--- a/src/helpers/findByAPI.js
+++ b/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);
 
diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index 12722641e..cabd30246 100644
--- a/src/helpers/getByAPI.js
+++ b/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) {
diff --git a/src/helpers/queryByAPI.js b/src/helpers/queryByAPI.js
index e374bb06d..3d5ce8488 100644
--- a/src/helpers/queryByAPI.js
+++ b/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) {
diff --git a/typings/__tests__/index.test.tsx b/typings/__tests__/index.test.tsx
index 1744b388a..5084ddf47 100644
--- a/typings/__tests__/index.test.tsx
+++ b/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'),
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 83b03ec74..898e504da 100644
--- a/typings/index.d.ts
+++ b/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

From 3ee41995c6fae62f93e9d20bcb1038a663d799fe Mon Sep 17 00:00:00 2001
From: acatalina <accarrasco@gmail.com>
Date: Mon, 7 Sep 2020 09:26:53 +0100
Subject: [PATCH 5/6] refactor. remove unnecessary try/catch

---
 src/helpers/getByAPI.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index cabd30246..844820125 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -90,13 +90,9 @@ const getTextInputNodeByDisplayValue = (node, value) => {
 };
 
 const getNodeByTestId = (node, testID) => {
-  try {
-    return typeof testID === 'string'
-      ? testID === node.props.testID
-      : testID.test(node.props.testID);
-  } catch (error) {
-    throw createLibraryNotSupportedError(error);
-  }
+  return typeof testID === 'string'
+    ? testID === node.props.testID
+    : testID.test(node.props.testID);
 };
 
 export const getByText = (instance: ReactTestInstance) =>

From 337b5c634169420600a649b85743783e7fb33daa Mon Sep 17 00:00:00 2001
From: acatalina <accarrasco@gmail.com>
Date: Mon, 7 Sep 2020 09:33:04 +0100
Subject: [PATCH 6/6] refactor test assertions

---
 src/__tests__/getByApi.test.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/__tests__/getByApi.test.js b/src/__tests__/getByApi.test.js
index d39836c6e..a2b2637d1 100644
--- a/src/__tests__/getByApi.test.js
+++ b/src/__tests__/getByApi.test.js
@@ -36,8 +36,8 @@ test('getByTestId returns only native elements', () => {
   );
 });
 
-test('getAllByTestId supports a regex matcher', () => {
-  const { getAllByTestId } = render(
+test('supports a regex matcher', () => {
+  const { getByTestId, getAllByTestId } = render(
     <View>
       <Text testID="text">Text</Text>
       <TextInput testID="textInput" />
@@ -47,5 +47,6 @@ test('getAllByTestId supports a regex matcher', () => {
     </View>
   );
 
+  expect(getByTestId(/view/)).toBeTruthy();
   expect(getAllByTestId(/text/)).toHaveLength(2);
 });