From d9d14b3a526839a4a66c7c9fe53ab08269e50056 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Thu, 14 May 2020 15:03:05 +0200
Subject: [PATCH 01/16] Added @testing-library/jest-native to devDependencies

---
 package.json |  1 +
 yarn.lock    | 48 +++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 363709620..87d62ef4b 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "@babel/core": "^7.9.0",
     "@callstack/eslint-config": "^9.1.0",
     "@release-it/conventional-changelog": "^1.1.0",
+    "@testing-library/jest-native": "^3.1.0",
     "@types/react": "^16.9.34",
     "@types/react-native": "^0.62.2",
     "@types/react-test-renderer": "^16.9.2",
diff --git a/yarn.lock b/yarn.lock
index 03b191a5d..a20bfc4fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1352,6 +1352,18 @@
   dependencies:
     defer-to-connect "^2.0.0"
 
+"@testing-library/jest-native@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-native/-/jest-native-3.1.0.tgz#414c834dfb524ca82b86509d5479e365d4d5bbec"
+  integrity sha512-MZdsTsD6xrP5V0FTz2gVPG00ZMoKn4WniRitUH40zZTQ0DfMa5CVDpkAd5ed6qX1coDwS8vSCZS/JGMIDYjRQQ==
+  dependencies:
+    chalk "^2.4.1"
+    jest-diff "^24.0.0"
+    jest-matcher-utils "^24.0.0"
+    pretty-format "^24.0.0"
+    ramda "^0.26.1"
+    redent "^2.0.0"
+
 "@types/babel__core@^7.1.7":
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
@@ -3131,6 +3143,11 @@ detect-repo-changelog@1.0.1:
     lodash.find "^4.6.0"
     pify "^2.3.0"
 
+diff-sequences@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
+  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
+
 diff-sequences@^26.0.0:
   version "26.0.0"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6"
@@ -5010,6 +5027,16 @@ jest-config@^26.0.1:
     micromatch "^4.0.2"
     pretty-format "^26.0.1"
 
+jest-diff@^24.0.0, jest-diff@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
+  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
+  dependencies:
+    chalk "^2.0.1"
+    diff-sequences "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
+
 jest-diff@^26.0.1:
   version "26.0.1"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.0.1.tgz#c44ab3cdd5977d466de69c46929e0e57f89aa1de"
@@ -5141,6 +5168,16 @@ jest-leak-detector@^26.0.1:
     jest-get-type "^26.0.0"
     pretty-format "^26.0.1"
 
+jest-matcher-utils@^24.0.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
+  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
+  dependencies:
+    chalk "^2.0.1"
+    jest-diff "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
+
 jest-matcher-utils@^26.0.1:
   version "26.0.1"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.0.1.tgz#12e1fc386fe4f14678f4cc8dbd5ba75a58092911"
@@ -7155,7 +7192,7 @@ prettier@^1.19.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-pretty-format@^24.7.0, pretty-format@^24.9.0:
+pretty-format@^24.0.0, pretty-format@^24.7.0, pretty-format@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
   integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
@@ -7281,6 +7318,11 @@ quick-lru@^1.0.0:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
   integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
 
+ramda@^0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
+  integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
+
 range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
@@ -8992,7 +9034,7 @@ uuid@7.0.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.1.tgz#95ed6ff3d8c881cbf85f0f05cc3915ef994818ef"
   integrity sha512-yqjRXZzSJm9Dbl84H2VDHpM3zMjzSJQ+hn6C4zqd5ilW+7P4ZmLEEqwho9LjP+tGuZlF4xrHQXT0h9QZUS/pWA==
 
-uuid@7.0.3:
+uuid@7.0.3, uuid@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
   integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
@@ -9112,7 +9154,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.9, which@^1.3.1:
+which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==

From c8ce74905baafc6a840e39928ab2e593a0ae0aea Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Thu, 14 May 2020 16:10:11 +0200
Subject: [PATCH 02/16] Tests for jest-native matchers

---
 package.json                      |  2 +-
 src/__tests__/jest-native.test.js | 94 +++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 src/__tests__/jest-native.test.js

diff --git a/package.json b/package.json
index 87d62ef4b..5739dbfab 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@babel/core": "^7.9.0",
     "@callstack/eslint-config": "^9.1.0",
     "@release-it/conventional-changelog": "^1.1.0",
-    "@testing-library/jest-native": "^3.1.0",
+    "@testing-library/jest-native": "~3.1.0",
     "@types/react": "^16.9.34",
     "@types/react-native": "^0.62.2",
     "@types/react-test-renderer": "^16.9.2",
diff --git a/src/__tests__/jest-native.test.js b/src/__tests__/jest-native.test.js
new file mode 100644
index 000000000..c6ed89854
--- /dev/null
+++ b/src/__tests__/jest-native.test.js
@@ -0,0 +1,94 @@
+// @flow
+/* eslint-disable react-native/no-color-literals */
+import React from 'react';
+import { StyleSheet, View, Button, Text } from 'react-native';
+import { render } from '..';
+import '@testing-library/jest-native/extend-expect';
+
+const style = StyleSheet.create({
+  style1: {
+    color: 'red',
+    backgroundColor: 'green',
+  },
+});
+
+test('jest-native matchers work correctly', () => {
+  const { getByText, getByA11yHint } = render(
+    <View>
+      <Button title="Enabled Button" onPress={jest.fn()} />
+      <Button title="Disabled Button" disabled={true} onPress={jest.fn()} />
+      <Text accessibilityHint="Empty Text" style={style.style1} />
+      <Text accessibilityHint="Not Empty Text">Not empty</Text>
+      <View accessibilityHint="Empty View" />
+      <View accessibilityHint="Not Empty View">
+        <Text />
+      </View>
+      <View accessibilityHint="Container View">
+        <View accessibilityHint="First-Level Child">
+          <Text>Second-Level Child</Text>
+        </View>
+      </View>
+    </View>
+  );
+
+  expect(getByText('Enabled Button')).toBeEnabled();
+  expect(getByText('Disabled Button')).not.toBeEnabled();
+
+  expect(getByText('Disabled Button')).toBeDisabled();
+  expect(getByText('Enabled Button')).not.toBeDisabled();
+
+  expect(getByA11yHint('Empty Text')).toBeEmpty();
+  expect(getByA11yHint('Empty View')).toBeEmpty();
+  expect(getByA11yHint('Not Empty Text')).not.toBeEmpty();
+  expect(getByA11yHint('Not Empty View')).not.toBeEmpty();
+
+  expect(getByA11yHint('Container View')).toContainElement(
+    getByA11yHint('First-Level Child')
+  );
+  expect(getByA11yHint('Container View')).toContainElement(
+    getByText('Second-Level Child')
+  );
+  expect(getByA11yHint('Container View')).not.toContainElement(
+    getByText('Enabled Button')
+  );
+
+  expect(getByA11yHint('Not Empty Text')).toHaveTextContent('Not empty');
+  expect(getByA11yHint('Not Empty Text')).toHaveTextContent(/Not empty/);
+  expect(getByA11yHint('Not Empty Text')).not.toHaveTextContent('Is empty');
+
+  expect(getByA11yHint('Empty Text')).toHaveStyle({ color: 'red' });
+  expect(getByA11yHint('Empty Text')).toHaveStyle({
+    color: 'red',
+    backgroundColor: 'green',
+  });
+  expect(getByA11yHint('Empty Text')).not.toHaveStyle({ color: 'green' });
+  expect(getByA11yHint('Empty Text')).not.toHaveStyle({
+    color: 'green',
+    backgroundColor: 'green',
+  });
+});
+
+test.skip('currently failing jest-native matchers tests', () => {
+  const { getByText, getByA11yHint } = render(
+    <View>
+      <Button title="Enabled Button" onPress={jest.fn()} />
+      <Button title="Disabled Button" disabled={true} onPress={jest.fn()} />
+      <Text accessibilityHint="Empty Text" style={style.style1} />
+      <Text accessibilityHint="Not Empty Text">Not empty</Text>
+      <View accessibilityHint="Empty View" />
+      <View accessibilityHint="Not Empty View">
+        <Text />
+      </View>
+      <View accessibilityHint="Container View">
+        <View accessibilityHint="First-Level Child">
+          <Text>Second-Level Child</Text>
+        </View>
+      </View>
+    </View>
+  );
+
+  expect(getByText('Enabled Button')).toHaveProp('title');
+  expect(getByText('Enabled Button')).toHaveProp('title', 'Enabled Button');
+  expect(getByText('Enabled Button')).not.toHaveProp('title', 'Button');
+  expect(getByA11yHint('Not Empty Text')).toHaveProp('text', 'Not empty');
+});

From 0bf62f8f1bf5cea436d2be9d77e83172271badd4 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Fri, 15 May 2020 09:01:01 +0200
Subject: [PATCH 03/16] Added @testing-library/jest-native install info

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index b95b05d41..2462afcb3 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,18 @@ yarn add --dev react-native-testing-library
 
 This library has a peerDependencies listing for `react-test-renderer` and, of course, `react`. Make sure to install them too!
 
+### Additional jest matchers
+
+In order to use addtional React Native-specific jest matchers from [@testing-library/jest-native](https://github.com/testing-library/jest-native) package add following line to your jest.config.js:
+
+```js
+module.exports = {
+  setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect']
+}
+```
+
+### Flow
+
 Note for [Flow](https://flow.org) users – you'll also need to install typings for `react-test-renderer`:
 
 ```sh

From 2cee366438226bb91780cd2a4ccd95f913398de3 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Fri, 15 May 2020 12:17:23 +0200
Subject: [PATCH 04/16] Update README.md

---
 README.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2462afcb3..2852ea0f1 100644
--- a/README.md
+++ b/README.md
@@ -64,15 +64,33 @@ You can find the source of `QuestionsBoard` component and this example [here](ht
 
 Open a Terminal in your project's folder and run:
 
+#### Using `yarn`
 ```sh
 yarn add --dev react-native-testing-library
 ```
 
+#### Using `npm`
+```sh
+npm install --save-dev react-native-testing-library
+```
+
 This library has a peerDependencies listing for `react-test-renderer` and, of course, `react`. Make sure to install them too!
 
 ### Additional jest matchers
 
-In order to use addtional React Native-specific jest matchers from [@testing-library/jest-native](https://github.com/testing-library/jest-native) package add following line to your jest.config.js:
+In order to use addtional React Native-specific jest matchers from [@testing-library/jest-native](https://github.com/testing-library/jest-native) add it to your project:
+
+#### Using `yarn`
+```sh
+yarn add --dev @testing-library/jest-native
+```
+
+#### Using `npm`
+```sh
+npm install --save-dev @testing-library/jest-native
+```
+
+Then add following line to your jest.config.js:
 
 ```js
 module.exports = {

From 596dca1984c71a1c8f8a63a780f8bfae8c6c3391 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Fri, 15 May 2020 12:27:11 +0200
Subject: [PATCH 05/16] Update GettingStarted.md

---
 website/docs/GettingStarted.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/website/docs/GettingStarted.md b/website/docs/GettingStarted.md
index c22f6c17c..51f902b4d 100644
--- a/website/docs/GettingStarted.md
+++ b/website/docs/GettingStarted.md
@@ -50,10 +50,39 @@ You can find the source of `QuestionsBoard` component and this example [here](ht
 
 Open a Terminal in your project's folder and run:
 
+#### Using `yarn`
 ```sh
 yarn add --dev react-native-testing-library
 ```
 
+#### Using `npm`
+```sh
+npm install --save-dev react-native-testing-library
+```
+
 This library has a peerDependencies listing for `react-test-renderer` and, of course, `react`. Make sure to install them too!
 
 As you may have noticed, it's not tied to React Native at all – you can safely use it in your React components if you feel like not interacting directly with DOM.
+
+### Additional jest matchers
+
+In order to use addtional React Native-specific jest matchers from [@testing-library/jest-native](https://github.com/testing-library/jest-native) add it to your project:
+
+#### Using `yarn`
+```sh
+yarn add --dev @testing-library/jest-native
+```
+
+#### Using `npm`
+```sh
+npm install --save-dev @testing-library/jest-native
+```
+
+Then add following line to your jest.config.js:
+
+```js
+module.exports = {
+  setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect']
+}
+```
+

From 5434a9a3e0370bafae0acb4b84f696c00b9035c0 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Fri, 15 May 2020 09:52:33 +0200
Subject: [PATCH 06/16] feat: add `findBy*` queries (#304)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Basic async findBy queries

* Refactored findBy queries to be built with makeFindQuery

* findBy queries for A11y selectors

* Custom findByTestId implementation that avoids current getByTestId issues

* Fixed prettier issue

* Updates Queries.md with findBy queries

* Trying to fix test timeout error appearing only on CI

* Code review changes

* Added typescript types & tests

* prettier did reformat some code arround

* Removed export of GetByAPI, QueryByAPI and FindByAPI interfaces in TS

* Reversed prettier run on typings

* Added overlapping pieces with `within` operator

* Small cleanup

* Update website/docs/Queries.md

* Moved async/await tests to the end of test methods

Co-authored-by: Michał Pierzchała <thymikee@gmail.com>
---
 src/__tests__/a11yAPI.test.js    | 163 ++++++++++++++++++----
 src/__tests__/findByApi.test.js  |  58 ++++++++
 src/__tests__/within.test.js     |  24 +++-
 src/helpers/a11yAPI.js           |  27 ++++
 src/helpers/findByAPI.js         |  80 +++++++++++
 src/helpers/getByAPI.js          |  19 +++
 src/helpers/makeQuery.js         |  22 +++
 src/render.js                    |   2 +
 src/within.js                    |   2 +
 typings/__tests__/index.test.tsx | 229 +++++++++++++++++--------------
 typings/index.d.ts               |  93 ++++++++++++-
 website/docs/API.md              |  11 +-
 website/docs/Queries.md          |  41 ++++--
 13 files changed, 609 insertions(+), 162 deletions(-)
 create mode 100644 src/__tests__/findByApi.test.js
 create mode 100644 src/helpers/findByAPI.js

diff --git a/src/__tests__/a11yAPI.test.js b/src/__tests__/a11yAPI.test.js
index dad5b1b83..a5cebd7e9 100644
--- a/src/__tests__/a11yAPI.test.js
+++ b/src/__tests__/a11yAPI.test.js
@@ -18,6 +18,8 @@ const Typography = ({ children, ...rest }: any) => {
   return <Text {...rest}>{children}</Text>;
 };
 
+const waitForOptions = { timeout: 10 };
+
 class Button extends React.Component<any> {
   render() {
     return (
@@ -62,74 +64,133 @@ function Section() {
   );
 }
 
-test('getByA11yLabel, queryByA11yLabel', () => {
-  const { getByA11yLabel, queryByA11yLabel } = render(<Section />);
+test('getByA11yLabel, queryByA11yLabel, findByA11yLabel', async () => {
+  const { getByA11yLabel, queryByA11yLabel, findByA11yLabel } = render(
+    <Section />
+  );
 
   expect(getByA11yLabel(BUTTON_LABEL).props.accessibilityLabel).toEqual(
     BUTTON_LABEL
   );
   const button = queryByA11yLabel(/button/g);
   expect(button && button.props.accessibilityLabel).toEqual(BUTTON_LABEL);
+
   expect(() => getByA11yLabel(NO_MATCHES_TEXT)).toThrow(NO_INSTANCES_FOUND);
   expect(queryByA11yLabel(NO_MATCHES_TEXT)).toBeNull();
 
   expect(() => getByA11yLabel(TEXT_LABEL)).toThrow(FOUND_TWO_INSTANCES);
   expect(() => queryByA11yLabel(TEXT_LABEL)).toThrow(FOUND_TWO_INSTANCES);
+
+  const asyncButton = await findByA11yLabel(BUTTON_LABEL);
+  expect(asyncButton.props.accessibilityLabel).toEqual(BUTTON_LABEL);
+  await expect(
+    findByA11yLabel(NO_MATCHES_TEXT, waitForOptions)
+  ).rejects.toThrow(NO_INSTANCES_FOUND);
+
+  await expect(findByA11yLabel(TEXT_LABEL, waitForOptions)).rejects.toThrow(
+    FOUND_TWO_INSTANCES
+  );
 });
 
-test('getAllByA11yLabel, queryAllByA11yLabel', () => {
-  const { getAllByA11yLabel, queryAllByA11yLabel } = render(<Section />);
+test('getAllByA11yLabel, queryAllByA11yLabel', async () => {
+  const { getAllByA11yLabel, queryAllByA11yLabel, findAllByA11yLabel } = render(
+    <Section />
+  );
 
   expect(getAllByA11yLabel(TEXT_LABEL)).toHaveLength(2);
   expect(queryAllByA11yLabel(/cool/g)).toHaveLength(3);
+
   expect(() => getAllByA11yLabel(NO_MATCHES_TEXT)).toThrow(NO_INSTANCES_FOUND);
   expect(queryAllByA11yLabel(NO_MATCHES_TEXT)).toEqual([]);
+
+  await expect(findAllByA11yLabel(TEXT_LABEL)).resolves.toHaveLength(2);
+  await expect(findAllByA11yLabel(NO_MATCHES_TEXT)).rejects.toThrow(
+    NO_INSTANCES_FOUND
+  );
 });
 
-test('getByA11yHint, queryByA11yHint', () => {
-  const { getByA11yHint, queryByA11yHint } = render(<Section />);
+test('getByA11yHint, queryByA11yHint, findByA11yHint', async () => {
+  const { getByA11yHint, queryByA11yHint, findByA11yHint } = render(
+    <Section />
+  );
 
   expect(getByA11yHint(BUTTON_HINT).props.accessibilityHint).toEqual(
     BUTTON_HINT
   );
   const button = queryByA11yHint(/button/g);
   expect(button && button.props.accessibilityHint).toEqual(BUTTON_HINT);
+
   expect(() => getByA11yHint(NO_MATCHES_TEXT)).toThrow(NO_INSTANCES_FOUND);
   expect(queryByA11yHint(NO_MATCHES_TEXT)).toBeNull();
 
   expect(() => getByA11yHint(TEXT_HINT)).toThrow(FOUND_TWO_INSTANCES);
   expect(() => queryByA11yHint(TEXT_HINT)).toThrow(FOUND_TWO_INSTANCES);
+
+  const asyncButton = await findByA11yHint(BUTTON_HINT);
+  expect(asyncButton.props.accessibilityHint).toEqual(BUTTON_HINT);
+  await expect(findByA11yHint(NO_MATCHES_TEXT, waitForOptions)).rejects.toThrow(
+    NO_INSTANCES_FOUND
+  );
+  await expect(findByA11yHint(TEXT_HINT, waitForOptions)).rejects.toThrow(
+    FOUND_TWO_INSTANCES
+  );
 });
 
-test('getAllByA11yHint, queryAllByA11yHint', () => {
-  const { getAllByA11yHint, queryAllByA11yHint } = render(<Section />);
+test('getAllByA11yHint, queryAllByA11yHint', async () => {
+  const { getAllByA11yHint, queryAllByA11yHint, findAllByA11yHint } = render(
+    <Section />
+  );
 
   expect(getAllByA11yHint(TEXT_HINT)).toHaveLength(2);
   expect(queryAllByA11yHint(/static/g)).toHaveLength(2);
+
   expect(() => getAllByA11yHint(NO_MATCHES_TEXT)).toThrow(NO_INSTANCES_FOUND);
   expect(queryAllByA11yHint(NO_MATCHES_TEXT)).toEqual([]);
+
+  await expect(findAllByA11yHint(TEXT_HINT)).resolves.toHaveLength(2);
+  await expect(findAllByA11yHint(NO_MATCHES_TEXT)).rejects.toThrow(
+    NO_INSTANCES_FOUND
+  );
 });
 
-test('getByA11yRole, queryByA11yRole', () => {
-  const { getByA11yRole, queryByA11yRole } = render(<Section />);
+test('getByA11yRole, queryByA11yRole, findByA11yRole', async () => {
+  const { getByA11yRole, queryByA11yRole, findByA11yRole } = render(
+    <Section />
+  );
 
   expect(getByA11yRole('button').props.accessibilityRole).toEqual('button');
   const button = queryByA11yRole(/button/g);
   expect(button && button.props.accessibilityRole).toEqual('button');
+
   expect(() => getByA11yRole(NO_MATCHES_TEXT)).toThrow(NO_INSTANCES_FOUND);
   expect(queryByA11yRole(NO_MATCHES_TEXT)).toBeNull();
 
   expect(() => getByA11yRole('link')).toThrow(FOUND_TWO_INSTANCES);
   expect(() => queryByA11yRole('link')).toThrow(FOUND_TWO_INSTANCES);
+
+  const asyncButton = await findByA11yRole('button');
+  expect(asyncButton.props.accessibilityRole).toEqual('button');
+  await expect(findByA11yRole(NO_MATCHES_TEXT, waitForOptions)).rejects.toThrow(
+    NO_INSTANCES_FOUND
+  );
+  await expect(findByA11yRole('link')).rejects.toThrow(FOUND_TWO_INSTANCES);
 });
 
-test('getAllByA11yRole, queryAllByA11yRole', () => {
-  const { getAllByA11yRole, queryAllByA11yRole } = render(<Section />);
+test('getAllByA11yRole, queryAllByA11yRole, findAllByA11yRole', async () => {
+  const { getAllByA11yRole, queryAllByA11yRole, findAllByA11yRole } = render(
+    <Section />
+  );
 
   expect(getAllByA11yRole('link')).toHaveLength(2);
   expect(queryAllByA11yRole(/ink/g)).toHaveLength(2);
+
   expect(() => getAllByA11yRole(NO_MATCHES_TEXT)).toThrow(NO_INSTANCES_FOUND);
   expect(queryAllByA11yRole(NO_MATCHES_TEXT)).toEqual([]);
+
+  await expect(findAllByA11yRole('link')).resolves.toHaveLength(2);
+  await expect(
+    findAllByA11yRole(NO_MATCHES_TEXT, waitForOptions)
+  ).rejects.toThrow(NO_INSTANCES_FOUND);
 });
 
 // TODO: accessibilityStates was removed from RN 0.62
@@ -169,8 +230,10 @@ test.skip('getAllByA11yStates, queryAllByA11yStates', () => {
   expect(queryAllByA11yStates(NO_MATCHES_TEXT)).toEqual([]);
 });
 
-test('getByA11yState, queryByA11yState', () => {
-  const { getByA11yState, queryByA11yState } = render(<Section />);
+test('getByA11yState, queryByA11yState, findByA11yState', async () => {
+  const { getByA11yState, queryByA11yState, findByA11yState } = render(
+    <Section />
+  );
 
   expect(getByA11yState({ selected: true }).props.accessibilityState).toEqual({
     selected: true,
@@ -192,25 +255,49 @@ test('getByA11yState, queryByA11yState', () => {
   expect(() => queryByA11yState({ expanded: false })).toThrow(
     FOUND_TWO_INSTANCES
   );
+
+  const asyncButton = await findByA11yState({ selected: true });
+  expect(asyncButton.props.accessibilityState).toEqual({
+    selected: true,
+    expanded: false,
+  });
+  await expect(
+    findByA11yState({ disabled: true }, waitForOptions)
+  ).rejects.toThrow(NO_INSTANCES_FOUND);
+  await expect(
+    findByA11yState({ expanded: false }, waitForOptions)
+  ).rejects.toThrow(FOUND_TWO_INSTANCES);
 });
 
-test('getAllByA11yState, queryAllByA11yState', () => {
-  const { getAllByA11yState, queryAllByA11yState } = render(<Section />);
+test('getAllByA11yState, queryAllByA11yState, findAllByA11yState', async () => {
+  const { getAllByA11yState, queryAllByA11yState, findAllByA11yState } = render(
+    <Section />
+  );
 
-  expect(getAllByA11yState({ selected: true }).length).toEqual(1);
-  expect(queryAllByA11yState({ selected: true }).length).toEqual(1);
+  expect(getAllByA11yState({ selected: true })).toHaveLength(1);
+  expect(queryAllByA11yState({ selected: true })).toHaveLength(1);
 
   expect(() => getAllByA11yState({ disabled: true })).toThrow(
     NO_INSTANCES_FOUND
   );
   expect(queryAllByA11yState({ disabled: true })).toEqual([]);
 
-  expect(getAllByA11yState({ expanded: false }).length).toEqual(2);
-  expect(queryAllByA11yState({ expanded: false }).length).toEqual(2);
+  expect(getAllByA11yState({ expanded: false })).toHaveLength(2);
+  expect(queryAllByA11yState({ expanded: false })).toHaveLength(2);
+
+  await expect(findAllByA11yState({ selected: true })).resolves.toHaveLength(1);
+  await expect(
+    findAllByA11yState({ disabled: true }, waitForOptions)
+  ).rejects.toThrow(NO_INSTANCES_FOUND);
+  await expect(findAllByA11yState({ expanded: false })).resolves.toHaveLength(
+    2
+  );
 });
 
-test('getByA11yValue, queryByA11yValue', () => {
-  const { getByA11yValue, queryByA11yValue } = render(<Section />);
+test('getByA11yValue, queryByA11yValue, findByA11yValue', async () => {
+  const { getByA11yValue, queryByA11yValue, findByA11yValue } = render(
+    <Section />
+  );
 
   expect(getByA11yValue({ min: 40 }).props.accessibilityValue).toEqual({
     min: 40,
@@ -226,17 +313,37 @@ test('getByA11yValue, queryByA11yValue', () => {
 
   expect(() => getByA11yValue({ max: 60 })).toThrow(FOUND_TWO_INSTANCES);
   expect(() => queryByA11yValue({ max: 60 })).toThrow(FOUND_TWO_INSTANCES);
+
+  const asyncElement = await findByA11yValue({ min: 40 });
+  expect(asyncElement.props.accessibilityValue).toEqual({
+    min: 40,
+    max: 60,
+  });
+  await expect(findByA11yValue({ min: 50 }, waitForOptions)).rejects.toThrow(
+    NO_INSTANCES_FOUND
+  );
+  await expect(findByA11yValue({ max: 60 }, waitForOptions)).rejects.toThrow(
+    FOUND_TWO_INSTANCES
+  );
 });
 
-test('getAllByA11yValue, queryAllByA11yValue', () => {
-  const { getAllByA11yValue, queryAllByA11yValue } = render(<Section />);
+test('getAllByA11yValue, queryAllByA11yValue, findAllByA11yValue', async () => {
+  const { getAllByA11yValue, queryAllByA11yValue, findAllByA11yValue } = render(
+    <Section />
+  );
 
-  expect(getAllByA11yValue({ min: 40 }).length).toEqual(1);
-  expect(queryAllByA11yValue({ min: 40 }).length).toEqual(1);
+  expect(getAllByA11yValue({ min: 40 })).toHaveLength(1);
+  expect(queryAllByA11yValue({ min: 40 })).toHaveLength(1);
 
   expect(() => getAllByA11yValue({ min: 50 })).toThrow(NO_INSTANCES_FOUND);
   expect(queryAllByA11yValue({ min: 50 })).toEqual([]);
 
-  expect(getAllByA11yValue({ max: 60 }).length).toEqual(2);
-  expect(queryAllByA11yValue({ max: 60 }).length).toEqual(2);
+  expect(queryAllByA11yValue({ max: 60 })).toHaveLength(2);
+  expect(getAllByA11yValue({ max: 60 })).toHaveLength(2);
+
+  await expect(findAllByA11yValue({ min: 40 })).resolves.toHaveLength(1);
+  await expect(findAllByA11yValue({ min: 50 }, waitForOptions)).rejects.toThrow(
+    NO_INSTANCES_FOUND
+  );
+  await expect(findAllByA11yValue({ max: 60 })).resolves.toHaveLength(2);
 });
diff --git a/src/__tests__/findByApi.test.js b/src/__tests__/findByApi.test.js
new file mode 100644
index 000000000..3f15c7840
--- /dev/null
+++ b/src/__tests__/findByApi.test.js
@@ -0,0 +1,58 @@
+// @flow
+import React from 'react';
+import { View, Text, TextInput } from 'react-native';
+import { render } from '..';
+
+test('findBy queries work asynchronously', async () => {
+  const options = { timeout: 10 }; // Short timeout so that this test runs quickly
+  const {
+    rerender,
+    findByTestId,
+    findAllByTestId,
+    findByText,
+    findAllByText,
+    findByPlaceholder,
+    findAllByPlaceholder,
+    findByDisplayValue,
+    findAllByDisplayValue,
+  } = render(<View />);
+  await expect(findByTestId('aTestId', options)).rejects.toBeTruthy();
+  await expect(findAllByTestId('aTestId', options)).rejects.toBeTruthy();
+  await expect(findByText('Some Text', options)).rejects.toBeTruthy();
+  await expect(findAllByText('Some Text', options)).rejects.toBeTruthy();
+  await expect(
+    findByPlaceholder('Placeholder Text', options)
+  ).rejects.toBeTruthy();
+  await expect(
+    findAllByPlaceholder('Placeholder Text', options)
+  ).rejects.toBeTruthy();
+  await expect(
+    findByDisplayValue('Display Value', options)
+  ).rejects.toBeTruthy();
+  await expect(
+    findAllByDisplayValue('Display Value', options)
+  ).rejects.toBeTruthy();
+
+  setTimeout(
+    () =>
+      rerender(
+        <View testID="aTestId">
+          <Text>Some Text</Text>
+          <TextInput placeholder="Placeholder Text" />
+          <TextInput value="Display Value" />
+        </View>
+      ),
+    20
+  );
+
+  await expect(findByTestId('aTestId')).resolves.toBeTruthy();
+  await expect(findAllByTestId('aTestId')).resolves.toHaveLength(1);
+  await expect(findByText('Some Text')).resolves.toBeTruthy();
+  await expect(findAllByText('Some Text')).resolves.toHaveLength(1);
+  await expect(findByPlaceholder('Placeholder Text')).resolves.toBeTruthy();
+  await expect(findAllByPlaceholder('Placeholder Text')).resolves.toHaveLength(
+    1
+  );
+  await expect(findByDisplayValue('Display Value')).resolves.toBeTruthy();
+  await expect(findAllByDisplayValue('Display Value')).resolves.toHaveLength(1);
+}, 10000);
diff --git a/src/__tests__/within.test.js b/src/__tests__/within.test.js
index 97bf5252b..a4fb956c1 100644
--- a/src/__tests__/within.test.js
+++ b/src/__tests__/within.test.js
@@ -3,7 +3,7 @@ import React from 'react';
 import { View, Text, TextInput } from 'react-native';
 import { render, within } from '..';
 
-test('within() exposes basic queries', () => {
+test('within() exposes basic queries', async () => {
   const rootQueries = render(
     <View>
       <View accessibilityHint="first">
@@ -28,6 +28,12 @@ test('within() exposes basic queries', () => {
   expect(firstQueries.queryByText('Same Text')).toBeTruthy();
   expect(firstQueries.getByDisplayValue('Same Value')).toBeTruthy();
   expect(firstQueries.getByPlaceholder('Same Placeholder')).toBeTruthy();
+  await expect(
+    firstQueries.findByDisplayValue('Same Value')
+  ).resolves.toBeTruthy();
+  await expect(
+    firstQueries.findAllByPlaceholder('Same Placeholder')
+  ).resolves.toHaveLength(1);
 
   const secondQueries = within(rootQueries.getByA11yHint('second'));
   expect(secondQueries.getAllByText('Same Text')).toHaveLength(1);
@@ -38,7 +44,7 @@ test('within() exposes basic queries', () => {
   expect(secondQueries.getByPlaceholder('Same Placeholder')).toBeTruthy();
 });
 
-test('within() exposes a11y queries', () => {
+test('within() exposes a11y queries', async () => {
   const rootQueries = render(
     <View>
       <View accessibilityHint="first">
@@ -64,8 +70,22 @@ test('within() exposes a11y queries', () => {
   const firstQueries = within(rootQueries.getByA11yHint('first'));
   expect(firstQueries.getByA11yLabel('Same Label')).toBeTruthy();
   expect(firstQueries.getByA11yHint('Same Hint')).toBeTruthy();
+  expect(firstQueries.queryByA11yLabel('Same Label')).toBeTruthy();
+  expect(firstQueries.queryByA11yHint('Same Hint')).toBeTruthy();
+  await expect(
+    firstQueries.findByA11yLabel('Same Label')
+  ).resolves.toBeTruthy();
+  await expect(firstQueries.findByA11yHint('Same Hint')).resolves.toBeTruthy();
 
   const secondQueries = within(rootQueries.getByA11yHint('second'));
   expect(secondQueries.getAllByA11yLabel('Same Label')).toHaveLength(1);
   expect(secondQueries.getAllByA11yHint('Same Hint')).toHaveLength(1);
+  expect(secondQueries.queryAllByA11yLabel('Same Label')).toHaveLength(1);
+  expect(secondQueries.queryAllByA11yHint('Same Hint')).toHaveLength(1);
+  await expect(
+    secondQueries.findAllByA11yLabel('Same Label')
+  ).resolves.toHaveLength(1);
+  await expect(
+    secondQueries.findAllByA11yHint('Same Hint')
+  ).resolves.toHaveLength(1);
 });
diff --git a/src/helpers/a11yAPI.js b/src/helpers/a11yAPI.js
index b3629110b..3e6edf79f 100644
--- a/src/helpers/a11yAPI.js
+++ b/src/helpers/a11yAPI.js
@@ -1,11 +1,14 @@
 // @flow
 import makeQuery from './makeQuery';
 import type { A11yRole, A11yStates, A11yState, A11yValue } from '../types.flow';
+import type { WaitForOptions } from './findByAPI';
 
 type GetReturn = ReactTestInstance;
 type GetAllReturn = Array<ReactTestInstance>;
 type QueryReturn = ReactTestInstance | null;
 type QueryAllReturn = Array<ReactTestInstance> | [];
+type FindReturn = Promise<GetReturn>;
+type FindAllReturn = Promise<GetAllReturn>;
 
 type A11yAPI = {|
   // Label
@@ -13,36 +16,48 @@ type A11yAPI = {|
   getAllByA11yLabel: (string | RegExp) => GetAllReturn,
   queryByA11yLabel: (string | RegExp) => QueryReturn,
   queryAllByA11yLabel: (string | RegExp) => QueryAllReturn,
+  findByA11yLabel: (string | RegExp, ?WaitForOptions) => FindReturn,
+  findAllByA11yLabel: (string | RegExp, ?WaitForOptions) => FindAllReturn,
 
   // Hint
   getByA11yHint: (string | RegExp) => GetReturn,
   getAllByA11yHint: (string | RegExp) => GetAllReturn,
   queryByA11yHint: (string | RegExp) => QueryReturn,
   queryAllByA11yHint: (string | RegExp) => QueryAllReturn,
+  findByA11yHint: (string | RegExp, ?WaitForOptions) => FindReturn,
+  findAllByA11yHint: (string | RegExp, ?WaitForOptions) => FindAllReturn,
 
   // Role
   getByA11yRole: (A11yRole | RegExp) => GetReturn,
   getAllByA11yRole: (A11yRole | RegExp) => GetAllReturn,
   queryByA11yRole: (A11yRole | RegExp) => QueryReturn,
   queryAllByA11yRole: (A11yRole | RegExp) => QueryAllReturn,
+  findByA11yRole: (A11yRole, ?WaitForOptions) => FindReturn,
+  findAllByA11yRole: (A11yRole, ?WaitForOptions) => FindAllReturn,
 
   // States
   getByA11yStates: (A11yStates | Array<A11yStates>) => GetReturn,
   getAllByA11yStates: (A11yStates | Array<A11yStates>) => GetAllReturn,
   queryByA11yStates: (A11yStates | Array<A11yStates>) => QueryReturn,
   queryAllByA11yStates: (A11yStates | Array<A11yStates>) => QueryAllReturn,
+  findByA11yStates: (A11yStates, ?WaitForOptions) => FindReturn,
+  findAllByA11yStates: (A11yStates, ?WaitForOptions) => FindAllReturn,
 
   // State
   getByA11yState: A11yState => GetReturn,
   getAllByA11yState: A11yState => GetAllReturn,
   queryByA11yState: A11yState => QueryReturn,
   queryAllByA11yState: A11yState => QueryAllReturn,
+  findByA11yState: (A11yState, ?WaitForOptions) => FindReturn,
+  findAllByA11yState: (A11yState, ?WaitForOptions) => FindAllReturn,
 
   // Value
   getByA11yValue: A11yValue => GetReturn,
   getAllByA11yValue: A11yValue => GetAllReturn,
   queryByA11yValue: A11yValue => QueryReturn,
   queryAllByA11yValue: A11yValue => QueryAllReturn,
+  findByA11yValue: (A11yValue, ?WaitForOptions) => FindReturn,
+  findAllByA11yValue: (A11yValue, ?WaitForOptions) => FindAllReturn,
 |};
 
 export function matchStringValue(
@@ -92,6 +107,8 @@ const a11yAPI = (instance: ReactTestInstance): A11yAPI =>
         getAllBy: ['getAllByA11yLabel', 'getAllByAccessibilityLabel'],
         queryBy: ['queryByA11yLabel', 'queryByAccessibilityLabel'],
         queryAllBy: ['queryAllByA11yLabel', 'queryAllByAccessibilityLabel'],
+        findBy: ['findByA11yLabel', 'findByAccessibilityLabel'],
+        findAllBy: ['findAllByA11yLabel', 'findAllByAccessibilityLabel'],
       },
       matchStringValue
     )(instance),
@@ -102,6 +119,8 @@ const a11yAPI = (instance: ReactTestInstance): A11yAPI =>
         getAllBy: ['getAllByA11yHint', 'getAllByAccessibilityHint'],
         queryBy: ['queryByA11yHint', 'queryByAccessibilityHint'],
         queryAllBy: ['queryAllByA11yHint', 'queryAllByAccessibilityHint'],
+        findBy: ['findByA11yHint', 'findByAccessibilityHint'],
+        findAllBy: ['findAllByA11yHint', 'findAllByAccessibilityHint'],
       },
       matchStringValue
     )(instance),
@@ -112,6 +131,8 @@ const a11yAPI = (instance: ReactTestInstance): A11yAPI =>
         getAllBy: ['getAllByA11yRole', 'getAllByAccessibilityRole'],
         queryBy: ['queryByA11yRole', 'queryByAccessibilityRole'],
         queryAllBy: ['queryAllByA11yRole', 'queryAllByAccessibilityRole'],
+        findBy: ['findByA11yRole', 'findByAccessibilityRole'],
+        findAllBy: ['findAllByA11yRole', 'findAllByAccessibilityRole'],
       },
       matchStringValue
     )(instance),
@@ -122,6 +143,8 @@ const a11yAPI = (instance: ReactTestInstance): A11yAPI =>
         getAllBy: ['getAllByA11yStates', 'getAllByAccessibilityStates'],
         queryBy: ['queryByA11yStates', 'queryByAccessibilityStates'],
         queryAllBy: ['queryAllByA11yStates', 'queryAllByAccessibilityStates'],
+        findBy: ['findByA11yStates', 'findByAccessibilityStates'],
+        findAllBy: ['findAllByA11yStates', 'findAllByAccessibilityStates'],
       },
       matchArrayValue
     )(instance),
@@ -132,6 +155,8 @@ const a11yAPI = (instance: ReactTestInstance): A11yAPI =>
         getAllBy: ['getAllByA11yState', 'getAllByAccessibilityState'],
         queryBy: ['queryByA11yState', 'queryByAccessibilityState'],
         queryAllBy: ['queryAllByA11yState', 'queryAllByAccessibilityState'],
+        findBy: ['findByA11yState', 'findByAccessibilityState'],
+        findAllBy: ['findAllByA11yState', 'findAllByAccessibilityState'],
       },
       matchObject
     )(instance),
@@ -142,6 +167,8 @@ const a11yAPI = (instance: ReactTestInstance): A11yAPI =>
         getAllBy: ['getAllByA11yValue', 'getAllByAccessibilityValue'],
         queryBy: ['queryByA11yValue', 'queryByAccessibilityValue'],
         queryAllBy: ['queryAllByA11yValue', 'queryAllByAccessibilityValue'],
+        findBy: ['findByA11yValue', 'findByAccessibilityValue'],
+        findAllBy: ['findAllByA11yValue', 'findAllByAccessibilityValue'],
       },
       matchObject
     )(instance),
diff --git a/src/helpers/findByAPI.js b/src/helpers/findByAPI.js
new file mode 100644
index 000000000..f7878ad51
--- /dev/null
+++ b/src/helpers/findByAPI.js
@@ -0,0 +1,80 @@
+// @flow
+import {
+  fixedGetByTestId,
+  getAllByTestId,
+  getByText,
+  getAllByText,
+  getByPlaceholder,
+  getAllByPlaceholder,
+  getByDisplayValue,
+  getAllByDisplayValue,
+} from './getByAPI';
+import waitForElement from '../waitForElement';
+
+export type WaitForOptions = {
+  timeout?: number,
+  interval?: number,
+};
+
+const makeFindQuery = <Text, Result>(
+  instance: ReactTestInstance,
+  getQuery: (instance: ReactTestInstance) => (text: Text) => Result,
+  text: Text,
+  waitForOptions: WaitForOptions
+): Promise<Result> =>
+  waitForElement(
+    () => getQuery(instance)(text),
+    waitForOptions.timeout,
+    waitForOptions.interval
+  );
+
+export const findByTestId = (instance: ReactTestInstance) => (
+  testId: string,
+  waitForOptions: WaitForOptions = {}
+) => makeFindQuery(instance, fixedGetByTestId, testId, waitForOptions);
+
+export const findAllByTestId = (instance: ReactTestInstance) => (
+  testId: string,
+  waitForOptions: WaitForOptions = {}
+) => makeFindQuery(instance, getAllByTestId, testId, waitForOptions);
+
+export const findByText = (instance: ReactTestInstance) => (
+  text: string | RegExp,
+  waitForOptions: WaitForOptions = {}
+) => makeFindQuery(instance, getByText, text, waitForOptions);
+
+export const findAllByText = (instance: ReactTestInstance) => (
+  text: string | RegExp,
+  waitForOptions: WaitForOptions = {}
+) => makeFindQuery(instance, getAllByText, text, waitForOptions);
+
+export const findByPlaceholder = (instance: ReactTestInstance) => (
+  placeholder: string | RegExp,
+  waitForOptions: WaitForOptions = {}
+) => makeFindQuery(instance, getByPlaceholder, placeholder, waitForOptions);
+
+export const findAllByPlaceholder = (instance: ReactTestInstance) => (
+  placeholder: string | RegExp,
+  waitForOptions: WaitForOptions = {}
+) => makeFindQuery(instance, getAllByPlaceholder, placeholder, waitForOptions);
+
+export const findByDisplayValue = (instance: ReactTestInstance) => (
+  value: string | RegExp,
+  waitForOptions: WaitForOptions = {}
+) => makeFindQuery(instance, getByDisplayValue, value, waitForOptions);
+
+export const findAllByDisplayValue = (instance: ReactTestInstance) => (
+  value: string | RegExp,
+  waitForOptions: WaitForOptions = {}
+) => makeFindQuery(instance, getAllByDisplayValue, value, waitForOptions);
+
+export const findByAPI = (instance: ReactTestInstance) => ({
+  findByTestId: findByTestId(instance),
+  findByText: findByText(instance),
+  findByPlaceholder: findByPlaceholder(instance),
+  findByDisplayValue: findByDisplayValue(instance),
+  findAllByTestId: findAllByTestId(instance),
+  findAllByText: findAllByText(instance),
+  findAllByPlaceholder: findAllByPlaceholder(instance),
+  findAllByDisplayValue: findAllByDisplayValue(instance),
+});
diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index 8a2af2d42..6ed49f47f 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -157,6 +157,25 @@ export const getByTestId = (instance: ReactTestInstance) =>
     }
   };
 
+export const fixedGetByTestId = (instance: ReactTestInstance) =>
+  function getByTestIdFn(testID: string) {
+    try {
+      const results = getAllByTestId(instance)(testID);
+      if (results.length === 1) {
+        return results[0];
+      } else {
+        throw new ErrorWithStack(
+          ` Expected 1 but found ${
+            results.length
+          } instances with testID: ${String(testID)}`,
+          getByTestIdFn
+        );
+      }
+    } catch (error) {
+      throw new ErrorWithStack(prepareErrorMessage(error), getByTestIdFn);
+    }
+  };
+
 export const getAllByName = (instance: ReactTestInstance, warnFn?: Function) =>
   function getAllByNameFn(name: string | React.ComponentType<any>) {
     warnFn && warnFn('getAllByName');
diff --git a/src/helpers/makeQuery.js b/src/helpers/makeQuery.js
index 059a853b2..fe257708f 100644
--- a/src/helpers/makeQuery.js
+++ b/src/helpers/makeQuery.js
@@ -4,6 +4,8 @@ import {
   prepareErrorMessage,
   createQueryByError,
 } from './errors';
+import waitForElement from '../waitForElement';
+import type { WaitForOptions } from './findByAPI';
 
 function isNodeValid(node: ReactTestInstance) {
   return typeof node.type === 'string';
@@ -20,6 +22,8 @@ type QueryNames = {
   getAllBy: Array<string>,
   queryBy: Array<string>,
   queryAllBy: Array<string>,
+  findBy: Array<string>,
+  findAllBy: Array<string>,
 };
 
 const makeQuery = <P: mixed, M: mixed>(
@@ -65,11 +69,29 @@ const makeQuery = <P: mixed, M: mixed>(
     }
   };
 
+  const findBy = (matcher: M, waitForOptions?: WaitForOptions) => {
+    return waitForElement(
+      () => getBy(matcher),
+      waitForOptions?.timeout,
+      waitForOptions?.interval
+    );
+  };
+
+  const findAllBy = (matcher: M, waitForOptions?: WaitForOptions) => {
+    return waitForElement(
+      () => getAllBy(matcher),
+      waitForOptions?.timeout,
+      waitForOptions?.interval
+    );
+  };
+
   return {
     ...makeAliases(queryNames.getBy, getBy),
     ...makeAliases(queryNames.getAllBy, getAllBy),
     ...makeAliases(queryNames.queryBy, queryBy),
     ...makeAliases(queryNames.queryAllBy, queryAllBy),
+    ...makeAliases(queryNames.findBy, findBy),
+    ...makeAliases(queryNames.findAllBy, findAllBy),
   };
 };
 
diff --git a/src/render.js b/src/render.js
index cb46f726e..658aba1c1 100644
--- a/src/render.js
+++ b/src/render.js
@@ -5,6 +5,7 @@ import act from './act';
 import { addToCleanupQueue } from './cleanup';
 import { getByAPI } from './helpers/getByAPI';
 import { queryByAPI } from './helpers/queryByAPI';
+import { findByAPI } from './helpers/findByAPI';
 import a11yAPI from './helpers/a11yAPI';
 import debugShallow from './helpers/debugShallow';
 import debugDeep from './helpers/debugDeep';
@@ -40,6 +41,7 @@ export default function render<T>(
   return {
     ...getByAPI(instance),
     ...queryByAPI(instance),
+    ...findByAPI(instance),
     ...a11yAPI(instance),
     update,
     rerender: update, // alias for `update`
diff --git a/src/within.js b/src/within.js
index a7dd00b40..3b12c3e06 100644
--- a/src/within.js
+++ b/src/within.js
@@ -1,12 +1,14 @@
 // @flow
 import { getByAPI } from './helpers/getByAPI';
 import { queryByAPI } from './helpers/queryByAPI';
+import { findByAPI } from './helpers/findByAPI';
 import a11yAPI from './helpers/a11yAPI';
 
 export default function within(instance: ReactTestInstance) {
   return {
     ...getByAPI(instance),
     ...queryByAPI(instance),
+    ...findByAPI(instance),
     ...a11yAPI(instance),
   };
 }
diff --git a/typings/__tests__/index.test.tsx b/typings/__tests__/index.test.tsx
index 5e0db16f4..3caf5f299 100644
--- a/typings/__tests__/index.test.tsx
+++ b/typings/__tests__/index.test.tsx
@@ -121,6 +121,57 @@ const queryAllByDisplayValueRegExp: Array<
   ReactTestInstance
 > = tree.queryAllByDisplayValue(/View/g);
 
+// findBy API tests
+const findBy: Promise<ReactTestInstance>[] = [
+  tree.findByText('View'),
+  tree.findByText('View', { timeout: 10, interval: 10 }),
+  tree.findByText(/View/g),
+  tree.findByText(/View/g, { timeout: 10, interval: 5 }),
+  tree.findByPlaceholder('my placeholder'),
+  tree.findByPlaceholder('my placeholder', { timeout: 10, interval: 5 }),
+  tree.findByPlaceholder(/placeholder/g),
+  tree.findByPlaceholder(/placeholder/g, { timeout: 10, interval: 5 }),
+  tree.findByDisplayValue('my value'),
+  tree.findByDisplayValue('my value', { timeout: 10, interval: 10 }),
+  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.findByA11yLabel('label'),
+  tree.findByA11yLabel('label', { timeout: 10, interval: 10 }),
+  tree.findByA11yHint('label'),
+  tree.findByA11yHint('label', { timeout: 10, interval: 10 }),
+  tree.findByA11yRole('button'),
+  tree.findByA11yRole('button', { timeout: 10, interval: 10 }),
+  tree.findByA11yState({ busy: true }),
+  tree.findByA11yState({ busy: true }, { timeout: 10, interval: 10 }),
+  tree.findByA11yValue({ min: 10 }),
+  tree.findByA11yValue({ min: 10 }, { timeout: 10, interval: 10 }),
+];
+
+const findAllBy: Promise<ReactTestInstance[]>[] = [
+  tree.findAllByText('View'),
+  tree.findAllByText('View', { timeout: 10, interval: 10 }),
+  tree.findAllByText(/View/g),
+  tree.findAllByText(/View/g, { timeout: 10, interval: 5 }),
+  tree.findAllByPlaceholder('my placeholder'),
+  tree.findAllByPlaceholder('my placeholder', { timeout: 10, interval: 10 }),
+  tree.findAllByPlaceholder(/placeholder/g),
+  tree.findAllByPlaceholder(/placeholder/g, { timeout: 10, interval: 10 }),
+  tree.findAllByDisplayValue('View'),
+  tree.findAllByDisplayValue('View', { timeout: 10, interval: 10 }),
+  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.findAllByA11yHint('label'),
+  tree.findAllByA11yHint('label', { timeout: 10, interval: 10 }),
+  tree.findAllByA11yState({ busy: true }),
+  tree.findAllByA11yState({ busy: true }, { timeout: 10, interval: 10 }),
+  tree.findAllByA11yValue({ min: 10 }),
+  tree.findAllByA11yValue({ min: 10 }, { timeout: 10, interval: 10 }),
+];
+
 // Accessibility queries
 const getByA11yLabel: ReactTestInstance = tree.getByA11yLabel('label');
 const getAllByA11yLabel: Array<ReactTestInstance> = tree.getAllByA11yLabel(
@@ -130,6 +181,7 @@ const queryByA11yLabel: ReactTestInstance = tree.queryByA11yLabel('label');
 const queryAllByA11yLabel: Array<ReactTestInstance> = tree.queryAllByA11yLabel(
   'label'
 );
+
 const getByA11yHint: ReactTestInstance = tree.getByA11yHint('label');
 const getAllByA11yHint: Array<ReactTestInstance> = tree.getAllByA11yHint(
   'label'
@@ -138,6 +190,7 @@ const queryByA11yHint: ReactTestInstance = tree.queryByA11yHint('label');
 const queryAllByA11yHint: Array<ReactTestInstance> = tree.queryAllByA11yHint(
   'label'
 );
+
 const getByA11yRole: ReactTestInstance = tree.getByA11yRole('button');
 const getAllByA11yRole: Array<ReactTestInstance> = tree.getAllByA11yRole(
   'button'
@@ -146,6 +199,7 @@ const queryByA11yRole: ReactTestInstance = tree.queryByA11yRole('button');
 const queryAllByA11yRole: Array<ReactTestInstance> = tree.queryAllByA11yRole(
   'button'
 );
+
 const getByA11yStates: ReactTestInstance = tree.getByA11yStates('selected');
 const getByA11yStatesArray: ReactTestInstance = tree.getByA11yStates(['selected']);
 const getAllByA11yStates: Array<ReactTestInstance> = tree.getAllByA11yStates(
@@ -221,112 +275,75 @@ act(() => {
 
 // within API
 const instance: ReactTestInstance = tree.getByText('<View />');
-const withinGetByText: ReactTestInstance = within(instance).getByText('Test');
-const withinGetAllByText: ReactTestInstance[] = within(instance).getAllByText(
-  'Test'
-);
-const withinGetByDisplayValue: ReactTestInstance = within(
-  instance
-).getByDisplayValue('Test');
-const withinGetAllByDisplayValue: ReactTestInstance[] = within(
-  instance
-).getAllByDisplayValue('Test');
-const withinGetByPlaceholder: ReactTestInstance = within(
-  instance
-).getByPlaceholder('Test');
-const withinGetAllByPlaceholder: ReactTestInstance[] = within(
-  instance
-).getAllByPlaceholder('Test');
-const withinGetByTestId: ReactTestInstance = within(instance).getByTestId(
-  'Test'
-);
-const withinGetAllByTestId: ReactTestInstance[] = within(
-  instance
-).getAllByTestId('Test');
 
-const withinQueryByText: ReactTestInstance | null = within(
-  instance
-).queryByText('Test');
-const withinQueryAllByText: ReactTestInstance[] = within(
-  instance
-).queryAllByText('Test');
-const withinQueryByDisplayValue: ReactTestInstance | null = within(
-  instance
-).queryByDisplayValue('Test');
-const withinQueryAllByDisplayValue: ReactTestInstance[] = within(
-  instance
-).queryAllByDisplayValue('Test');
-const withinQueryByPlaceholder: ReactTestInstance | null = within(
-  instance
-).queryByPlaceholder('Test');
-const withinQueryAllByPlaceholder: ReactTestInstance[] = within(
-  instance
-).queryAllByPlaceholder('Test');
-const withinQueryByTestId: ReactTestInstance | null = within(
-  instance
-).queryByTestId('Test');
-const withinQueryAllByTestId: ReactTestInstance[] = within(
-  instance
-).queryAllByTestId('Test');
+const withinGet: Array<ReactTestInstance> = [
+  within(instance).getByText('Test'),
+  within(instance).getByDisplayValue('Test'),
+  within(instance).getByPlaceholder('Test'),
+  within(instance).getByTestId('Test'),
+  within(instance).getByA11yLabel('Test'),
+  within(instance).getByA11yHint('Test'),
+  within(instance).getByA11yRole('button'),
+  within(instance).getByA11yState({ busy: true }),
+  within(instance).getByA11yValue({ min: 10 }),
+];
 
-const withinGetByA11yLabel: ReactTestInstance = within(instance).getByA11yLabel(
-  'Test'
-);
-const withinGetAllByA11yLabel: ReactTestInstance[] = within(
-  instance
-).getAllByA11yLabel('Test');
-const withinGetByA11yHint: ReactTestInstance = within(instance).getByA11yHint(
-  'Test'
-);
-const withinGetAllByA11yHint: ReactTestInstance[] = within(
-  instance
-).getAllByA11yHint('Test');
-const withinGetByA11yRole: ReactTestInstance = within(instance).getByA11yRole(
-  'button'
-);
-const withinGetAllByA11yRole: ReactTestInstance[] = within(
-  instance
-).getAllByA11yRole('button');
-const withinGetByA11yState: ReactTestInstance = within(
-  instance
-).getByA11yState({ busy: true });
-const withinGetAllByA11yState: ReactTestInstance[] = within(
-  instance
-).getAllByA11yState({ busy: true });
-const withinGetByA11yValue: ReactTestInstance = within(
-  instance
-).getByA11yValue({ min: 10 });
-const withinGetAllByA11yValue: ReactTestInstance[] = within(
-  instance
-).getAllByA11yValue({ min: 10 });
+const withinGetAll: Array<ReactTestInstance[]> = [
+  within(instance).getAllByText('Test'),
+  within(instance).getAllByDisplayValue('Test'),
+  within(instance).getAllByPlaceholder('Test'),
+  within(instance).getAllByTestId('Test'),
+  within(instance).getAllByA11yLabel('Test'),
+  within(instance).getAllByA11yHint('Test'),
+  within(instance).getAllByA11yRole('button'),
+  within(instance).getAllByA11yState({ busy: true }),
+  within(instance).getAllByA11yValue({ min: 10 }),
+];
+
+const withinQuery: Array<ReactTestInstance | null> = [
+  within(instance).queryByText('Test'),
+  within(instance).queryByDisplayValue('Test'),
+  within(instance).queryByPlaceholder('Test'),
+  within(instance).queryByTestId('Test'),
+  within(instance).queryByA11yLabel('Test'),
+  within(instance).queryByA11yHint('Test'),
+  within(instance).queryByA11yRole('button'),
+  within(instance).queryByA11yState({ busy: true }),
+  within(instance).queryByA11yValue({ min: 10 }),
+];
+
+const withinQueryAll: Array<ReactTestInstance[]> = [
+  within(instance).queryAllByText('Test'),
+  within(instance).queryAllByDisplayValue('Test'),
+  within(instance).queryAllByPlaceholder('Test'),
+  within(instance).queryAllByTestId('Test'),
+  within(instance).queryAllByA11yLabel('Test'),
+  within(instance).queryAllByA11yHint('Test'),
+  within(instance).queryAllByA11yRole('button'),
+  within(instance).queryAllByA11yState({ busy: true }),
+  within(instance).queryAllByA11yValue({ min: 10 }),
+];
+
+const withinFind: Promise<ReactTestInstance>[] = [
+  within(instance).findByText('Test'),
+  within(instance).findByDisplayValue('Test'),
+  within(instance).findByPlaceholder('Test'),
+  within(instance).findByTestId('Test'),
+  within(instance).findByA11yLabel('Test'),
+  within(instance).findByA11yHint('Test'),
+  within(instance).findByA11yRole('button'),
+  within(instance).findByA11yState({ busy: true }),
+  within(instance).findByA11yValue({ min: 10 }),
+];
 
-const withinQueryByA11yLabel: ReactTestInstance | null = within(
-  instance
-).queryByA11yLabel('Test');
-const withinQueryAllByA11yLabel: ReactTestInstance[] = within(
-  instance
-).queryAllByA11yLabel('Test');
-const withinQueryByA11yHint: ReactTestInstance | null = within(
-  instance
-).queryByA11yHint('Test');
-const withinQueryAllByA11yHint: ReactTestInstance[] = within(
-  instance
-).queryAllByA11yHint('Test');
-const withinQueryByA11yRole: ReactTestInstance | null = within(
-  instance
-).queryByA11yRole('button');
-const withinQueryAllByA11yRole: ReactTestInstance[] = within(
-  instance
-).queryAllByA11yRole('button');
-const withinQueryByA11yState: ReactTestInstance | null = within(
-  instance
-).queryByA11yState({ busy: true });
-const withinQueryAllByA11yState: ReactTestInstance[] = within(
-  instance
-).queryAllByA11yState({ busy: true });
-const withinQueryByA11yValue: ReactTestInstance | null = within(
-  instance
-).queryByA11yValue({ min: 10 });
-const withinQueryAllByA11yValue: ReactTestInstance[] = within(
-  instance
-).queryAllByA11yValue({ min: 10 });
+const withinFindAll: Promise<ReactTestInstance[]>[] = [
+  within(instance).findAllByText('Test'),
+  within(instance).findAllByDisplayValue('Test'),
+  within(instance).findAllByPlaceholder('Test'),
+  within(instance).findAllByTestId('Test'),
+  within(instance).findAllByA11yLabel('Test'),
+  within(instance).findAllByA11yHint('Test'),
+  within(instance).findAllByA11yRole('button'),
+  within(instance).findAllByA11yState({ busy: true }),
+  within(instance).findAllByA11yValue({ min: 10 }),
+];
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 4afc01665..0a5bb8d2f 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -2,7 +2,14 @@ import * as React from 'react';
 import { AccessibilityState, AccessibilityStates, AccessibilityRole } from 'react-native';
 import { ReactTestInstance, ReactTestRendererJSON } from 'react-test-renderer';
 
-export interface GetByAPI {
+type GetReturn = ReactTestInstance;
+type GetAllReturn = Array<ReactTestInstance>;
+type QueryReturn = ReactTestInstance | null;
+type QueryAllReturn = Array<ReactTestInstance> | [];
+type FindReturn = Promise<ReactTestInstance>;
+type FindAllReturn = Promise<ReactTestInstance[]>;
+
+interface GetByAPI {
   getByName: (name: React.ReactType | string) => ReactTestInstance;
   getByType: <P>(type: React.ComponentType<P>) => ReactTestInstance;
   getByText: (text: string | RegExp) => ReactTestInstance;
@@ -28,7 +35,7 @@ export interface GetByAPI {
   UNSAFE_getAllByProps: (props: Record<string, any>) => Array<ReactTestInstance>,
 }
 
-export interface QueryByAPI {
+interface QueryByAPI {
   queryByName: (name: React.ReactType | string) => ReactTestInstance | null;
   queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null;
   queryByText: (name: string | RegExp) => ReactTestInstance | null;
@@ -63,10 +70,42 @@ export interface QueryByAPI {
   UNSAFE_queryAllByProps: (props: Record<string, any>) => Array<ReactTestInstance> | [],
 }
 
-type GetReturn = ReactTestInstance;
-type GetAllReturn = Array<ReactTestInstance>;
-type QueryReturn = ReactTestInstance | null;
-type QueryAllReturn = Array<ReactTestInstance> | [];
+export interface WaitForOptions {
+  timeout: number;
+  interval: number;
+}
+
+interface FindByAPI {
+  findByText: (
+    text: string | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindReturn;
+  findByPlaceholder: (
+    placeholder: string | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindReturn;
+  findByDisplayValue: (
+    value: string | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindReturn;
+  findByTestId: (testID: string, waitForOptions?: WaitForOptions) => FindReturn;
+  findAllByText: (
+    text: string | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindAllReturn;
+  findAllByPlaceholder: (
+    placeholder: string | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindAllReturn;
+  findAllByDisplayValue: (
+    value: string | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindAllReturn;
+  findAllByTestId: (
+    testID: string,
+    waitForOptions?: WaitForOptions
+  ) => FindAllReturn;
+}
 
 // Not yet available in DefinitelyTyped
 export type A11yValue = {
@@ -82,18 +121,42 @@ type A11yAPI = {
   getAllByA11yLabel: (matcher: string | RegExp) => GetAllReturn,
   queryByA11yLabel: (matcher: string | RegExp) => QueryReturn,
   queryAllByA11yLabel: (matcher: string | RegExp) => QueryAllReturn,
+  findByA11yLabel: (
+    matcher: string | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindReturn;
+  findAllByA11yLabel: (
+    matcher: string | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindAllReturn;
 
   // Hint
   getByA11yHint: (matcher: string | RegExp) => GetReturn,
   getAllByA11yHint: (matcher: string | RegExp) => GetAllReturn,
   queryByA11yHint: (matcher: string | RegExp) => QueryReturn,
   queryAllByA11yHint: (matcher: string | RegExp) => QueryAllReturn,
+  findByA11yHint: (
+    matcher: string | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindReturn;
+  findAllByA11yHint: (
+    matcher: string | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindAllReturn;
 
   // Role
   getByA11yRole: (matcher: AccessibilityRole | RegExp) => GetReturn,
   getAllByA11yRole: (matcher: AccessibilityRole | RegExp) => GetAllReturn,
   queryByA11yRole: (matcher: AccessibilityRole | RegExp) => QueryReturn,
   queryAllByA11yRole: (matcher: AccessibilityRole | RegExp) => QueryAllReturn,
+  findByA11yRole: (
+    matcher: AccessibilityRole | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindReturn;
+  findAllByA11yRole: (
+    matcher: AccessibilityRole | RegExp,
+    waitForOptions?: WaitForOptions
+  ) => FindAllReturn;
 
   // States
   getByA11yStates: (matcher: AccessibilityStates | Array<AccessibilityStates>) => GetReturn,
@@ -106,12 +169,28 @@ type A11yAPI = {
   getAllByA11yState: (matcher: AccessibilityState) => GetAllReturn,
   queryByA11yState: (matcher: AccessibilityState) => QueryReturn,
   queryAllByA11yState: (matcher: AccessibilityState) => QueryAllReturn,
+  findByA11yState: (
+    matcher: AccessibilityState,
+    waitForOptions?: WaitForOptions
+  ) => FindReturn;
+  findAllByA11yState: (
+    matcher: AccessibilityState,
+    waitForOptions?: WaitForOptions
+  ) => FindAllReturn;
 
   // Value
   getByA11yValue: (matcher: A11yValue) => GetReturn,
   getAllByA11yValue: (matcher: A11yValue) => GetAllReturn,
   queryByA11yValue: (matcher: A11yValue) => QueryReturn,
   queryAllByA11yValue: (matcher: A11yValue) => QueryAllReturn,
+  findByA11yValue: (
+    matcher: A11yValue,
+    waitForOptions?: WaitForOptions
+  ) => FindReturn;
+  findAllByA11yValue: (
+    matcher: A11yValue,
+    waitForOptions?: WaitForOptions
+  ) => FindAllReturn;
 };
 
 export interface Thenable {
@@ -123,7 +202,7 @@ export interface RenderOptions {
   createNodeMock?: (element: React.ReactElement<any>) => any;
 }
 
-type Queries = GetByAPI & QueryByAPI & A11yAPI;
+type Queries = GetByAPI & QueryByAPI & FindByAPI & A11yAPI;
 
 export interface RenderAPI extends Queries {
   update(nextElement: React.ReactElement<any>): void;
diff --git a/website/docs/API.md b/website/docs/API.md
index f3037d779..62176f09b 100644
--- a/website/docs/API.md
+++ b/website/docs/API.md
@@ -351,7 +351,7 @@ Defined as:
 function within(instance: ReactTestInstance): Queries
 ```
 
-Perform [queries](./Queries.md) scoped to given element. 
+Perform [queries](./Queries.md) scoped to given element.
 
 :::note
 Please note that additional `render` specific operations like `update`, `unmount`, `debug`, `toJSON` are _not_ included.
@@ -361,13 +361,14 @@ Please note that additional `render` specific operations like `update`, `unmount
 const detailsScreen = within(getByA11yHint('Details Screen'));
 expect(detailsScreen.getByText('Some Text')).toBeTruthy();
 expect(detailsScreen.getByDisplayValue('Some Value')).toBeTruthy();
-expect(detailsScreen.getByA11yLabel('Some Label')).toBeTruthy();
-expect(detailsScreen.getByA11yHint('Some Label')).toBeTruthy();
+expect(detailsScreen.queryByA11yLabel('Some Label')).toBeTruthy();
+await expect(detailsScreen.findByA11yHint('Some Label')).resolves.toBeTruthy();
 ```
 
 Use cases for scoped queries include:
-* queries scoped to a single item inside a FlatList containing many items
-* queries scoped to a single screen in tests involving screen transitions (e.g. with react-navigation)
+
+- queries scoped to a single item inside a FlatList containing many items
+- queries scoped to a single screen in tests involving screen transitions (e.g. with react-navigation)
 
 ## `debug`
 
diff --git a/website/docs/Queries.md b/website/docs/Queries.md
index 461e975b1..ab1465f1a 100644
--- a/website/docs/Queries.md
+++ b/website/docs/Queries.md
@@ -24,6 +24,19 @@ title: Queries
 
 `queryAllBy*` queries return an array of all matching nodes for a query, and return an empty array (`[]`) if no elements match.
 
+### findBy
+
+`findBy` queries return a promise which resolves when a matching element is found. The promise is rejected if no elements match or if more than one match is found after a default timeout of 4500ms. If you need to find more than one element, then use `findAllBy`.
+
+### findAllBy
+
+`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. 
+:::
+
 ## Queries
 
 _Note: most methods like this one return a [`ReactTestInstance`](https://reactjs.org/docs/test-renderer.html#testinstance) with following properties that you may be interested in:_
@@ -39,7 +52,7 @@ type ReactTestInstance = {
 
 ### `ByText`
 
-> getByText, getAllByText, queryByText, queryAllByText
+> getByText, getAllByText, queryByText, queryAllByText, findByText, findAllByText
 
 Returns a `ReactTestInstance` with matching text – may be a string or regular expression.
 
@@ -54,7 +67,7 @@ const element = getByText('banana');
 
 ### `ByPlaceholder`
 
-> getByPlaceholder, getAllByPlaceholder, queryByPlaceholder, queryAllByPlaceholder
+> getByPlaceholder, getAllByPlaceholder, queryByPlaceholder, queryAllByPlaceholder, findByPlaceholder, findAllByPlaceholder
 
 Returns a `ReactTestInstance` for a `TextInput` with a matching placeholder – may be a string or regular expression.
 
@@ -67,7 +80,7 @@ const element = getByPlaceholder('username');
 
 ### `ByDisplayValue`
 
-> getByDisplayValue, getAllByDisplayValue, queryByDisplayValue, queryAllByDisplayValue
+> getByDisplayValue, getAllByDisplayValue, queryByDisplayValue, queryAllByDisplayValue, findByDisplayValue, findAllByDisplayValue
 
 Returns a `ReactTestInstance` for a `TextInput` with a matching display value – may be a string or regular expression.
 
@@ -80,7 +93,7 @@ const element = getByDisplayValue('username');
 
 ### `ByTestId`
 
-> getByTestId, getAllByTestId, queryByTestId, queryAllByTestId
+> getByTestId, getAllByTestId, queryByTestId, queryAllByTestId, findByTestId, findAllByTestId
 
 Returns a `ReactTestInstance` with matching `testID` prop.
 
@@ -101,8 +114,8 @@ Current implementation of `getByTestId` and `queryByTestId` has a serious flaw,
 
 ### `ByA11yLabel`, `ByAccessibilityLabel`
 
-> getByA11yLabel, getAllByA11yLabel, queryByA11yLabel, queryAllByA11yLabel
-> getByAccessibilityLabel, getAllByAccessibilityLabel, queryByAccessibilityLabel, queryAllByAccessibilityLabel
+> getByA11yLabel, getAllByA11yLabel, queryByA11yLabel, queryAllByA11yLabel, findByA11yLabel, findAllByA11yLabel
+> getByAccessibilityLabel, getAllByAccessibilityLabel, queryByAccessibilityLabel, queryAllByAccessibilityLabel, findByAccessibilityLabel, findAllByAccessibilityLabel
 
 Returns a `ReactTestInstance` with matching `accessibilityLabel` prop.
 
@@ -115,8 +128,8 @@ const element = getByA11yLabel('my-label');
 
 ### `ByA11yHint`, `ByAccessibilityHint`
 
-> getByA11yHint, getAllByA11yHint, queryByA11yHint, queryAllByA11yHint
-> getByAccessibilityHint, getAllByAccessibilityHint, queryByAccessibilityHint, queryAllByAccessibilityHint
+> getByA11yHint, getAllByA11yHint, queryByA11yHint, queryAllByA11yHint, findByA11yHint, findAllByA11yHint
+> getByAccessibilityHint, getAllByAccessibilityHint, queryByAccessibilityHint, queryAllByAccessibilityHint, findByAccessibilityHint, findAllByAccessibilityHint
 
 Returns a `ReactTestInstance` with matching `accessibilityHint` prop.
 
@@ -144,8 +157,8 @@ const element2 = getByA11yStates('checked');
 
 ### `ByA11yRole`, `ByAccessibilityRole`
 
-> getByA11yRole, getAllByA11yRole, queryByA11yRole, queryAllByA11yRole
-> getByAccessibilityRole, getAllByAccessibilityRole, queryByAccessibilityRole, queryAllByAccessibilityRole
+> getByA11yRole, getAllByA11yRole, queryByA11yRole, queryAllByA11yRole, findByA11yRole, findAllByA11yRole
+> getByAccessibilityRole, getAllByAccessibilityRole, queryByAccessibilityRole, queryAllByAccessibilityRole, findByAccessibilityRole, findAllByAccessibilityRole
 
 Returns a `ReactTestInstance` with matching `accessibilityRole` prop.
 
@@ -158,8 +171,8 @@ const element = getByA11yRole('button');
 
 ### `ByA11yState`, `ByAccessibilityState`
 
-> getByA11yState, getAllByA11yState, queryByA11yState, queryAllByA11yState
-> getByAccessibilityState, getAllByAccessibilityState, queryByAccessibilityState, queryAllByAccessibilityState
+> getByA11yState, getAllByA11yState, queryByA11yState, queryAllByA11yState, findByA11yState, findAllByA11yState
+> getByAccessibilityState, getAllByAccessibilityState, queryByAccessibilityState, queryAllByAccessibilityState, findByAccessibilityState, findAllByAccessibilityState
 
 Returns a `ReactTestInstance` with matching `accessibilityState` prop.
 
@@ -172,8 +185,8 @@ const element = getByA11yState({ disabled: true });
 
 ### `ByA11Value`, `ByAccessibilityValue`
 
-> getByA11yValue, getAllByA11yValue, queryByA11yValue, queryAllByA11yValue
-> getByAccessibilityValue, getAllByAccessibilityValue, queryByAccessibilityValue, queryAllByAccessibilityValue
+> getByA11yValue, getAllByA11yValue, queryByA11yValue, queryAllByA11yValue, findByA11yValue, findAllByA11yValue
+> getByAccessibilityValue, getAllByAccessibilityValue, queryByAccessibilityValue, queryAllByAccessibilityValue, findByAccessibilityValue, findAllByAccessibilityValue
 
 Returns a `ReactTestInstance` with matching `accessibilityValue` prop.
 

From 3d36d7a7e32f52e0852fb4254b53b970b440fa0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= <thymikee@gmail.com>
Date: Fri, 15 May 2020 10:10:49 +0200
Subject: [PATCH 07/16] chore: bump eslint config to latest (#308)

* chore: bump eslint config to latest

* lint fix

* lint pass

* use roles directly
---
 .eslintrc                            |   3 +-
 package.json                         |   2 +-
 src/__tests__/a11yAPI.test.js        |   8 +-
 src/__tests__/debug.test.js          |   2 +-
 src/__tests__/questionsBoard.test.js |   5 +-
 src/__tests__/render.test.js         |  11 ++-
 src/__tests__/waitForElement.test.js |   2 +-
 src/cleanup.js                       |   2 +-
 src/flushMicrotasksQueue.js          |   2 +-
 src/helpers/a11yAPI.js               |  22 +++---
 src/helpers/findByAPI.js             |   2 +-
 src/helpers/getByAPI.js              |  20 ++---
 src/helpers/makeQuery.js             |   8 +-
 src/render.js                        |   4 +-
 src/waitForElement.js                |   2 +-
 yarn.lock                            | 106 ++++++++++++++++++++++-----
 16 files changed, 137 insertions(+), 64 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index dee438153..4e273da18 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -9,6 +9,7 @@
     "import/no-unresolved": [
       2,
       { "ignore": ["^@theme", "^@docusaurus", "^@generated"] }
-    ]
+    ],
+    "react-native-a11y/has-valid-accessibility-ignores-invert-colors": 0
   }
 }
diff --git a/package.json b/package.json
index 5739dbfab..8f2d7fbca 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@babel/cli": "^7.8.4",
     "@babel/core": "^7.9.0",
-    "@callstack/eslint-config": "^9.1.0",
+    "@callstack/eslint-config": "^10.0.0",
     "@release-it/conventional-changelog": "^1.1.0",
     "@testing-library/jest-native": "~3.1.0",
     "@types/react": "^16.9.34",
diff --git a/src/__tests__/a11yAPI.test.js b/src/__tests__/a11yAPI.test.js
index a5cebd7e9..1524a0a35 100644
--- a/src/__tests__/a11yAPI.test.js
+++ b/src/__tests__/a11yAPI.test.js
@@ -5,10 +5,8 @@ import { render } from '..';
 
 const BUTTON_LABEL = 'cool button';
 const BUTTON_HINT = 'click this button';
-const BUTTON_ROLE = 'button';
 const TEXT_LABEL = 'cool text';
 const TEXT_HINT = 'static text';
-const TEXT_ROLE = 'link';
 // Little hack to make all the methods happy with type
 const NO_MATCHES_TEXT: any = 'not-existent-element';
 const NO_INSTANCES_FOUND = 'No instances found';
@@ -27,13 +25,13 @@ class Button extends React.Component<any> {
       <TouchableOpacity
         accessibilityHint={BUTTON_HINT}
         accessibilityLabel={BUTTON_LABEL}
-        accessibilityRole={BUTTON_ROLE}
+        accessibilityRole="button"
         accessibilityStates={['selected']}
       >
         <Typography
           accessibilityHint={TEXT_HINT}
           accessibilityLabel={TEXT_LABEL}
-          accessibilityRole={TEXT_ROLE}
+          accessibilityRole="link"
           accessibilityStates={['selected']}
           accessibilityState={{ expanded: false, selected: true }}
           accessibilityValue={{ min: 40, max: 60 }}
@@ -51,7 +49,7 @@ function Section() {
       <Typography
         accessibilityHint={TEXT_HINT}
         accessibilityLabel={TEXT_LABEL}
-        accessibilityRole={TEXT_ROLE}
+        accessibilityRole="link"
         // $FlowFixMe - removed in RN 0.62
         accessibilityStates={['selected', 'disabled']}
         accessibilityState={{ expanded: false }}
diff --git a/src/__tests__/debug.test.js b/src/__tests__/debug.test.js
index 0b49a0d1b..baf350275 100644
--- a/src/__tests__/debug.test.js
+++ b/src/__tests__/debug.test.js
@@ -32,7 +32,7 @@ class Button extends React.Component<any, any> {
 }
 
 test('debug', () => {
-  jest.spyOn(console, 'log').mockImplementation(x => x);
+  jest.spyOn(console, 'log').mockImplementation((x) => x);
   const component = <Button onPress={jest.fn} text="Press me" />;
   debug(component);
 
diff --git a/src/__tests__/questionsBoard.test.js b/src/__tests__/questionsBoard.test.js
index 6bef268df..58ef4ae1f 100644
--- a/src/__tests__/questionsBoard.test.js
+++ b/src/__tests__/questionsBoard.test.js
@@ -20,8 +20,9 @@ function QuestionsBoard({ questions, onSubmit }) {
             <Text>{q}</Text>
             <TextInput
               accessibilityLabel="answer input"
-              onChangeText={text => {
-                setData(state => ({
+              accessibilityHint="input"
+              onChangeText={(text) => {
+                setData((state) => ({
                   ...state,
                   [index + 1]: { q, a: text },
                 }));
diff --git a/src/__tests__/render.test.js b/src/__tests__/render.test.js
index eca96442f..045ae88c4 100644
--- a/src/__tests__/render.test.js
+++ b/src/__tests__/render.test.js
@@ -45,7 +45,7 @@ class Banana extends React.Component<any, any> {
   }
 
   changeFresh = () => {
-    this.setState(state => ({
+    this.setState((state) => ({
       fresh: !state.fresh,
     }));
   };
@@ -320,7 +320,7 @@ test('toJSON', () => {
 });
 
 test('debug', () => {
-  jest.spyOn(console, 'log').mockImplementation(x => x);
+  jest.spyOn(console, 'log').mockImplementation((x) => x);
 
   const { debug } = render(<Banana />);
 
@@ -343,7 +343,7 @@ test('debug', () => {
 });
 
 test('debug changing component', () => {
-  jest.spyOn(console, 'log').mockImplementation(x => x);
+  jest.spyOn(console, 'log').mockImplementation((x) => x);
 
   const { getByProps, debug } = render(<Banana />);
 
@@ -390,7 +390,9 @@ test('renders options.wrapper around updated node', () => {
     wrapper: WrapperComponent,
   });
 
-  rerender(<View testID="inner" accessibilityLabel="test" />);
+  rerender(
+    <View testID="inner" accessibilityLabel="test" accessibilityHint="test" />
+  );
 
   expect(getByTestId('wrapper')).toBeTruthy();
   expect(toJSON()).toMatchInlineSnapshot(`
@@ -399,6 +401,7 @@ test('renders options.wrapper around updated node', () => {
       testID="wrapper"
     >
       <View
+        accessibilityHint="test"
         accessibilityLabel="test"
         testID="inner"
       />
diff --git a/src/__tests__/waitForElement.test.js b/src/__tests__/waitForElement.test.js
index d84a497b7..8867a4a5e 100644
--- a/src/__tests__/waitForElement.test.js
+++ b/src/__tests__/waitForElement.test.js
@@ -24,7 +24,7 @@ class BananaContainer extends React.Component<{}, any> {
   state = { fresh: false };
 
   onChangeFresh = async () => {
-    await new Promise(resolve => setTimeout(resolve, 300));
+    await new Promise((resolve) => setTimeout(resolve, 300));
     this.setState({ fresh: true });
   };
 
diff --git a/src/cleanup.js b/src/cleanup.js
index 46c084266..88a7b2d60 100644
--- a/src/cleanup.js
+++ b/src/cleanup.js
@@ -2,7 +2,7 @@
 let cleanupQueue = new Set();
 
 export default function cleanup() {
-  cleanupQueue.forEach(fn => fn());
+  cleanupQueue.forEach((fn) => fn());
   cleanupQueue.clear();
 }
 
diff --git a/src/flushMicrotasksQueue.js b/src/flushMicrotasksQueue.js
index 864257cca..caab8614b 100644
--- a/src/flushMicrotasksQueue.js
+++ b/src/flushMicrotasksQueue.js
@@ -3,5 +3,5 @@
  * Wait for microtasks queue to flush
  */
 export default function flushMicrotasksQueue(): Promise<any> {
-  return new Promise(resolve => setImmediate(resolve));
+  return new Promise((resolve) => setImmediate(resolve));
 }
diff --git a/src/helpers/a11yAPI.js b/src/helpers/a11yAPI.js
index 3e6edf79f..40598b9b5 100644
--- a/src/helpers/a11yAPI.js
+++ b/src/helpers/a11yAPI.js
@@ -1,7 +1,7 @@
 // @flow
-import makeQuery from './makeQuery';
 import type { A11yRole, A11yStates, A11yState, A11yValue } from '../types.flow';
 import type { WaitForOptions } from './findByAPI';
+import makeQuery from './makeQuery';
 
 type GetReturn = ReactTestInstance;
 type GetAllReturn = Array<ReactTestInstance>;
@@ -44,18 +44,18 @@ type A11yAPI = {|
   findAllByA11yStates: (A11yStates, ?WaitForOptions) => FindAllReturn,
 
   // State
-  getByA11yState: A11yState => GetReturn,
-  getAllByA11yState: A11yState => GetAllReturn,
-  queryByA11yState: A11yState => QueryReturn,
-  queryAllByA11yState: A11yState => QueryAllReturn,
+  getByA11yState: (A11yState) => GetReturn,
+  getAllByA11yState: (A11yState) => GetAllReturn,
+  queryByA11yState: (A11yState) => QueryReturn,
+  queryAllByA11yState: (A11yState) => QueryAllReturn,
   findByA11yState: (A11yState, ?WaitForOptions) => FindReturn,
   findAllByA11yState: (A11yState, ?WaitForOptions) => FindAllReturn,
 
   // Value
-  getByA11yValue: A11yValue => GetReturn,
-  getAllByA11yValue: A11yValue => GetAllReturn,
-  queryByA11yValue: A11yValue => QueryReturn,
-  queryAllByA11yValue: A11yValue => QueryAllReturn,
+  getByA11yValue: (A11yValue) => GetReturn,
+  getAllByA11yValue: (A11yValue) => GetAllReturn,
+  queryByA11yValue: (A11yValue) => QueryReturn,
+  queryAllByA11yValue: (A11yValue) => QueryAllReturn,
   findByA11yValue: (A11yValue, ?WaitForOptions) => FindReturn,
   findAllByA11yValue: (A11yValue, ?WaitForOptions) => FindAllReturn,
 |};
@@ -87,14 +87,14 @@ export function matchArrayValue(
     return prop.includes(matcher);
   }
 
-  return !matcher.some(e => !prop.includes(e));
+  return !matcher.some((e) => !prop.includes(e));
 }
 
 export function matchObject<T: {}>(prop?: T, matcher: T): boolean {
   return prop
     ? Object.keys(matcher).length !== 0 &&
         Object.keys(prop).length !== 0 &&
-        !Object.keys(matcher).some(key => prop[key] !== matcher[key])
+        !Object.keys(matcher).some((key) => prop[key] !== matcher[key])
     : false;
 }
 
diff --git a/src/helpers/findByAPI.js b/src/helpers/findByAPI.js
index f7878ad51..7b773979b 100644
--- a/src/helpers/findByAPI.js
+++ b/src/helpers/findByAPI.js
@@ -1,4 +1,5 @@
 // @flow
+import waitForElement from '../waitForElement';
 import {
   fixedGetByTestId,
   getAllByTestId,
@@ -9,7 +10,6 @@ import {
   getByDisplayValue,
   getAllByDisplayValue,
 } from './getByAPI';
-import waitForElement from '../waitForElement';
 
 export type WaitForOptions = {
   timeout?: number,
diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index 6ed49f47f..052d3d560 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -36,7 +36,7 @@ const getNodeByText = (node, text) => {
 };
 
 const getChildrenAsText = (children, TextComponent, textContent = []) => {
-  React.Children.forEach(children, child => {
+  React.Children.forEach(children, (child) => {
     if (typeof child === 'string') {
       textContent.push(child);
       return;
@@ -90,7 +90,7 @@ export const getByName = (instance: ReactTestInstance, warnFn?: Function) =>
     warnFn && warnFn('getByName');
     try {
       return typeof name === 'string'
-        ? instance.find(node => filterNodeByName(node, name))
+        ? instance.find((node) => filterNodeByName(node, name))
         : instance.findByType(name);
     } catch (error) {
       throw new ErrorWithStack(prepareErrorMessage(error), getByNameFn);
@@ -110,7 +110,7 @@ export const getByType = (instance: ReactTestInstance, warnFn?: Function) =>
 export const getByText = (instance: ReactTestInstance) =>
   function getByTextFn(text: string | RegExp) {
     try {
-      return instance.find(node => getNodeByText(node, text));
+      return instance.find((node) => getNodeByText(node, text));
     } catch (error) {
       throw new ErrorWithStack(prepareErrorMessage(error), getByTextFn);
     }
@@ -119,7 +119,7 @@ export const getByText = (instance: ReactTestInstance) =>
 export const getByPlaceholder = (instance: ReactTestInstance) =>
   function getByPlaceholderFn(placeholder: string | RegExp) {
     try {
-      return instance.find(node =>
+      return instance.find((node) =>
         getTextInputNodeByPlaceholder(node, placeholder)
       );
     } catch (error) {
@@ -130,7 +130,7 @@ export const getByPlaceholder = (instance: ReactTestInstance) =>
 export const getByDisplayValue = (instance: ReactTestInstance) =>
   function getByDisplayValueFn(placeholder: string | RegExp) {
     try {
-      return instance.find(node =>
+      return instance.find((node) =>
         getTextInputNodeByDisplayValue(node, placeholder)
       );
     } catch (error) {
@@ -181,7 +181,7 @@ export const getAllByName = (instance: ReactTestInstance, warnFn?: Function) =>
     warnFn && warnFn('getAllByName');
     const results =
       typeof name === 'string'
-        ? instance.findAll(node => filterNodeByName(node, name))
+        ? instance.findAll((node) => filterNodeByName(node, name))
         : instance.findAllByType(name);
     if (results.length === 0) {
       throw new ErrorWithStack('No instances found', getAllByNameFn);
@@ -201,7 +201,7 @@ export const getAllByType = (instance: ReactTestInstance, warnFn?: Function) =>
 
 export const getAllByText = (instance: ReactTestInstance) =>
   function getAllByTextFn(text: string | RegExp) {
-    const results = instance.findAll(node => getNodeByText(node, text));
+    const results = instance.findAll((node) => getNodeByText(node, text));
     if (results.length === 0) {
       throw new ErrorWithStack(
         `No instances found with text: ${String(text)}`,
@@ -213,7 +213,7 @@ export const getAllByText = (instance: ReactTestInstance) =>
 
 export const getAllByPlaceholder = (instance: ReactTestInstance) =>
   function getAllByPlaceholderFn(placeholder: string | RegExp) {
-    const results = instance.findAll(node =>
+    const results = instance.findAll((node) =>
       getTextInputNodeByPlaceholder(node, placeholder)
     );
     if (results.length === 0) {
@@ -227,7 +227,7 @@ export const getAllByPlaceholder = (instance: ReactTestInstance) =>
 
 export const getAllByDisplayValue = (instance: ReactTestInstance) =>
   function getAllByDisplayValueFn(value: string | RegExp) {
-    const results = instance.findAll(node =>
+    const results = instance.findAll((node) =>
       getTextInputNodeByDisplayValue(node, value)
     );
     if (results.length === 0) {
@@ -256,7 +256,7 @@ export const getAllByTestId = (instance: ReactTestInstance) =>
   function getAllByTestIdFn(testID: string): ReactTestInstance[] {
     const results = instance
       .findAllByProps({ testID })
-      .filter(element => typeof element.type === 'string');
+      .filter((element) => typeof element.type === 'string');
 
     if (results.length === 0) {
       throw new ErrorWithStack(
diff --git a/src/helpers/makeQuery.js b/src/helpers/makeQuery.js
index fe257708f..facda0fc3 100644
--- a/src/helpers/makeQuery.js
+++ b/src/helpers/makeQuery.js
@@ -1,10 +1,10 @@
 // @flow
+import waitForElement from '../waitForElement';
 import {
   ErrorWithStack,
   prepareErrorMessage,
   createQueryByError,
 } from './errors';
-import waitForElement from '../waitForElement';
 import type { WaitForOptions } from './findByAPI';
 
 function isNodeValid(node: ReactTestInstance) {
@@ -13,7 +13,7 @@ function isNodeValid(node: ReactTestInstance) {
 
 function makeAliases(aliases: Array<string>, query: Function) {
   return aliases
-    .map(alias => ({ [alias]: query }))
+    .map((alias) => ({ [alias]: query }))
     .reduce((acc, query) => ({ ...acc, ...query }), {});
 }
 
@@ -34,7 +34,7 @@ const makeQuery = <P: mixed, M: mixed>(
   const getBy = (matcher: M) => {
     try {
       return instance.find(
-        node => isNodeValid(node) && matcherFn(node.props[name], matcher)
+        (node) => isNodeValid(node) && matcherFn(node.props[name], matcher)
       );
     } catch (error) {
       throw new ErrorWithStack(prepareErrorMessage(error), getBy);
@@ -43,7 +43,7 @@ const makeQuery = <P: mixed, M: mixed>(
 
   const getAllBy = (matcher: M) => {
     const results = instance.findAll(
-      node => isNodeValid(node) && matcherFn(node.props[name], matcher)
+      (node) => isNodeValid(node) && matcherFn(node.props[name], matcher)
     );
 
     if (results.length === 0) {
diff --git a/src/render.js b/src/render.js
index 658aba1c1..3adfcc8d7 100644
--- a/src/render.js
+++ b/src/render.js
@@ -68,7 +68,7 @@ function updateWithAct(
   renderer: ReactTestRenderer,
   wrap: (innerElement: React.Element<any>) => React.Element<any>
 ) {
-  return function(component: React.Element<any>) {
+  return function (component: React.Element<any>) {
     act(() => {
       renderer.update(wrap(component));
     });
@@ -79,6 +79,6 @@ function debug(instance: ReactTestInstance, renderer) {
   function debugImpl(message?: string) {
     return debugDeep(renderer.toJSON(), message);
   }
-  debugImpl.shallow = message => debugShallow(instance, message);
+  debugImpl.shallow = (message) => debugShallow(instance, message);
   return debugImpl;
 }
diff --git a/src/waitForElement.js b/src/waitForElement.js
index 2905104da..5072a99b9 100644
--- a/src/waitForElement.js
+++ b/src/waitForElement.js
@@ -6,7 +6,7 @@ export default function waitForElement<T>(
 ): Promise<T> {
   const startTime = Date.now();
   return new Promise((resolve, reject) => {
-    const rejectOrRerun = error => {
+    const rejectOrRerun = (error) => {
       if (Date.now() - startTime >= timeout) {
         reject(error);
         return;
diff --git a/yarn.lock b/yarn.lock
index a20bfc4fc..682303209 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -738,23 +738,26 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@callstack/eslint-config@^9.1.0":
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/@callstack/eslint-config/-/eslint-config-9.1.0.tgz#098e400f0d92be8cca375b8f03bb7594179e5856"
-  integrity sha512-mesv2gOOkb+tf80LbCWd2A05cZ5W7U/UGTwJxxDoeU/rw9XI8qWsBWkwpuY73MxFH+zzSqqSsDn9O3UfOxhpeg==
+"@callstack/eslint-config@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@callstack/eslint-config/-/eslint-config-10.0.0.tgz#d7a6c1e950dbc27c65b486c403a6e8ab17d61756"
+  integrity sha512-VywLiGompJeUEHAEVt20Y66k5z6016F7r2cEHB7/SQMjtcK9Cftakp7KJcH0acgbyaSciGV2hzDuwd8402YJGw==
   dependencies:
+    "@typescript-eslint/eslint-plugin" "^2.31.0"
+    "@typescript-eslint/parser" "^2.31.0"
     babel-eslint "^10.0.3"
-    eslint-config-prettier "^6.7.0"
+    eslint-config-prettier "^6.10.1"
     eslint-plugin-flowtype "^4.5.2"
     eslint-plugin-import "^2.19.1"
     eslint-plugin-jest "^23.1.1"
-    eslint-plugin-prettier "^3.1.1"
+    eslint-plugin-prettier "^3.1.3"
     eslint-plugin-promise "^4.2.1"
     eslint-plugin-react "^7.17.0"
-    eslint-plugin-react-hooks "^2.3.0"
+    eslint-plugin-react-hooks "^4.0.0"
     eslint-plugin-react-native "^3.8.1"
+    eslint-plugin-react-native-a11y "^2.0.0"
     eslint-restricted-globals "^0.2.0"
-    prettier "^1.19.1"
+    prettier "^2.0.4"
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"
@@ -1412,6 +1415,11 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
+"@types/eslint-visitor-keys@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
+  integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
+
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -1553,6 +1561,26 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@typescript-eslint/eslint-plugin@^2.31.0":
+  version "2.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.33.0.tgz#d6c8319d5011b4783bb3d2dadf105d8bdd499bd5"
+  integrity sha512-QV6P32Btu1sCI/kTqjTNI/8OpCYyvlGjW5vD8MpTIg+HGE5S88HtT1G+880M4bXlvXj/NjsJJG0aGcVh0DdbeQ==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "2.33.0"
+    functional-red-black-tree "^1.0.1"
+    regexpp "^3.0.0"
+    tsutils "^3.17.1"
+
+"@typescript-eslint/experimental-utils@2.33.0":
+  version "2.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.33.0.tgz#000f1e5f344fbea1323dc91cc174805d75f99a03"
+  integrity sha512-qzPM2AuxtMrRq78LwyZa8Qn6gcY8obkIrBs1ehqmQADwkYzTE1Pb4y2W+U3rE/iFkSWcWHG2LS6MJfj6SmHApg==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/typescript-estree" "2.33.0"
+    eslint-scope "^5.0.0"
+    eslint-utils "^2.0.0"
+
 "@typescript-eslint/experimental-utils@^2.5.0":
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz#3cb8060de9265ba131625a96bbfec31ba6d4a0fe"
@@ -1563,6 +1591,16 @@
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
+"@typescript-eslint/parser@^2.31.0":
+  version "2.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.33.0.tgz#395c0ef229ebef883608f8632a34f0acf02b9bdd"
+  integrity sha512-AUtmwUUhJoH6yrtxZMHbRUEMsC2G6z5NSxg9KsROOGqNXasM71I8P2NihtumlWTUCRld70vqIZ6Pm4E5PAziEA==
+  dependencies:
+    "@types/eslint-visitor-keys" "^1.0.0"
+    "@typescript-eslint/experimental-utils" "2.33.0"
+    "@typescript-eslint/typescript-estree" "2.33.0"
+    eslint-visitor-keys "^1.1.0"
+
 "@typescript-eslint/typescript-estree@2.29.0":
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz#1be6612bb02fc37ac9f466521c1459a4744e8d3a"
@@ -1576,6 +1614,19 @@
     semver "^6.3.0"
     tsutils "^3.17.1"
 
+"@typescript-eslint/typescript-estree@2.33.0":
+  version "2.33.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.33.0.tgz#33504c050ccafd38f397a645d4e9534d2eccbb5c"
+  integrity sha512-d8rY6/yUxb0+mEwTShCQF2zYQdLlqihukNfG9IUlLYz5y1CH6G/9XYbrxQLq3Z14RNvkCC6oe+OcFlyUpwUbkg==
+  dependencies:
+    debug "^4.1.1"
+    eslint-visitor-keys "^1.1.0"
+    glob "^7.1.6"
+    is-glob "^4.0.1"
+    lodash "^4.17.15"
+    semver "^7.3.2"
+    tsutils "^3.17.1"
+
 JSONStream@^1.0.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
@@ -1888,6 +1939,11 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
+ast-types-flow@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
@@ -3328,7 +3384,7 @@ escodegen@^1.14.1:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@^6.7.0:
+eslint-config-prettier@^6.10.1:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"
   integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==
@@ -3383,7 +3439,7 @@ eslint-plugin-jest@^23.1.1:
   dependencies:
     "@typescript-eslint/experimental-utils" "^2.5.0"
 
-eslint-plugin-prettier@^3.1.1:
+eslint-plugin-prettier@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz#ae116a0fc0e598fdae48743a4430903de5b4e6ca"
   integrity sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==
@@ -3395,10 +3451,19 @@ eslint-plugin-promise@^4.2.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
   integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
 
-eslint-plugin-react-hooks@^2.3.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz#4ef5930592588ce171abeb26f400c7fbcbc23cd0"
-  integrity sha512-Y2c4b55R+6ZzwtTppKwSmK/Kar8AdLiC2f9NADCuxbcTgPPg41Gyqa6b9GppgXSvCtkRw43ZE86CT5sejKC6/g==
+eslint-plugin-react-hooks@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.0.2.tgz#03700ca761eacc1b6436074c456f90a8e331ff28"
+  integrity sha512-kAMRjNztrLW1rK+81X1NwMB2LqG+nc7Q8AibnG8/VyWhQK8SP6JotCFG+HL4u1EjziplxVz4jARdR8gGk8pLDA==
+
+eslint-plugin-react-native-a11y@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-native-a11y/-/eslint-plugin-react-native-a11y-2.0.0.tgz#073a9cd6a15dd4d157f71d875e02671fdad57d37"
+  integrity sha512-GGObfzttlR3bs8sy25/r5Rw3/7cfbigi/uIlvqTg/lUSzmzljrhXf7lkwKKDJh0O21XVxrVDz94BAqXU5wU+xw==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+    ast-types-flow "^0.0.7"
+    jsx-ast-utils "^2.2.3"
 
 eslint-plugin-react-native-globals@^0.1.1:
   version "0.1.2"
@@ -7187,10 +7252,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
-  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+prettier@^2.0.4:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
+  integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
 
 pretty-format@^24.0.0, pretty-format@^24.7.0, pretty-format@^24.9.0:
   version "24.9.0"
@@ -7585,6 +7650,11 @@ regexpp@^2.0.1:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
+regexpp@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+
 regexpu-core@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"

From 021d8313c6739638b5a890b7a4857a0dfff1204b Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Fri, 15 May 2020 12:48:54 +0200
Subject: [PATCH 08/16] Trying to fix CI build

---
 yarn.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 682303209..a8c882b1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1355,7 +1355,7 @@
   dependencies:
     defer-to-connect "^2.0.0"
 
-"@testing-library/jest-native@^3.1.0":
+"@testing-library/jest-native@~3.1.0":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@testing-library/jest-native/-/jest-native-3.1.0.tgz#414c834dfb524ca82b86509d5479e365d4d5bbec"
   integrity sha512-MZdsTsD6xrP5V0FTz2gVPG00ZMoKn4WniRitUH40zZTQ0DfMa5CVDpkAd5ed6qX1coDwS8vSCZS/JGMIDYjRQQ==

From 0c902dffe2928a44a57b5a96ee322f905e9af054 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Fri, 15 May 2020 14:06:52 +0200
Subject: [PATCH 09/16] Added $FlowFixMe for missing flow expect extensions

---
 src/__tests__/jest-native.test.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/__tests__/jest-native.test.js b/src/__tests__/jest-native.test.js
index c6ed89854..524a7eada 100644
--- a/src/__tests__/jest-native.test.js
+++ b/src/__tests__/jest-native.test.js
@@ -31,7 +31,10 @@ test('jest-native matchers work correctly', () => {
     </View>
   );
 
+  // $FlowFixMe - TODO: fix @testing-library/jest-native flow typings
   expect(getByText('Enabled Button')).toBeEnabled();
+
+  // $FlowFixMe - TODO: fix @testing-library/jest-native flow typings
   expect(getByText('Disabled Button')).not.toBeEnabled();
 
   expect(getByText('Disabled Button')).toBeDisabled();
@@ -42,17 +45,21 @@ test('jest-native matchers work correctly', () => {
   expect(getByA11yHint('Not Empty Text')).not.toBeEmpty();
   expect(getByA11yHint('Not Empty View')).not.toBeEmpty();
 
+  // $FlowFixMe - TODO: fix @testing-library/jest-native flow typings
   expect(getByA11yHint('Container View')).toContainElement(
     getByA11yHint('First-Level Child')
   );
+  // $FlowFixMe - TODO: fix @testing-library/jest-native flow typings
   expect(getByA11yHint('Container View')).toContainElement(
     getByText('Second-Level Child')
   );
+  // $FlowFixMe - TODO: fix @testing-library/jest-native flow typings
   expect(getByA11yHint('Container View')).not.toContainElement(
     getByText('Enabled Button')
   );
 
   expect(getByA11yHint('Not Empty Text')).toHaveTextContent('Not empty');
+  // $FlowFixMe - TODO: fix @testing-library/jest-native flow typings
   expect(getByA11yHint('Not Empty Text')).toHaveTextContent(/Not empty/);
   expect(getByA11yHint('Not Empty Text')).not.toHaveTextContent('Is empty');
 

From a779dd7b906d51a0893dcf69043cc3454f2971a7 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Fri, 15 May 2020 14:15:26 +0200
Subject: [PATCH 10/16] Small doc fixes

---
 README.md                      | 12 ++++++++----
 website/docs/GettingStarted.md | 13 ++++++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 2852ea0f1..8b5a476be 100644
--- a/README.md
+++ b/README.md
@@ -65,11 +65,13 @@ You can find the source of `QuestionsBoard` component and this example [here](ht
 Open a Terminal in your project's folder and run:
 
 #### Using `yarn`
+
 ```sh
 yarn add --dev react-native-testing-library
 ```
 
 #### Using `npm`
+
 ```sh
 npm install --save-dev react-native-testing-library
 ```
@@ -78,24 +80,26 @@ This library has a peerDependencies listing for `react-test-renderer` and, of co
 
 ### Additional jest matchers
 
-In order to use addtional React Native-specific jest matchers from [@testing-library/jest-native](https://github.com/testing-library/jest-native) add it to your project:
+In order to use addtional React Native-specific jest matchers from [@testing-library/jest-native](https://github.com/testing-library/jest-native) package add it to your project:
 
 #### Using `yarn`
+
 ```sh
 yarn add --dev @testing-library/jest-native
 ```
 
 #### Using `npm`
+
 ```sh
 npm install --save-dev @testing-library/jest-native
 ```
 
-Then add following line to your jest.config.js:
+Then automatically add it to your jest tests by using `setupFilesAfterEnv` option in the `jest.config.js` file:
 
 ```js
 module.exports = {
-  setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect']
-}
+  setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect'],
+};
 ```
 
 ### Flow
diff --git a/website/docs/GettingStarted.md b/website/docs/GettingStarted.md
index 51f902b4d..e6e44aa23 100644
--- a/website/docs/GettingStarted.md
+++ b/website/docs/GettingStarted.md
@@ -51,11 +51,13 @@ You can find the source of `QuestionsBoard` component and this example [here](ht
 Open a Terminal in your project's folder and run:
 
 #### Using `yarn`
+
 ```sh
 yarn add --dev react-native-testing-library
 ```
 
 #### Using `npm`
+
 ```sh
 npm install --save-dev react-native-testing-library
 ```
@@ -66,23 +68,24 @@ As you may have noticed, it's not tied to React Native at all – you can safely
 
 ### Additional jest matchers
 
-In order to use addtional React Native-specific jest matchers from [@testing-library/jest-native](https://github.com/testing-library/jest-native) add it to your project:
+In order to use addtional React Native-specific jest matchers from [@testing-library/jest-native](https://github.com/testing-library/jest-native) package add it to your project:
 
 #### Using `yarn`
+
 ```sh
 yarn add --dev @testing-library/jest-native
 ```
 
 #### Using `npm`
+
 ```sh
 npm install --save-dev @testing-library/jest-native
 ```
 
-Then add following line to your jest.config.js:
+Then automatically add it to your jest tests by using `setupFilesAfterEnv` option in the `jest.config.js` file:
 
 ```js
 module.exports = {
-  setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect']
-}
+  setupFilesAfterEnv: ['@testing-library/jest-native/extend-expect'],
+};
 ```
-

From 57390e15a3e9495a10e45093951b38bd69339c3e Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Fri, 15 May 2020 14:20:38 +0200
Subject: [PATCH 11/16] Clarified failing toHaveProps matcher tests

---
 src/__tests__/jest-native.test.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/__tests__/jest-native.test.js b/src/__tests__/jest-native.test.js
index 524a7eada..0abbcbe7a 100644
--- a/src/__tests__/jest-native.test.js
+++ b/src/__tests__/jest-native.test.js
@@ -4,6 +4,7 @@ import React from 'react';
 import { StyleSheet, View, Button, Text } from 'react-native';
 import { render } from '..';
 import '@testing-library/jest-native/extend-expect';
+import { TestScheduler } from 'jest';
 
 const style = StyleSheet.create({
   style1: {
@@ -75,27 +76,16 @@ test('jest-native matchers work correctly', () => {
   });
 });
 
-test.skip('currently failing jest-native matchers tests', () => {
+test.skip('toHaveProp matchers works correctly', () => {
   const { getByText, getByA11yHint } = render(
     <View>
       <Button title="Enabled Button" onPress={jest.fn()} />
-      <Button title="Disabled Button" disabled={true} onPress={jest.fn()} />
-      <Text accessibilityHint="Empty Text" style={style.style1} />
       <Text accessibilityHint="Not Empty Text">Not empty</Text>
-      <View accessibilityHint="Empty View" />
-      <View accessibilityHint="Not Empty View">
-        <Text />
-      </View>
-      <View accessibilityHint="Container View">
-        <View accessibilityHint="First-Level Child">
-          <Text>Second-Level Child</Text>
-        </View>
-      </View>
     </View>
   );
 
+  // All of the following lines using `toHaveProp` matchers, because it things the looked up prop is `null`.
   expect(getByText('Enabled Button')).toHaveProp('title');
   expect(getByText('Enabled Button')).toHaveProp('title', 'Enabled Button');
-  expect(getByText('Enabled Button')).not.toHaveProp('title', 'Button');
   expect(getByA11yHint('Not Empty Text')).toHaveProp('text', 'Not empty');
 });

From 3a6ed180047e79904479ac6a5434c46560992100 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Fri, 15 May 2020 14:24:11 +0200
Subject: [PATCH 12/16] Moved lint ignore for color literals to .eslintrc

---
 .eslintrc                         | 3 ++-
 src/__tests__/jest-native.test.js | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 4e273da18..ef6fdaab7 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -10,6 +10,7 @@
       2,
       { "ignore": ["^@theme", "^@docusaurus", "^@generated"] }
     ],
-    "react-native-a11y/has-valid-accessibility-ignores-invert-colors": 0
+    "react-native-a11y/has-valid-accessibility-ignores-invert-colors": 0,
+    "react-native/no-color-literals": "off"
   }
 }
diff --git a/src/__tests__/jest-native.test.js b/src/__tests__/jest-native.test.js
index 0abbcbe7a..d37bee5f2 100644
--- a/src/__tests__/jest-native.test.js
+++ b/src/__tests__/jest-native.test.js
@@ -1,10 +1,8 @@
 // @flow
-/* eslint-disable react-native/no-color-literals */
 import React from 'react';
 import { StyleSheet, View, Button, Text } from 'react-native';
 import { render } from '..';
 import '@testing-library/jest-native/extend-expect';
-import { TestScheduler } from 'jest';
 
 const style = StyleSheet.create({
   style1: {

From 06a2ef7ef8b904252aca1d753c18be4458522d6f Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Fri, 15 May 2020 15:41:54 +0200
Subject: [PATCH 13/16] Updated toHaveProp tests to avoid strange `Button`
 behavior

---
 src/__tests__/jest-native.test.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/__tests__/jest-native.test.js b/src/__tests__/jest-native.test.js
index d37bee5f2..741d8d1b8 100644
--- a/src/__tests__/jest-native.test.js
+++ b/src/__tests__/jest-native.test.js
@@ -1,6 +1,6 @@
 // @flow
 import React from 'react';
-import { StyleSheet, View, Button, Text } from 'react-native';
+import { StyleSheet, View, Button, Text, TextInput } from 'react-native';
 import { render } from '..';
 import '@testing-library/jest-native/extend-expect';
 
@@ -27,6 +27,12 @@ test('jest-native matchers work correctly', () => {
           <Text>Second-Level Child</Text>
         </View>
       </View>
+      <TextInput
+        accessibilityHint="Text Input"
+        allowFontScaling={false}
+        secureTextEntry={true}
+        defaultValue="111"
+      />
     </View>
   );
 
@@ -72,18 +78,13 @@ test('jest-native matchers work correctly', () => {
     color: 'green',
     backgroundColor: 'green',
   });
-});
-
-test.skip('toHaveProp matchers works correctly', () => {
-  const { getByText, getByA11yHint } = render(
-    <View>
-      <Button title="Enabled Button" onPress={jest.fn()} />
-      <Text accessibilityHint="Not Empty Text">Not empty</Text>
-    </View>
-  );
 
-  // All of the following lines using `toHaveProp` matchers, because it things the looked up prop is `null`.
-  expect(getByText('Enabled Button')).toHaveProp('title');
-  expect(getByText('Enabled Button')).toHaveProp('title', 'Enabled Button');
-  expect(getByA11yHint('Not Empty Text')).toHaveProp('text', 'Not empty');
+  const textInput = getByA11yHint('Text Input');
+  expect(textInput).toBeTruthy();
+  expect(textInput).toHaveProp('allowFontScaling');
+  expect(textInput).toHaveProp('allowFontScaling', false);
+  expect(textInput).toHaveProp('secureTextEntry');
+  expect(textInput).toHaveProp('secureTextEntry', true);
+  expect(textInput).toHaveProp('defaultValue');
+  expect(textInput).toHaveProp('defaultValue', '111');
 });

From 0e556f3b298453d50cb239b62c02bc9c3c1ef1e8 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 09:25:05 +0200
Subject: [PATCH 14/16] Updated yarn.lock

---
 yarn.lock | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index 9d02c0d20..795a6b815 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1311,6 +1311,18 @@
   dependencies:
     defer-to-connect "^2.0.0"
 
+"@testing-library/jest-native@~3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/jest-native/-/jest-native-3.1.0.tgz#414c834dfb524ca82b86509d5479e365d4d5bbec"
+  integrity sha512-MZdsTsD6xrP5V0FTz2gVPG00ZMoKn4WniRitUH40zZTQ0DfMa5CVDpkAd5ed6qX1coDwS8vSCZS/JGMIDYjRQQ==
+  dependencies:
+    chalk "^2.4.1"
+    jest-diff "^24.0.0"
+    jest-matcher-utils "^24.0.0"
+    pretty-format "^24.0.0"
+    ramda "^0.26.1"
+    redent "^2.0.0"
+
 "@types/babel__core@^7.1.7":
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
@@ -3152,6 +3164,11 @@ detect-repo-changelog@1.0.1:
     lodash.find "^4.6.0"
     pify "^2.3.0"
 
+diff-sequences@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
+  integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==
+
 diff-sequences@^26.0.0:
   version "26.0.0"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6"
@@ -5007,6 +5024,16 @@ jest-config@^26.0.1:
     micromatch "^4.0.2"
     pretty-format "^26.0.1"
 
+jest-diff@^24.0.0, jest-diff@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
+  integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
+  dependencies:
+    chalk "^2.0.1"
+    diff-sequences "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
+
 jest-diff@^26.0.1:
   version "26.0.1"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.0.1.tgz#c44ab3cdd5977d466de69c46929e0e57f89aa1de"
@@ -5138,6 +5165,16 @@ jest-leak-detector@^26.0.1:
     jest-get-type "^26.0.0"
     pretty-format "^26.0.1"
 
+jest-matcher-utils@^24.0.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz#f5b3661d5e628dffe6dd65251dfdae0e87c3a073"
+  integrity sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==
+  dependencies:
+    chalk "^2.0.1"
+    jest-diff "^24.9.0"
+    jest-get-type "^24.9.0"
+    pretty-format "^24.9.0"
+
 jest-matcher-utils@^26.0.1:
   version "26.0.1"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.0.1.tgz#12e1fc386fe4f14678f4cc8dbd5ba75a58092911"
@@ -7161,7 +7198,7 @@ prettier@^2.0.4:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
   integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
 
-pretty-format@^24.7.0, pretty-format@^24.9.0:
+pretty-format@^24.0.0, pretty-format@^24.7.0, pretty-format@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
   integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
@@ -7297,6 +7334,11 @@ quick-lru@^5.0.0:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.0.tgz#1602f339bde554c4dace47880227ec9c2869f2e8"
   integrity sha512-WjAKQ9ORzvqjLijJXiXWqc3Gcs1ivoxCj6KJmEjoWBE6OtHwuaDLSAUqGHALUiid7A1KqGqsSHZs8prxF5xxAQ==
 
+ramda@^0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
+  integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
+
 range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"

From d5c112e503f17ca69061bbc8ba59c565fcef2d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= <thymikee@gmail.com>
Date: Mon, 18 May 2020 09:32:00 +0200
Subject: [PATCH 15/16] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8b5a476be..2bf662c11 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ npm install --save-dev react-native-testing-library
 
 This library has a peerDependencies listing for `react-test-renderer` and, of course, `react`. Make sure to install them too!
 
-### Additional jest matchers
+### Additional Jest matchers
 
 In order to use addtional React Native-specific jest matchers from [@testing-library/jest-native](https://github.com/testing-library/jest-native) package add it to your project:
 

From a339f49840328a975438df057da9caa5f42ae961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= <thymikee@gmail.com>
Date: Mon, 18 May 2020 09:32:06 +0200
Subject: [PATCH 16/16] Update website/docs/GettingStarted.md

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

diff --git a/website/docs/GettingStarted.md b/website/docs/GettingStarted.md
index e6e44aa23..dc69fac3e 100644
--- a/website/docs/GettingStarted.md
+++ b/website/docs/GettingStarted.md
@@ -66,7 +66,7 @@ This library has a peerDependencies listing for `react-test-renderer` and, of co
 
 As you may have noticed, it's not tied to React Native at all – you can safely use it in your React components if you feel like not interacting directly with DOM.
 
-### Additional jest matchers
+### Additional Jest matchers
 
 In order to use addtional React Native-specific jest matchers from [@testing-library/jest-native](https://github.com/testing-library/jest-native) package add it to your project: