From 4c81df28d88b48c5f6671d2e183cfb30723f7073 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 10:59:11 +0200
Subject: [PATCH 1/7] Replaced getByTestId with fixed version

---
 src/helpers/findByAPI.js | 4 ++--
 src/helpers/getByAPI.js  | 9 ---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/helpers/findByAPI.js b/src/helpers/findByAPI.js
index 7b773979b..ea4fb1a7a 100644
--- a/src/helpers/findByAPI.js
+++ b/src/helpers/findByAPI.js
@@ -1,7 +1,7 @@
 // @flow
 import waitForElement from '../waitForElement';
 import {
-  fixedGetByTestId,
+  getByTestId,
   getAllByTestId,
   getByText,
   getAllByText,
@@ -31,7 +31,7 @@ const makeFindQuery = <Text, Result>(
 export const findByTestId = (instance: ReactTestInstance) => (
   testId: string,
   waitForOptions: WaitForOptions = {}
-) => makeFindQuery(instance, fixedGetByTestId, testId, waitForOptions);
+) => makeFindQuery(instance, getByTestId, testId, waitForOptions);
 
 export const findAllByTestId = (instance: ReactTestInstance) => (
   testId: string,
diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index 052d3d560..cc6079607 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -149,15 +149,6 @@ export const getByProps = (instance: ReactTestInstance, warnFn?: Function) =>
   };
 
 export const getByTestId = (instance: ReactTestInstance) =>
-  function getByTestIdFn(testID: string) {
-    try {
-      return instance.findByProps({ testID });
-    } catch (error) {
-      throw new ErrorWithStack(prepareErrorMessage(error), getByTestIdFn);
-    }
-  };
-
-export const fixedGetByTestId = (instance: ReactTestInstance) =>
   function getByTestIdFn(testID: string) {
     try {
       const results = getAllByTestId(instance)(testID);

From a961937b1acbd44b56f552b9cb17bd6ce31bcda5 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 11:14:02 +0200
Subject: [PATCH 2/7] Added tests

---
 src/__tests__/getByApi.test.js | 40 ++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/__tests__/getByApi.test.js

diff --git a/src/__tests__/getByApi.test.js b/src/__tests__/getByApi.test.js
new file mode 100644
index 000000000..a7d1f3fb3
--- /dev/null
+++ b/src/__tests__/getByApi.test.js
@@ -0,0 +1,40 @@
+// @flow
+import React from 'react';
+import { View, Text, TextInput, Button } from 'react-native';
+import { render } from '..';
+
+const options = { timeout: 10 }; // Short timeout so that this test runs quickly
+
+const MyComponent = () => {
+  return <Text>My Component</Text>;
+};
+
+test('byTestId returns only native elements', () => {
+  const {
+    getByTestId,
+    getAllByTestId,
+    queryByTestId,
+    queryAllByTestId,
+  } = render(
+    <View>
+      <Text testID="text">Text</Text>
+      <TextInput testID="textInput" />
+      <View testID="view" />
+      <Button testID="button" title="Button" />
+      <MyComponent testID="myComponent" />
+    </View>
+  );
+
+  expect(getByTestId('text')).toBeTruthy();
+  expect(getByTestId('textInput')).toBeTruthy();
+  expect(getByTestId('view')).toBeTruthy();
+  expect(getByTestId('button')).toBeTruthy();
+
+  expect(getAllByTestId('text')).toHaveLength(1);
+  expect(getAllByTestId('textInput')).toHaveLength(1);
+  expect(getAllByTestId('view')).toHaveLength(1);
+  expect(getAllByTestId('button')).toHaveLength(1);
+
+  expect(queryByTestId('myComponent')).toBeFalsy();
+  expect(queryAllByTestId('myComponent')).toHaveLength(0);
+});

From 642c7bfb6b5684ee857c16f83414a7aa1af549af Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 11:14:59 +0200
Subject: [PATCH 3/7] Fixed flow-check

---
 src/__tests__/getByApi.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/__tests__/getByApi.test.js b/src/__tests__/getByApi.test.js
index a7d1f3fb3..3e1c98a75 100644
--- a/src/__tests__/getByApi.test.js
+++ b/src/__tests__/getByApi.test.js
@@ -20,7 +20,7 @@ test('byTestId returns only native elements', () => {
       <Text testID="text">Text</Text>
       <TextInput testID="textInput" />
       <View testID="view" />
-      <Button testID="button" title="Button" />
+      <Button testID="button" title="Button" onPress={jest.fn()} />
       <MyComponent testID="myComponent" />
     </View>
   );

From ac75f808f7fc990de28499ef91b8a805ce89f9ed Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 11:17:21 +0200
Subject: [PATCH 4/7] Updated docs

---
 website/docs/Queries.md | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/website/docs/Queries.md b/website/docs/Queries.md
index ab1465f1a..3a7af6774 100644
--- a/website/docs/Queries.md
+++ b/website/docs/Queries.md
@@ -32,9 +32,8 @@ title: Queries
 
 `findAllBy` queries return a promise which resolves to an array when any matching elements are found. The promise is rejected if no elements match after a default timeout of 4500ms.
 
-
 :::info
-`findBy` and `findAllBy` queries accept optional `waitForOptions` object argument which can contain `timeout` and `interval` properies which have the same meaning as respective arguments to [`waitForElement`](https://callstack.github.io/react-native-testing-library/docs/api#waitforelement) function. 
+`findBy` and `findAllBy` queries accept optional `waitForOptions` object argument which can contain `timeout` and `interval` properies which have the same meaning as respective arguments to [`waitForElement`](https://callstack.github.io/react-native-testing-library/docs/api#waitforelement) function.
 :::
 
 ## Queries
@@ -105,11 +104,7 @@ const element = getByTestId('unique-id');
 ```
 
 :::caution
-Please be mindful when using these API and **treat it as an escape hatch**. Your users can't interact with `testID` anyhow, so you may end up writing tests that provide false sense of security. Favor text and accessibility queries instead. 
-:::
-
-:::danger
-Current implementation of `getByTestId` and `queryByTestId` has a serious flaw, which results in finding more IDs than there really would be present in native React host components. Fixing it may break some of your tests so we'll do it in next major release (v2). As a temporary workaround, please use `getAllByTestId('your-id')[0]` or `queryAllByTestId('your-id')[0]` or migrate off testing with testID, which is considered to be an escape hatch.
+Please be mindful when using these API and **treat it as an escape hatch**. Your users can't interact with `testID` anyhow, so you may end up writing tests that provide false sense of security. Favor text and accessibility queries instead.
 :::
 
 ### `ByA11yLabel`, `ByAccessibilityLabel`

From 0c8a49ade8d379c3e4aeb993aeec221dd1e920c8 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 11:19:27 +0200
Subject: [PATCH 5/7] Fixed lint error

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

diff --git a/src/__tests__/getByApi.test.js b/src/__tests__/getByApi.test.js
index 3e1c98a75..a9e4ed781 100644
--- a/src/__tests__/getByApi.test.js
+++ b/src/__tests__/getByApi.test.js
@@ -3,8 +3,6 @@ import React from 'react';
 import { View, Text, TextInput, Button } from 'react-native';
 import { render } from '..';
 
-const options = { timeout: 10 }; // Short timeout so that this test runs quickly
-
 const MyComponent = () => {
   return <Text>My Component</Text>;
 };

From 3dc9e1be61b637b4a09378ab5d06b10ee8d2389a Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 12:18:34 +0200
Subject: [PATCH 6/7] Used getByTestId in unit tests instead of queryByTestId

---
 src/__tests__/getByApi.test.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/__tests__/getByApi.test.js b/src/__tests__/getByApi.test.js
index a9e4ed781..e839f7139 100644
--- a/src/__tests__/getByApi.test.js
+++ b/src/__tests__/getByApi.test.js
@@ -7,13 +7,8 @@ const MyComponent = () => {
   return <Text>My Component</Text>;
 };
 
-test('byTestId returns only native elements', () => {
-  const {
-    getByTestId,
-    getAllByTestId,
-    queryByTestId,
-    queryAllByTestId,
-  } = render(
+test('getByTestId returns only native elements', () => {
+  const { getByTestId, getAllByTestId } = render(
     <View>
       <Text testID="text">Text</Text>
       <TextInput testID="textInput" />
@@ -33,6 +28,6 @@ test('byTestId returns only native elements', () => {
   expect(getAllByTestId('view')).toHaveLength(1);
   expect(getAllByTestId('button')).toHaveLength(1);
 
-  expect(queryByTestId('myComponent')).toBeFalsy();
-  expect(queryAllByTestId('myComponent')).toHaveLength(0);
+  expect(() => getByTestId('myComponent')).toThrowError();
+  expect(() => getAllByTestId('myComponent')).toThrowError();
 });

From 13e7fd26a5651cb029d20608c68295cd325e4c6f Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 12:54:06 +0200
Subject: [PATCH 7/7] Updated negative checks in tests

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

diff --git a/src/__tests__/getByApi.test.js b/src/__tests__/getByApi.test.js
index e839f7139..db66b1c69 100644
--- a/src/__tests__/getByApi.test.js
+++ b/src/__tests__/getByApi.test.js
@@ -28,6 +28,10 @@ test('getByTestId returns only native elements', () => {
   expect(getAllByTestId('view')).toHaveLength(1);
   expect(getAllByTestId('button')).toHaveLength(1);
 
-  expect(() => getByTestId('myComponent')).toThrowError();
-  expect(() => getAllByTestId('myComponent')).toThrowError();
+  expect(() => getByTestId('myComponent')).toThrowError(
+    'No instances found with testID: myComponent'
+  );
+  expect(() => getAllByTestId('myComponent')).toThrowError(
+    'No instances found with testID: myComponent'
+  );
 });