From d579ee837fce82056ebac4cdb689a64f2eaaba3a Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 16:41:50 +0200
Subject: [PATCH 01/19] WIP

---
 src/helpers/errors.js   | 14 ++++++++++++++
 src/helpers/getByAPI.js | 20 +++++++++++---------
 src/shallow.js          |  4 +---
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/helpers/errors.js b/src/helpers/errors.js
index edf108cbc..3980453d6 100644
--- a/src/helpers/errors.js
+++ b/src/helpers/errors.js
@@ -54,6 +54,20 @@ export function printDeprecationWarning(functionName: string) {
   warned[functionName] = true;
 }
 
+export function throwRemovedFunctionError(
+  functionName: string,
+  docsHash: string
+) {
+  if (warned[functionName]) {
+    return;
+  }
+
+  warned[functionName] = true;
+  throw new Error(
+    `${functionName} has been removed in version 2.0.\n\nPlease consult the migration guide: https://callstack.github.io/react-native-testing-library/docs/migration-v2#${docsHash}`
+  );
+}
+
 export function printUnsafeWarning(functionName: string) {
   if (warned[functionName]) {
     return;
diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index cc6079607..68b037048 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -5,7 +5,7 @@ import {
   ErrorWithStack,
   createLibraryNotSupportedError,
   prepareErrorMessage,
-  printDeprecationWarning,
+  throwRemovedFunctionError,
   printUnsafeWarning,
 } from './errors';
 
@@ -259,24 +259,26 @@ export const getAllByTestId = (instance: ReactTestInstance) =>
   };
 
 export const getByAPI = (instance: ReactTestInstance) => ({
-  getByTestId: getByTestId(instance),
-  getByName: getByName(instance, printDeprecationWarning),
-  getByType: getByType(instance, printUnsafeWarning),
   getByText: getByText(instance),
   getByPlaceholder: getByPlaceholder(instance),
   getByDisplayValue: getByDisplayValue(instance),
-  getByProps: getByProps(instance, printUnsafeWarning),
-  getAllByTestId: getAllByTestId(instance),
-  getAllByName: getAllByName(instance, printDeprecationWarning),
-  getAllByType: getAllByType(instance, printUnsafeWarning),
+  getByTestId: getByTestId(instance),
   getAllByText: getAllByText(instance),
   getAllByPlaceholder: getAllByPlaceholder(instance),
   getAllByDisplayValue: getAllByDisplayValue(instance),
-  getAllByProps: getAllByProps(instance, printUnsafeWarning),
+  getAllByTestId: getAllByTestId(instance),
 
   // Unsafe aliases
   UNSAFE_getByType: getByType(instance),
   UNSAFE_getAllByType: getAllByType(instance),
   UNSAFE_getByProps: getByProps(instance),
   UNSAFE_getAllByProps: getAllByProps(instance),
+
+  // Removed
+  getByName: () => throwRemovedFunctionError('getByName'),
+  getAllByName: () => throwRemovedFunctionError('getAllByName'),
+  getByType: () => throwRemovedFunctionError('getByType'),
+  getAllByType: () => throwRemovedFunctionError('getAllByType'),
+  getByProps: () => throwRemovedFunctionError('getByProps'),
+  getAllByProps: () => throwRemovedFunctionError('getAllByProps'),
 });
diff --git a/src/shallow.js b/src/shallow.js
index 576ac913a..60b1bd847 100644
--- a/src/shallow.js
+++ b/src/shallow.js
@@ -21,7 +21,5 @@ export function shallowInternal(
 export default function shallow(
   instance: ReactTestInstance | React.Element<any>
 ) {
-  printDeprecationWarning('shallow');
-
-  return shallowInternal(instance);
+  throwRemovedFunctionError('shallow');
 }

From b1a43f190893cc8c96abe1f27dfc48a80e1e80c6 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 17:08:06 +0200
Subject: [PATCH 02/19] More changes

---
 README.md                   |  2 +-
 src/helpers/errors.js       | 37 +++++++------------------------------
 website/docs/Migration20.md | 21 +++++++++++++++++++--
 website/sidebars.js         |  2 +-
 4 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/README.md b/README.md
index 72655a7a7..1c2dfad9d 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,7 @@ The [public API](https://callstack.github.io/react-native-testing-library/docs/a
 
 ## Migration Guides
 
-- [Migration to 2.0](https://callstack.github.io/react-native-testing-library/docs/migration20)
+- [Migration to 2.0](https://callstack.github.io/react-native-testing-library/docs/migration-v2)
 
 ## Made with ❤️ at Callstack
 
diff --git a/src/helpers/errors.js b/src/helpers/errors.js
index 3980453d6..43c68dea4 100644
--- a/src/helpers/errors.js
+++ b/src/helpers/errors.js
@@ -24,22 +24,7 @@ export const createQueryByError = (error: Error, callsite: Function) => {
   throw new ErrorWithStack(error.message, callsite);
 };
 
-const warned = {
-  getByName: false,
-  getAllByName: false,
-  queryByName: false,
-  queryAllByName: false,
-
-  getByProps: false,
-  getAllByProps: false,
-  queryByProps: false,
-  queryAllByProps: false,
-
-  getByType: false,
-  getAllByType: false,
-  queryByType: false,
-  queryAllByType: false,
-};
+const warned = {};
 
 export function printDeprecationWarning(functionName: string) {
   if (warned[functionName]) {
@@ -54,20 +39,6 @@ export function printDeprecationWarning(functionName: string) {
   warned[functionName] = true;
 }
 
-export function throwRemovedFunctionError(
-  functionName: string,
-  docsHash: string
-) {
-  if (warned[functionName]) {
-    return;
-  }
-
-  warned[functionName] = true;
-  throw new Error(
-    `${functionName} has been removed in version 2.0.\n\nPlease consult the migration guide: https://callstack.github.io/react-native-testing-library/docs/migration-v2#${docsHash}`
-  );
-}
-
 export function printUnsafeWarning(functionName: string) {
   if (warned[functionName]) {
     return;
@@ -81,3 +52,9 @@ export function printUnsafeWarning(functionName: string) {
 
   warned[functionName] = true;
 }
+
+export function throwRemovedFunctionError(functionName: string) {
+  throw new Error(
+    `${functionName} has been removed in version 2.0.\n\nPlease consult the migration guide: https://callstack.github.io/react-native-testing-library/docs/migration-v2#removed-functions'`
+  );
+}
diff --git a/website/docs/Migration20.md b/website/docs/Migration20.md
index d4f69eb58..47a32490e 100644
--- a/website/docs/Migration20.md
+++ b/website/docs/Migration20.md
@@ -1,15 +1,32 @@
 ---
-id: migration20
+id: migration-v2
 title: Migration to 2.0
 ---
 
 This guides describes major steps involved in migrating your testing code from using React Native Testing Library version `1.x` to version `2.0`.
 
-
 ## Removed global `debug` function
 
 Global debug function has been removed in favor of `debug()` method returned from `render()` function.
 
+## Removed functions
+
+Following query fuctions have been removed after being deprecated:
+
+- `getByName`
+- `getAllByName`
+- `queryByName`
+- `queryAllByName`
+
+Following query functions have been prefixes with `UNSAFE_`:
+
+- `UNSAFE_getByType`
+- `UNSAFE_getAllByType`
+- `UNSAFE_getByProps`
+- `UNSAFE_getAllByProps`
+
+Global `shallow` debug functions has been removed after being deprecated.
+
 ## Some `byTestId` queries behavior changes
 
 In version `1.x` `getByTestId` and `queryByTestId` could return non-native elements in tests. This was in contrast with other query functions: `getAllByTestId`, `queryAllByTestId`, `findByTestId` and `findAllByTestId` which returned only elements that would be rendered to native components (e.g. `View`, `Text`, etc).
diff --git a/website/sidebars.js b/website/sidebars.js
index d3c764e26..1d5e0411a 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -2,7 +2,7 @@ module.exports = {
   docs: {
     Introduction: ['getting-started'],
     'API Reference': ['api', 'api-queries'],
-    Guides: ['migration20'],
+    Guides: ['migration-v2'],
     Examples: ['react-navigation', 'redux-integration'],
   },
 };

From f78ebf3b6a4a7871c4b1fdb7b6f317f6a5cde49f Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Mon, 18 May 2020 17:35:42 +0200
Subject: [PATCH 03/19] WIP

---
 src/__tests__/waitForElement.test.js | 10 ++++++----
 src/helpers/getByAPI.js              |  1 -
 src/shallow.js                       |  6 ++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/__tests__/waitForElement.test.js b/src/__tests__/waitForElement.test.js
index 8867a4a5e..9d6dfbe3c 100644
--- a/src/__tests__/waitForElement.test.js
+++ b/src/__tests__/waitForElement.test.js
@@ -36,9 +36,11 @@ class BananaContainer extends React.Component<{}, any> {
 }
 
 test('waits for element until it stops throwing', async () => {
-  const { getByText, getByName, queryByText } = render(<BananaContainer />);
+  const { getByText, UNSAFE_getByName, queryByText } = render(
+    <BananaContainer />
+  );
 
-  fireEvent.press(getByName('TouchableOpacity'));
+  fireEvent.press(UNSAFE_getByName('TouchableOpacity'));
 
   expect(queryByText('Fresh')).toBeNull();
 
@@ -48,9 +50,9 @@ test('waits for element until it stops throwing', async () => {
 });
 
 test('waits for element until timeout is met', async () => {
-  const { getByText, getByName } = render(<BananaContainer />);
+  const { getByText, UNSAFE_getByName } = render(<BananaContainer />);
 
-  fireEvent.press(getByName('TouchableOpacity'));
+  fireEvent.press(UNSAFE_getByName('TouchableOpacity'));
 
   await expect(waitForElement(() => getByText('Fresh'), 100)).rejects.toThrow();
 });
diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index 68b037048..50f81190b 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -6,7 +6,6 @@ import {
   createLibraryNotSupportedError,
   prepareErrorMessage,
   throwRemovedFunctionError,
-  printUnsafeWarning,
 } from './errors';
 
 const filterNodeByType = (node, type) => node.type === type;
diff --git a/src/shallow.js b/src/shallow.js
index 60b1bd847..c9a63ae22 100644
--- a/src/shallow.js
+++ b/src/shallow.js
@@ -1,7 +1,7 @@
 // @flow
 import * as React from 'react';
 import ShallowRenderer from 'react-test-renderer/shallow'; // eslint-disable-line import/no-extraneous-dependencies
-import { printDeprecationWarning } from './helpers/errors';
+import { throwRemovedFunctionError } from './helpers/errors';
 
 /**
  * Renders test component shallowly using react-test-renderer/shallow
@@ -18,8 +18,6 @@ export function shallowInternal(
   };
 }
 
-export default function shallow(
-  instance: ReactTestInstance | React.Element<any>
-) {
+export default function shallow(_: ReactTestInstance | React.Element<any>) {
   throwRemovedFunctionError('shallow');
 }

From 086a94422ac7027d9c285d2b3e465706f7838c9b Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 09:26:30 +0200
Subject: [PATCH 04/19] Added throwRemovedFunctionError docsRef

---
 src/__tests__/shallow.test.js | 27 ---------------------------
 src/helpers/errors.js         |  7 +++++--
 src/helpers/getByAPI.js       | 21 +++++++++++++++------
 src/index.js                  |  4 ++--
 src/shallow.js                |  5 ++++-
 src/waitFor.js                | 15 +++++++++++++++
 website/docs/Migration20.md   |  8 +++-----
 7 files changed, 44 insertions(+), 43 deletions(-)
 delete mode 100644 src/__tests__/shallow.test.js

diff --git a/src/__tests__/shallow.test.js b/src/__tests__/shallow.test.js
deleted file mode 100644
index a31af6c12..000000000
--- a/src/__tests__/shallow.test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// @flow
-import React from 'react';
-import { View, Text } from 'react-native';
-import { shallow, render } from '..';
-
-type Props = {|
-  +dummyID?: string,
-|};
-
-const TextPress = ({ dummyID }: Props) => (
-  <View testID={dummyID}>
-    <Text testID="text-button">Press me</Text>
-  </View>
-);
-
-test('shallow rendering React elements', () => {
-  const { output } = shallow(<TextPress dummyID="2" />);
-
-  expect(output).toMatchSnapshot();
-});
-
-test('shallow rendering React Test Instance', () => {
-  const { getByText } = render(<TextPress />);
-  const { output } = shallow(getByText('Press me'));
-
-  expect(output).toMatchSnapshot();
-});
diff --git a/src/helpers/errors.js b/src/helpers/errors.js
index 43c68dea4..17a31de83 100644
--- a/src/helpers/errors.js
+++ b/src/helpers/errors.js
@@ -53,8 +53,11 @@ export function printUnsafeWarning(functionName: string) {
   warned[functionName] = true;
 }
 
-export function throwRemovedFunctionError(functionName: string) {
+export function throwRemovedFunctionError(
+  functionName: string,
+  docsRef: string
+) {
   throw new Error(
-    `${functionName} has been removed in version 2.0.\n\nPlease consult the migration guide: https://callstack.github.io/react-native-testing-library/docs/migration-v2#removed-functions'`
+    `${functionName} has been removed in version 2.0.\n\nPlease consult: https://callstack.github.io/react-native-testing-library/docs/${docsRef}`
   );
 }
diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index 50f81190b..dbb7fba91 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -274,10 +274,19 @@ export const getByAPI = (instance: ReactTestInstance) => ({
   UNSAFE_getAllByProps: getAllByProps(instance),
 
   // Removed
-  getByName: () => throwRemovedFunctionError('getByName'),
-  getAllByName: () => throwRemovedFunctionError('getAllByName'),
-  getByType: () => throwRemovedFunctionError('getByType'),
-  getAllByType: () => throwRemovedFunctionError('getAllByType'),
-  getByProps: () => throwRemovedFunctionError('getByProps'),
-  getAllByProps: () => throwRemovedFunctionError('getAllByProps'),
+  getByName: () =>
+    throwRemovedFunctionError('getByName', 'migration-v2#removed-functions'),
+  getAllByName: () =>
+    throwRemovedFunctionError('getAllByName', 'migration-v2#removed-functions'),
+  getByType: () =>
+    throwRemovedFunctionError('getByType', 'migration-v2#removed-functions'),
+  getAllByType: () =>
+    throwRemovedFunctionError('getAllByType', 'migration-v2#removed-functions'),
+  getByProps: () =>
+    throwRemovedFunctionError('getByProps', 'migration-v2#removed-functions'),
+  getAllByProps: () =>
+    throwRemovedFunctionError(
+      'getAllByProps',
+      'migration-v2#removed-functions'
+    ),
 });
diff --git a/src/index.js b/src/index.js
index 8500b3b26..534119714 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,7 +5,7 @@ import fireEvent from './fireEvent';
 import flushMicrotasksQueue from './flushMicrotasksQueue';
 import render from './render';
 import shallow from './shallow';
-import waitFor from './waitFor';
+import waitFor, { waitForElement } from './waitFor';
 import within from './within';
 
 export { act };
@@ -14,5 +14,5 @@ export { fireEvent };
 export { flushMicrotasksQueue };
 export { render };
 export { shallow };
-export { waitFor };
+export { waitFor, waitForElement };
 export { within };
diff --git a/src/shallow.js b/src/shallow.js
index c9a63ae22..4629d829a 100644
--- a/src/shallow.js
+++ b/src/shallow.js
@@ -19,5 +19,8 @@ export function shallowInternal(
 }
 
 export default function shallow(_: ReactTestInstance | React.Element<any>) {
-  throwRemovedFunctionError('shallow');
+  throwRemovedFunctionError(
+    'shallow',
+    'migration-v2#removed-global-debug-functions'
+  );
 }
diff --git a/src/waitFor.js b/src/waitFor.js
index e947f8631..be4400575 100644
--- a/src/waitFor.js
+++ b/src/waitFor.js
@@ -1,5 +1,7 @@
 // @flow
 
+import { throwRemovedFunctionError } from './helpers/errors';
+
 const DEFAULT_TIMEOUT = 4500;
 const DEFAULT_INTERVAL = 50;
 
@@ -35,3 +37,16 @@ export default function waitFor<T>(
     setTimeout(runExpectation, 0);
   });
 }
+
+export function waitForElement<T>(
+  expectation: () => T,
+  timeout: number = 4500, // eslint-disable-line no-unused-vars
+  interval: number = 50 // eslint-disable-line no-unused-vars
+): Promise<T> {
+  throwRemovedFunctionError(
+    'waitForElement',
+    'migration-v2#waitfor-api-changes'
+  );
+
+  return Promise.reject();
+}
diff --git a/website/docs/Migration20.md b/website/docs/Migration20.md
index ba51cf4fa..f8679ce0d 100644
--- a/website/docs/Migration20.md
+++ b/website/docs/Migration20.md
@@ -39,9 +39,9 @@ Both changes should improve code readibility.
 Please note that in many cases `waitFor` call can be replaced by proper use of `findBy` asynchonous queries resulting in more streamlined test code.
 :::
 
-## Removed global `debug` function
+## Removed global debug functions
 
-Global debug function has been removed in favor of `debug()` method returned from `render()` function.
+Global `debug()` and `shallow()` functions have been removed in favor of `debug()` method returned from `render()` function.
 
 ## Removed functions
 
@@ -52,15 +52,13 @@ Following query fuctions have been removed after being deprecated:
 - `queryByName`
 - `queryAllByName`
 
-Following query functions have been prefixes with `UNSAFE_`:
+Following query functions are still available but have been prefixed with `UNSAFE_`:
 
 - `UNSAFE_getByType`
 - `UNSAFE_getAllByType`
 - `UNSAFE_getByProps`
 - `UNSAFE_getAllByProps`
 
-Global `shallow` debug functions has been removed after being deprecated.
-
 ## Some `byTestId` queries behavior changes
 
 In version `1.x` `getByTestId` and `queryByTestId` could return non-native elements in tests. This was in contrast with other query functions: `getAllByTestId`, `queryAllByTestId`, `findByTestId` and `findAllByTestId` which returned only elements that would be rendered to native components (e.g. `View`, `Text`, etc).

From b98c55a8333d52996a941ce6bc35d1c22ed770c5 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 12:05:14 +0200
Subject: [PATCH 05/19] Fixed tests

---
 .../__snapshots__/render.test.js.snap         |  8 +-
 .../__snapshots__/shallow.test.js.snap        | 21 -----
 src/__tests__/render.test.js                  | 87 ++++++-------------
 src/__tests__/waitFor.test.js                 | 10 +--
 4 files changed, 35 insertions(+), 91 deletions(-)
 delete mode 100644 src/__tests__/__snapshots__/shallow.test.js.snap

diff --git a/src/__tests__/__snapshots__/render.test.js.snap b/src/__tests__/__snapshots__/render.test.js.snap
index d3c4b4d93..55a88ffb7 100644
--- a/src/__tests__/__snapshots__/render.test.js.snap
+++ b/src/__tests__/__snapshots__/render.test.js.snap
@@ -150,12 +150,12 @@ exports[`debug: shallow 1`] = `
     underlineColorAndroid=\\"transparent\\"
     value=\\"I inspected freshie\\"
   />
-  <Button
+  <MyButton
     onPress={[Function anonymous]}
     type=\\"primary\\"
   >
     Change freshness!
-  </Button>
+  </MyButton>
   <Text
     testID=\\"duplicateText\\"
   >
@@ -200,12 +200,12 @@ exports[`debug: shallow with message 1`] = `
     underlineColorAndroid=\\"transparent\\"
     value=\\"I inspected freshie\\"
   />
-  <Button
+  <MyButton
     onPress={[Function anonymous]}
     type=\\"primary\\"
   >
     Change freshness!
-  </Button>
+  </MyButton>
   <Text
     testID=\\"duplicateText\\"
   >
diff --git a/src/__tests__/__snapshots__/shallow.test.js.snap b/src/__tests__/__snapshots__/shallow.test.js.snap
deleted file mode 100644
index ac70b9743..000000000
--- a/src/__tests__/__snapshots__/shallow.test.js.snap
+++ /dev/null
@@ -1,21 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`shallow rendering React Test Instance 1`] = `
-<Text
-  testID="text-button"
->
-  Press me
-</Text>
-`;
-
-exports[`shallow rendering React elements 1`] = `
-<View
-  testID="2"
->
-  <Text
-    testID="text-button"
-  >
-    Press me
-  </Text>
-</View>
-`;
diff --git a/src/__tests__/render.test.js b/src/__tests__/render.test.js
index 045ae88c4..f4846510b 100644
--- a/src/__tests__/render.test.js
+++ b/src/__tests__/render.test.js
@@ -17,7 +17,7 @@ const PLACEHOLDER_CHEF = 'Who inspected freshness?';
 const INPUT_FRESHNESS = 'Custom Freshie';
 const INPUT_CHEF = 'I inspected freshie';
 
-class Button extends React.Component<any> {
+class MyButton extends React.Component<any> {
   render() {
     return (
       <TouchableOpacity onPress={this.props.onPress}>
@@ -68,9 +68,9 @@ class Banana extends React.Component<any, any> {
           placeholder={PLACEHOLDER_CHEF}
           value={INPUT_CHEF}
         />
-        <Button onPress={this.changeFresh} type="primary">
+        <MyButton onPress={this.changeFresh} type="primary">
           Change freshness!
-        </Button>
+        </MyButton>
         <Text testID="duplicateText">First Text</Text>
         <Text testID="duplicateText">Second Text</Text>
         <Text>{test}</Text>
@@ -109,51 +109,18 @@ test('getAllByTestId, queryAllByTestId', () => {
   expect(queryAllByTestId('nonExistentTestId')).toHaveLength(0);
 });
 
-test('getByName, queryByName', () => {
-  const { getByText, getByName, queryByName } = render(<Banana />);
-  const bananaFresh = getByText('not fresh');
-  const button = getByName('Button');
-
-  button.props.onPress();
-
-  expect(bananaFresh.props.children).toBe('fresh');
-
-  const sameButton = getByName(Button);
-  sameButton.props.onPress();
-
-  expect(bananaFresh.props.children).toBe('not fresh');
-  expect(() => getByName('InExistent')).toThrow('No instances found');
-  expect(() => getByName(Text)).toThrow('Expected 1 but found 6');
-
-  expect(queryByName('Button')).toBe(button);
-  expect(queryByName('InExistent')).toBeNull();
-});
-
-test('getAllByName, queryAllByName', () => {
-  const { getAllByName, queryAllByName } = render(<Banana />);
-  const [text, status, button] = getAllByName('Text');
-
-  expect(text.props.children).toBe('Is the banana fresh?');
-  expect(status.props.children).toBe('not fresh');
-  expect(button.props.children).toBe('Change freshness!');
-  expect(() => getAllByName('InExistent')).toThrow('No instances found');
-
-  expect(queryAllByName('Text')[1]).toBe(status);
-  expect(queryAllByName('InExistent')).toHaveLength(0);
-});
-
-test('getAllByType, queryAllByType', () => {
-  const { getAllByType, queryAllByType } = render(<Banana />);
-  const [text, status, button] = getAllByType(Text);
+test('UNSAFE_getAllByType, UNSAFE_queryAllByType', () => {
+  const { UNSAFE_getAllByType, UNSAFE_queryAllByType } = render(<Banana />);
+  const [text, status, button] = UNSAFE_getAllByType(Text);
   const InExistent = () => null;
 
   expect(text.props.children).toBe('Is the banana fresh?');
   expect(status.props.children).toBe('not fresh');
   expect(button.props.children).toBe('Change freshness!');
-  expect(() => getAllByType(InExistent)).toThrow('No instances found');
+  expect(() => UNSAFE_getAllByType(InExistent)).toThrow('No instances found');
 
-  expect(queryAllByType(Text)[1]).toBe(status);
-  expect(queryAllByType(InExistent)).toHaveLength(0);
+  expect(UNSAFE_queryAllByType(Text)[1]).toBe(status);
+  expect(UNSAFE_queryAllByType(InExistent)).toHaveLength(0);
 });
 
 test('getByText, queryByText', () => {
@@ -267,38 +234,38 @@ test('getAllByDisplayValue, queryAllByDisplayValue', () => {
   expect(queryAllByDisplayValue('no value')).toHaveLength(0);
 });
 
-test('getByProps, queryByProps', () => {
-  const { getByProps, queryByProps } = render(<Banana />);
-  const primaryType = getByProps({ type: 'primary' });
+test('UNSAFE_getByProps, UNSAFE_queryByProps', () => {
+  const { UNSAFE_getByProps, UNSAFE_queryByProps } = render(<Banana />);
+  const primaryType = UNSAFE_getByProps({ type: 'primary' });
 
   expect(primaryType.props.children).toBe('Change freshness!');
-  expect(() => getByProps({ type: 'inexistent' })).toThrow(
+  expect(() => UNSAFE_getByProps({ type: 'inexistent' })).toThrow(
     'No instances found'
   );
 
-  expect(queryByProps({ type: 'primary' })).toBe(primaryType);
-  expect(queryByProps({ type: 'inexistent' })).toBeNull();
+  expect(UNSAFE_queryByProps({ type: 'primary' })).toBe(primaryType);
+  expect(UNSAFE_queryByProps({ type: 'inexistent' })).toBeNull();
 });
 
-test('getAllByProp, queryAllByProps', () => {
-  const { getAllByProps, queryAllByProps } = render(<Banana />);
-  const primaryTypes = getAllByProps({ type: 'primary' });
+test('UNSAFE_getAllByProp, UNSAFE_queryAllByProps', () => {
+  const { UNSAFE_getAllByProps, UNSAFE_queryAllByProps } = render(<Banana />);
+  const primaryTypes = UNSAFE_getAllByProps({ type: 'primary' });
 
   expect(primaryTypes).toHaveLength(1);
-  expect(() => getAllByProps({ type: 'inexistent' })).toThrow(
+  expect(() => UNSAFE_getAllByProps({ type: 'inexistent' })).toThrow(
     'No instances found'
   );
 
-  expect(queryAllByProps({ type: 'primary' })).toEqual(primaryTypes);
-  expect(queryAllByProps({ type: 'inexistent' })).toHaveLength(0);
+  expect(UNSAFE_queryAllByProps({ type: 'primary' })).toEqual(primaryTypes);
+  expect(UNSAFE_queryAllByProps({ type: 'inexistent' })).toHaveLength(0);
 });
 
 test('update', () => {
   const fn = jest.fn();
-  const { getByName, update, rerender } = render(<Banana onUpdate={fn} />);
-  const button = getByName('Button');
+  const { getByText, update, rerender } = render(<Banana onUpdate={fn} />);
 
-  button.props.onPress();
+  const button = getByText('Change freshness!');
+  fireEvent.press(button);
 
   update(<Banana onUpdate={fn} />);
   rerender(<Banana onUpdate={fn} />);
@@ -314,7 +281,7 @@ test('unmount', () => {
 });
 
 test('toJSON', () => {
-  const { toJSON } = render(<Button>press me</Button>);
+  const { toJSON } = render(<MyButton>press me</MyButton>);
 
   expect(toJSON()).toMatchSnapshot();
 });
@@ -345,9 +312,9 @@ test('debug', () => {
 test('debug changing component', () => {
   jest.spyOn(console, 'log').mockImplementation((x) => x);
 
-  const { getByProps, debug } = render(<Banana />);
+  const { UNSAFE_getByProps, debug } = render(<Banana />);
 
-  fireEvent.press(getByProps({ type: 'primary' }));
+  fireEvent.press(UNSAFE_getByProps({ type: 'primary' }));
 
   debug();
 
diff --git a/src/__tests__/waitFor.test.js b/src/__tests__/waitFor.test.js
index fdf175edc..891c8457c 100644
--- a/src/__tests__/waitFor.test.js
+++ b/src/__tests__/waitFor.test.js
@@ -36,11 +36,9 @@ class BananaContainer extends React.Component<{}, any> {
 }
 
 test('waits for element until it stops throwing', async () => {
-  const { getByText, UNSAFE_getByName, queryByText } = render(
-    <BananaContainer />
-  );
+  const { getByText, queryByText } = render(<BananaContainer />);
 
-  fireEvent.press(UNSAFE_getByName('TouchableOpacity'));
+  fireEvent.press(getByText('Change freshness!'));
 
   expect(queryByText('Fresh')).toBeNull();
 
@@ -50,9 +48,9 @@ test('waits for element until it stops throwing', async () => {
 });
 
 test('waits for element until timeout is met', async () => {
-  const { getByText, UNSAFE_getByName } = render(<BananaContainer />);
+  const { getByText } = render(<BananaContainer />);
 
-  fireEvent.press(UNSAFE_getByName('TouchableOpacity'));
+  fireEvent.press(getByText('Change freshness!'));
 
   await expect(
     waitFor(() => getByText('Fresh'), { timeout: 100 })

From c34b2dc022261ea901cecff1abb64cf6b9a3b310 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 12:10:00 +0200
Subject: [PATCH 06/19] Typescript types cleanup

---
 typings/index.d.ts | 55 ++++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/typings/index.d.ts b/typings/index.d.ts
index 4fd91e76d..35515a190 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -10,48 +10,44 @@ 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;
   getByPlaceholder: (placeholder: string | RegExp) => ReactTestInstance;
   getByDisplayValue: (value: string | RegExp) => ReactTestInstance;
-  getByProps: (props: Record<string, any>) => ReactTestInstance;
   getByTestId: (testID: string) => ReactTestInstance;
   getAllByTestId: (testID: string) => Array<ReactTestInstance>;
-  getAllByName: (name: React.ReactType | string) => Array<ReactTestInstance>;
-  getAllByType: <P>(type: React.ComponentType<P>) => Array<ReactTestInstance>;
   getAllByText: (text: string | RegExp) => Array<ReactTestInstance>;
   getAllByPlaceholder: (
     placeholder: string | RegExp
   ) => Array<ReactTestInstance>;
   getAllByDisplayValue: (value: string | RegExp) => Array<ReactTestInstance>;
-  getAllByProps: (props: Record<string, any>) => Array<ReactTestInstance>;
-
 
   // Unsafe aliases
   UNSAFE_getByType: <P>(type: React.ComponentType<P>) => ReactTestInstance,
-  UNSAFE_getAllByType: <P>(type: React.ComponentType<P>) => Array<ReactTestInstance>,
+  UNSAFE_getAllByType: <P>(
+    type: React.ComponentType<P>
+  ) => Array<ReactTestInstance>;
   UNSAFE_getByProps: (props: Record<string, any>) => ReactTestInstance,
-  UNSAFE_getAllByProps: (props: Record<string, any>) => Array<ReactTestInstance>,
+  UNSAFE_getAllByProps: (
+    props: Record<string, any>
+  ) => Array<ReactTestInstance>;
+
+  // Removed
+  getByName: (name: React.ReactType | string) => ReactTestInstance;
+  getByType: <P>(type: React.ComponentType<P>) => ReactTestInstance;
+  getByProps: (props: Record<string, any>) => ReactTestInstance;
+  getAllByName: (name: React.ReactType | string) => Array<ReactTestInstance>;
+  getAllByType: <P>(type: React.ComponentType<P>) => Array<ReactTestInstance>;
+  getAllByProps: (props: Record<string, any>) => Array<ReactTestInstance>;
 }
 
 interface QueryByAPI {
-  queryByName: (name: React.ReactType | string) => ReactTestInstance | null;
-  queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null;
   queryByText: (name: string | RegExp) => ReactTestInstance | null;
   queryByPlaceholder: (
     placeholder: string | RegExp
   ) => ReactTestInstance | null;
   queryByDisplayValue: (value: string | RegExp) => ReactTestInstance | null;
-  queryByProps: (props: Record<string, any>) => ReactTestInstance | null;
   queryByTestId: (testID: string) => ReactTestInstance | null;
   queryAllByTestId: (testID: string) => Array<ReactTestInstance> | null;
-  queryAllByName: (
-    name: React.ReactType | string
-  ) => Array<ReactTestInstance> | [];
-  queryAllByType: <P>(
-    type: React.ComponentType<P>
-  ) => Array<ReactTestInstance> | [];
   queryAllByText: (text: string | RegExp) => Array<ReactTestInstance> | [];
   queryAllByPlaceholder: (
     placeholder: string | RegExp
@@ -59,15 +55,26 @@ interface QueryByAPI {
   queryAllByDisplayValue: (
     value: string | RegExp
   ) => Array<ReactTestInstance> | [];
+
+  // Unsafe aliases
+  UNSAFE_queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null;
+  UNSAFE_queryAllByType: <P>(type: React.ComponentType<P>) => Array<ReactTestInstance> | [];
+  UNSAFE_queryByProps: (props: Record<string, any>) => ReactTestInstance | null;
+  UNSAFE_queryAllByProps: (props: Record<string, any>) => Array<ReactTestInstance> | [];
+
+  // Removed
+  queryByName: (name: React.ReactType | string) => ReactTestInstance | null;
+  queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null;
+  queryByProps: (props: Record<string, any>) => ReactTestInstance | null;
+  queryAllByName: (
+    name: React.ReactType | string
+  ) => Array<ReactTestInstance> | [];
+  queryAllByType: <P>(
+    type: React.ComponentType<P>
+  ) => Array<ReactTestInstance> | [];
   queryAllByProps: (
     props: Record<string, any>
   ) => Array<ReactTestInstance> | [];
-
-  // Unsafe aliases
-  UNSAFE_queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null,
-  UNSAFE_queryAllByType: <P>(type: React.ComponentType<P>) => Array<ReactTestInstance> | [],
-  UNSAFE_queryByProps: (props: Record<string, any>) => ReactTestInstance | null,
-  UNSAFE_queryAllByProps: (props: Record<string, any>) => Array<ReactTestInstance> | [],
 }
 
 export interface WaitForOptions {

From 4641c1f19f926b93a75c67975cc843dc3f364fa1 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 12:13:55 +0200
Subject: [PATCH 07/19] Cleanup

---
 website/docs/Migration20.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/website/docs/Migration20.md b/website/docs/Migration20.md
index f8679ce0d..748416429 100644
--- a/website/docs/Migration20.md
+++ b/website/docs/Migration20.md
@@ -56,8 +56,12 @@ Following query functions are still available but have been prefixed with `UNSAF
 
 - `UNSAFE_getByType`
 - `UNSAFE_getAllByType`
+- `UNSAFE_queryByType`
+- `UNSAFE_queryAllByType`
 - `UNSAFE_getByProps`
 - `UNSAFE_getAllByProps`
+- `UNSAFE_queryByProps`
+- `UNSAFE_queryAllByProps`
 
 ## Some `byTestId` queries behavior changes
 

From ecffb367193fb937e4dbbd8dedb29c78d7c4d9ba Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 14:22:42 +0200
Subject: [PATCH 08/19] Moving some changes from `prepare-2` branch

---
 src/helpers/getByAPI.js   | 137 ++++++++++++++------------------
 src/helpers/queryByAPI.js | 163 ++++++++++++++++++--------------------
 2 files changed, 139 insertions(+), 161 deletions(-)

diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index dbb7fba91..960d6233c 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -10,10 +10,6 @@ import {
 
 const filterNodeByType = (node, type) => node.type === type;
 
-const filterNodeByName = (node, name) =>
-  typeof node.type !== 'string' &&
-  (node.type.displayName === name || node.type.name === name);
-
 const getNodeByText = (node, text) => {
   try {
     // eslint-disable-next-line
@@ -84,28 +80,6 @@ const getTextInputNodeByDisplayValue = (node, value) => {
   }
 };
 
-export const getByName = (instance: ReactTestInstance, warnFn?: Function) =>
-  function getByNameFn(name: string | React.ComponentType<any>) {
-    warnFn && warnFn('getByName');
-    try {
-      return typeof name === 'string'
-        ? instance.find((node) => filterNodeByName(node, name))
-        : instance.findByType(name);
-    } catch (error) {
-      throw new ErrorWithStack(prepareErrorMessage(error), getByNameFn);
-    }
-  };
-
-export const getByType = (instance: ReactTestInstance, warnFn?: Function) =>
-  function getByTypeFn(type: React.ComponentType<any>) {
-    warnFn && warnFn('getByType');
-    try {
-      return instance.findByType(type);
-    } catch (error) {
-      throw new ErrorWithStack(prepareErrorMessage(error), getByTypeFn);
-    }
-  };
-
 export const getByText = (instance: ReactTestInstance) =>
   function getByTextFn(text: string | RegExp) {
     try {
@@ -137,16 +111,6 @@ export const getByDisplayValue = (instance: ReactTestInstance) =>
     }
   };
 
-export const getByProps = (instance: ReactTestInstance, warnFn?: Function) =>
-  function getByPropsFn(props: { [propName: string]: any }) {
-    warnFn && warnFn('getByProps');
-    try {
-      return instance.findByProps(props);
-    } catch (error) {
-      throw new ErrorWithStack(prepareErrorMessage(error), getByPropsFn);
-    }
-  };
-
 export const getByTestId = (instance: ReactTestInstance) =>
   function getByTestIdFn(testID: string) {
     try {
@@ -166,29 +130,6 @@ export const getByTestId = (instance: ReactTestInstance) =>
     }
   };
 
-export const getAllByName = (instance: ReactTestInstance, warnFn?: Function) =>
-  function getAllByNameFn(name: string | React.ComponentType<any>) {
-    warnFn && warnFn('getAllByName');
-    const results =
-      typeof name === 'string'
-        ? instance.findAll((node) => filterNodeByName(node, name))
-        : instance.findAllByType(name);
-    if (results.length === 0) {
-      throw new ErrorWithStack('No instances found', getAllByNameFn);
-    }
-    return results;
-  };
-
-export const getAllByType = (instance: ReactTestInstance, warnFn?: Function) =>
-  function getAllByTypeFn(type: React.ComponentType<any>) {
-    warnFn && warnFn('getAllByType');
-    const results = instance.findAllByType(type);
-    if (results.length === 0) {
-      throw new ErrorWithStack('No instances found', getAllByTypeFn);
-    }
-    return results;
-  };
-
 export const getAllByText = (instance: ReactTestInstance) =>
   function getAllByTextFn(text: string | RegExp) {
     const results = instance.findAll((node) => getNodeByText(node, text));
@@ -229,19 +170,6 @@ export const getAllByDisplayValue = (instance: ReactTestInstance) =>
     return results;
   };
 
-export const getAllByProps = (instance: ReactTestInstance, warnFn?: Function) =>
-  function getAllByPropsFn(props: { [propName: string]: any }) {
-    warnFn && warnFn('getAllByProps');
-    const results = instance.findAllByProps(props);
-    if (results.length === 0) {
-      throw new ErrorWithStack(
-        `No instances found with props:\n${prettyFormat(props)}`,
-        getAllByPropsFn
-      );
-    }
-    return results;
-  };
-
 export const getAllByTestId = (instance: ReactTestInstance) =>
   function getAllByTestIdFn(testID: string): ReactTestInstance[] {
     const results = instance
@@ -257,6 +185,61 @@ export const getAllByTestId = (instance: ReactTestInstance) =>
     return results;
   };
 
+export const UNSAFE_getByType = (
+  instance: ReactTestInstance,
+  warnFn?: Function
+) =>
+  function getByTypeFn(type: React.ComponentType<any>) {
+    warnFn && warnFn('getByType');
+    try {
+      return instance.findByType(type);
+    } catch (error) {
+      throw new ErrorWithStack(prepareErrorMessage(error), getByTypeFn);
+    }
+  };
+
+export const UNSAFE_getByProps = (
+  instance: ReactTestInstance,
+  warnFn?: Function
+) =>
+  function getByPropsFn(props: { [propName: string]: any }) {
+    warnFn && warnFn('getByProps');
+    try {
+      return instance.findByProps(props);
+    } catch (error) {
+      throw new ErrorWithStack(prepareErrorMessage(error), getByPropsFn);
+    }
+  };
+
+export const UNSAFE_getAllByType = (
+  instance: ReactTestInstance,
+  warnFn?: Function
+) =>
+  function getAllByTypeFn(type: React.ComponentType<any>) {
+    warnFn && warnFn('getAllByType');
+    const results = instance.findAllByType(type);
+    if (results.length === 0) {
+      throw new ErrorWithStack('No instances found', getAllByTypeFn);
+    }
+    return results;
+  };
+
+export const UNSAFE_getAllByProps = (
+  instance: ReactTestInstance,
+  warnFn?: Function
+) =>
+  function getAllByPropsFn(props: { [propName: string]: any }) {
+    warnFn && warnFn('getAllByProps');
+    const results = instance.findAllByProps(props);
+    if (results.length === 0) {
+      throw new ErrorWithStack(
+        `No instances found with props:\n${prettyFormat(props)}`,
+        getAllByPropsFn
+      );
+    }
+    return results;
+  };
+
 export const getByAPI = (instance: ReactTestInstance) => ({
   getByText: getByText(instance),
   getByPlaceholder: getByPlaceholder(instance),
@@ -267,11 +250,11 @@ export const getByAPI = (instance: ReactTestInstance) => ({
   getAllByDisplayValue: getAllByDisplayValue(instance),
   getAllByTestId: getAllByTestId(instance),
 
-  // Unsafe aliases
-  UNSAFE_getByType: getByType(instance),
-  UNSAFE_getAllByType: getAllByType(instance),
-  UNSAFE_getByProps: getByProps(instance),
-  UNSAFE_getAllByProps: getAllByProps(instance),
+  // Unsafe
+  UNSAFE_getByType: UNSAFE_getByType(instance),
+  UNSAFE_getAllByType: UNSAFE_getAllByType(instance),
+  UNSAFE_getByProps: UNSAFE_getByProps(instance),
+  UNSAFE_getAllByProps: UNSAFE_getAllByProps(instance),
 
   // Removed
   getByName: () =>
diff --git a/src/helpers/queryByAPI.js b/src/helpers/queryByAPI.js
index e2c06b0a0..a71c73b2f 100644
--- a/src/helpers/queryByAPI.js
+++ b/src/helpers/queryByAPI.js
@@ -2,45 +2,19 @@
 import * as React from 'react';
 import {
   getByTestId,
-  getByName,
-  getByType,
   getByText,
   getByPlaceholder,
   getByDisplayValue,
-  getByProps,
   getAllByTestId,
-  getAllByName,
-  getAllByType,
   getAllByText,
   getAllByPlaceholder,
   getAllByDisplayValue,
-  getAllByProps,
+  UNSAFE_getByType,
+  UNSAFE_getByProps,
+  UNSAFE_getAllByType,
+  UNSAFE_getAllByProps,
 } from './getByAPI';
-import {
-  createQueryByError,
-  printDeprecationWarning,
-  printUnsafeWarning,
-} from './errors';
-
-export const queryByName = (instance: ReactTestInstance, warnFn?: Function) =>
-  function queryByNameFn(name: string | React.ComponentType<any>) {
-    warnFn && warnFn('queryByName');
-    try {
-      return getByName(instance)(name);
-    } catch (error) {
-      return createQueryByError(error, queryByNameFn);
-    }
-  };
-
-export const queryByType = (instance: ReactTestInstance, warnFn?: Function) =>
-  function queryByTypeFn(type: React.ComponentType<any>) {
-    warnFn && warnFn('queryByType');
-    try {
-      return getByType(instance)(type);
-    } catch (error) {
-      return createQueryByError(error, queryByTypeFn);
-    }
-  };
+import { createQueryByError, throwRemovedFunctionError } from './errors';
 
 export const queryByText = (instance: ReactTestInstance) =>
   function queryByTextFn(text: string | RegExp) {
@@ -69,16 +43,6 @@ export const queryByDisplayValue = (instance: ReactTestInstance) =>
     }
   };
 
-export const queryByProps = (instance: ReactTestInstance, warnFn?: Function) =>
-  function queryByPropsFn(props: { [propName: string]: any }) {
-    warnFn && warnFn('queryByProps');
-    try {
-      return getByProps(instance)(props);
-    } catch (error) {
-      return createQueryByError(error, queryByPropsFn);
-    }
-  };
-
 export const queryByTestId = (instance: ReactTestInstance) =>
   function queryByTestIdFn(testID: string) {
     try {
@@ -88,30 +52,6 @@ export const queryByTestId = (instance: ReactTestInstance) =>
     }
   };
 
-export const queryAllByName = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) => (name: string | React.ComponentType<any>) => {
-  warnFn && warnFn('queryAllByName');
-  try {
-    return getAllByName(instance)(name);
-  } catch (error) {
-    return [];
-  }
-};
-
-export const queryAllByType = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) => (type: React.ComponentType<any>) => {
-  warnFn && warnFn('queryAllByType');
-  try {
-    return getAllByType(instance)(type);
-  } catch (error) {
-    return [];
-  }
-};
-
 export const queryAllByText = (instance: ReactTestInstance) => (
   text: string | RegExp
 ) => {
@@ -142,23 +82,61 @@ export const queryAllByDisplayValue = (instance: ReactTestInstance) => (
   }
 };
 
-export const queryAllByProps = (
+export const queryAllByTestId = (instance: ReactTestInstance) => (
+  testID: string
+) => {
+  try {
+    return getAllByTestId(instance)(testID);
+  } catch (error) {
+    return [];
+  }
+};
+
+export const UNSAFE_queryByType = (
   instance: ReactTestInstance,
   warnFn?: Function
-) => (props: { [propName: string]: any }) => {
-  warnFn && warnFn('queryAllByProps');
+) =>
+  function queryByTypeFn(type: React.ComponentType<any>) {
+    warnFn && warnFn('queryByType');
+    try {
+      return UNSAFE_getByType(instance)(type);
+    } catch (error) {
+      return createQueryByError(error, queryByTypeFn);
+    }
+  };
+
+export const UNSAFE_queryByProps = (
+  instance: ReactTestInstance,
+  warnFn?: Function
+) =>
+  function queryByPropsFn(props: { [propName: string]: any }) {
+    warnFn && warnFn('queryByProps');
+    try {
+      return UNSAFE_getByProps(instance)(props);
+    } catch (error) {
+      return createQueryByError(error, queryByPropsFn);
+    }
+  };
+
+export const UNSAFE_queryAllByType = (
+  instance: ReactTestInstance,
+  warnFn?: Function
+) => (type: React.ComponentType<any>) => {
+  warnFn && warnFn('queryAllByType');
   try {
-    return getAllByProps(instance)(props);
+    return UNSAFE_getAllByType(instance)(type);
   } catch (error) {
     return [];
   }
 };
 
-export const queryAllByTestId = (instance: ReactTestInstance) => (
-  testID: string
-) => {
+export const UNSAFE_queryAllByProps = (
+  instance: ReactTestInstance,
+  warnFn?: Function
+) => (props: { [propName: string]: any }) => {
+  warnFn && warnFn('queryAllByProps');
   try {
-    return getAllByTestId(instance)(testID);
+    return UNSAFE_getAllByProps(instance)(props);
   } catch (error) {
     return [];
   }
@@ -166,23 +144,40 @@ export const queryAllByTestId = (instance: ReactTestInstance) => (
 
 export const queryByAPI = (instance: ReactTestInstance) => ({
   queryByTestId: queryByTestId(instance),
-  queryByName: queryByName(instance, printDeprecationWarning),
-  queryByType: queryByType(instance, printUnsafeWarning),
   queryByText: queryByText(instance),
   queryByPlaceholder: queryByPlaceholder(instance),
   queryByDisplayValue: queryByDisplayValue(instance),
-  queryByProps: queryByProps(instance, printUnsafeWarning),
   queryAllByTestId: queryAllByTestId(instance),
-  queryAllByName: queryAllByName(instance, printDeprecationWarning),
-  queryAllByType: queryAllByType(instance, printUnsafeWarning),
   queryAllByText: queryAllByText(instance),
   queryAllByPlaceholder: queryAllByPlaceholder(instance),
   queryAllByDisplayValue: queryAllByDisplayValue(instance),
-  queryAllByProps: queryAllByProps(instance, printUnsafeWarning),
 
-  // Unsafe aliases
-  UNSAFE_queryByType: queryByType(instance),
-  UNSAFE_queryAllByType: queryAllByType(instance),
-  UNSAFE_queryByProps: queryByProps(instance),
-  UNSAFE_queryAllByProps: queryAllByProps(instance),
+  // Unsafe
+  UNSAFE_queryByType: UNSAFE_queryByType(instance),
+  UNSAFE_queryAllByType: UNSAFE_queryAllByType(instance),
+  UNSAFE_queryByProps: UNSAFE_queryByProps(instance),
+  UNSAFE_queryAllByProps: UNSAFE_queryAllByProps(instance),
+
+  // Removed
+  queryByName: () =>
+    throwRemovedFunctionError('queryByName', 'migration-v2#removed-functions'),
+  queryAllByName: () =>
+    throwRemovedFunctionError(
+      'queryAllByName',
+      'migration-v2#removed-functions'
+    ),
+  queryByType: () =>
+    throwRemovedFunctionError('queryByType', 'migration-v2#removed-functions'),
+  queryAllByType: () =>
+    throwRemovedFunctionError(
+      'queryAllByType',
+      'migration-v2#removed-functions'
+    ),
+  queryByProps: () =>
+    throwRemovedFunctionError('queryByProps', 'migration-v2#removed-functions'),
+  queryAllByProps: () =>
+    throwRemovedFunctionError(
+      'queryAllByProps',
+      'migration-v2#removed-functions'
+    ),
 });

From 9148eea4ad2aaea8049086977f04f33dc1dac1de Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 14:29:26 +0200
Subject: [PATCH 09/19] Moving some changes from `prepare-2` branch

---
 typings/__tests__/index.test.tsx | 118 ++++++++++++++++---------------
 1 file changed, 60 insertions(+), 58 deletions(-)

diff --git a/typings/__tests__/index.test.tsx b/typings/__tests__/index.test.tsx
index 2417ae8eb..9981ded7e 100644
--- a/typings/__tests__/index.test.tsx
+++ b/typings/__tests__/index.test.tsx
@@ -15,9 +15,9 @@ interface HasRequiredProp {
   requiredProp: string;
 }
 
-const View = props => props.children;
-const Text = props => props.children;
-const TextInput = props => props.children;
+const View = (props) => props.children;
+const Text = (props) => props.children;
+const TextInput = (props) => props.children;
 const ElementWithRequiredProps = (props: HasRequiredProp) => (
   <Text>{props.requiredProp}</Text>
 );
@@ -32,10 +32,8 @@ const TestComponent = () => (
 const tree = render(<TestComponent />);
 
 // getByAPI tests
-const getByNameString: ReactTestInstance = tree.getByName('View');
-const getByNameContructor: ReactTestInstance = tree.getByName(View);
-const getByType: ReactTestInstance = tree.getByType(View);
-const getByTypeWithRequiredProps: ReactTestInstance = tree.getByType(
+const getByType: ReactTestInstance = tree.UNSAFE_getByType(View);
+const getByTypeWithRequiredProps: ReactTestInstance = tree.UNSAFE_getByType(
   ElementWithRequiredProps
 );
 const getByTextString: ReactTestInstance = tree.getByText('<View />');
@@ -52,30 +50,24 @@ const getByDisplayValueString: ReactTestInstance = tree.getByDisplayValue(
 const getByDisplayValueRegExp: ReactTestInstance = tree.getByDisplayValue(
   /value/g
 );
-const getByProps: ReactTestInstance = tree.getByProps({ value: 2 });
+const getByProps: ReactTestInstance = tree.UNSAFE_getByProps({ value: 2 });
 const getByTestId: ReactTestInstance = tree.getByTestId('test-id');
 const getAllByTestId: ReactTestInstance[] = tree.getAllByTestId('test-id');
-const getAllByNameString: Array<ReactTestInstance> = tree.getAllByName('View');
-const getAllByNameConstructor: Array<ReactTestInstance> = tree.getAllByName(
-  View
+const getAllByType: Array<ReactTestInstance> = tree.UNSAFE_getAllByType(View);
+const getAllByTypeWithRequiredProps: Array<ReactTestInstance> = tree.UNSAFE_getAllByType(
+  ElementWithRequiredProps
 );
-const getAllByType: Array<ReactTestInstance> = tree.getAllByType(View);
-const getAllByTypeWithRequiredProps: Array<
-  ReactTestInstance
-> = tree.getAllByType(ElementWithRequiredProps);
 const getAllByTextString: Array<ReactTestInstance> = tree.getAllByText(
   '<View />'
 );
 const getAllByTextRegExp: Array<ReactTestInstance> = tree.getAllByText(/Text/g);
-const getAllByProps: Array<ReactTestInstance> = tree.getAllByProps({
+const getAllByProps: Array<ReactTestInstance> = tree.UNSAFE_getAllByProps({
   value: 2,
 });
 
 // queuryByAPI tests
-const queryByNameString: ReactTestInstance | null = tree.queryByName('View');
-const queryByNameConstructor: ReactTestInstance | null = tree.queryByName(View);
-const queryByType: ReactTestInstance | null = tree.queryByType(View);
-const queryByTypeWithRequiredProps: ReactTestInstance | null = tree.queryByType(
+const queryByType: ReactTestInstance | null = tree.UNSAFE_queryByType(View);
+const queryByTypeWithRequiredProps: ReactTestInstance | null = tree.UNSAFE_queryByType(
   ElementWithRequiredProps
 );
 const queryByTextString: ReactTestInstance | null = tree.queryByText('View');
@@ -92,33 +84,31 @@ const queryByDisplayValueString: ReactTestInstance | null = tree.queryByDisplayV
 const queryByDisplayValueRegExp: ReactTestInstance | null = tree.queryByDisplayValue(
   /value/g
 );
-const queryByProps: ReactTestInstance | null = tree.queryByProps({ value: 2 });
+const queryByProps: ReactTestInstance | null = tree.UNSAFE_queryByProps({
+  value: 2,
+});
 const queryByTestId: ReactTestInstance | null = tree.queryByTestId('test-id');
 const queryAllByTestId: ReactTestInstance[] | null = tree.queryAllByTestId(
   'test-id'
 );
-const queryAllByNameString: Array<ReactTestInstance> = tree.queryAllByName(
-  'View'
-);
-const queryAllByNameConstructor: Array<ReactTestInstance> = tree.queryAllByName(
+const queryAllByType: Array<ReactTestInstance> = tree.UNSAFE_queryAllByType(
   View
 );
-const queryAllByType: Array<ReactTestInstance> = tree.queryAllByType(View);
-const queryAllByTypeWithRequiredProps: Array<
-  ReactTestInstance
-> = tree.queryAllByType(ElementWithRequiredProps);
+const queryAllByTypeWithRequiredProps: Array<ReactTestInstance> = tree.UNSAFE_queryAllByType(
+  ElementWithRequiredProps
+);
 const queryAllByTextString: Array<ReactTestInstance> = tree.queryAllByText(
   'View'
 );
 const queryAllByTextRegExp: Array<ReactTestInstance> = tree.queryAllByText(
   /View/g
 );
-const queryAllByDisplayValueString: Array<
-  ReactTestInstance
-> = tree.queryAllByDisplayValue('View');
-const queryAllByDisplayValueRegExp: Array<
-  ReactTestInstance
-> = tree.queryAllByDisplayValue(/View/g);
+const queryAllByDisplayValueString: Array<ReactTestInstance> = tree.queryAllByDisplayValue(
+  'View'
+);
+const queryAllByDisplayValueRegExp: Array<ReactTestInstance> = tree.queryAllByDisplayValue(
+  /View/g
+);
 
 // findBy API tests
 const findBy: Promise<ReactTestInstance>[] = [
@@ -200,33 +190,45 @@ const queryAllByA11yRole: Array<ReactTestInstance> = tree.queryAllByA11yRole(
 );
 
 const getByA11yStates: ReactTestInstance = tree.getByA11yStates('selected');
-const getByA11yStatesArray: ReactTestInstance = tree.getByA11yStates(['selected']);
+const getByA11yStatesArray: ReactTestInstance = tree.getByA11yStates([
+  'selected',
+]);
 const getAllByA11yStates: Array<ReactTestInstance> = tree.getAllByA11yStates(
   'selected'
 );
-const getAllByA11yStatesArray: Array<
-  ReactTestInstance
-> = tree.getAllByA11yStates(['selected']);
+const getAllByA11yStatesArray: Array<ReactTestInstance> = tree.getAllByA11yStates(
+  ['selected']
+);
 const queryByA11yStates: ReactTestInstance = tree.queryByA11yStates('selected');
 const queryByA11yStatesArray: ReactTestInstance = tree.queryByA11yStates([
   'selected',
 ]);
-const queryAllByA11yStates: Array<
-  ReactTestInstance
-> = tree.queryAllByA11yStates('selected');
-const queryAllByA11yStatesArray: Array<
-  ReactTestInstance
-> = tree.queryAllByA11yStates(['selected']);
+const queryAllByA11yStates: Array<ReactTestInstance> = tree.queryAllByA11yStates(
+  'selected'
+);
+const queryAllByA11yStatesArray: Array<ReactTestInstance> = tree.queryAllByA11yStates(
+  ['selected']
+);
 
 const getByA11yState: ReactTestInstance = tree.getByA11yState({ busy: true });
-const getAllByA11yState: Array<ReactTestInstance> = tree.getAllByA11yState({ busy: true });
-const queryByA11yState: ReactTestInstance = tree.queryByA11yState({ busy: true });
-const queryAllByA11yState: Array<ReactTestInstance> = tree.queryAllByA11yState({ busy: true });
+const getAllByA11yState: Array<ReactTestInstance> = tree.getAllByA11yState({
+  busy: true,
+});
+const queryByA11yState: ReactTestInstance = tree.queryByA11yState({
+  busy: true,
+});
+const queryAllByA11yState: Array<ReactTestInstance> = tree.queryAllByA11yState({
+  busy: true,
+});
 
 const getByA11yValue: ReactTestInstance = tree.getByA11yValue({ min: 10 });
-const getAllByA11yValue: Array<ReactTestInstance> = tree.getAllByA11yValue({ min: 10 });
+const getAllByA11yValue: Array<ReactTestInstance> = tree.getAllByA11yValue({
+  min: 10,
+});
 const queryByA11yValue: ReactTestInstance = tree.queryByA11yValue({ min: 10 });
-const queryAllByA11yValue: Array<ReactTestInstance> = tree.queryAllByA11yValue({ min: 10 });
+const queryAllByA11yValue: Array<ReactTestInstance> = tree.queryAllByA11yValue({
+  min: 10,
+});
 
 const debugFn = tree.debug();
 const debugFnWithMessage = tree.debug('my message');
@@ -236,12 +238,12 @@ tree.rerender(<View />);
 tree.unmount();
 
 // fireEvent API tests
-fireEvent(getByNameString, 'press');
-fireEvent(getByNameString, 'press', 'data');
-fireEvent(getByNameString, 'press', 'param1', 'param2');
-fireEvent.press(getByNameString);
-fireEvent.changeText(getByNameString, 'string');
-fireEvent.scroll(getByNameString, 'eventData');
+fireEvent(getByA11yLabel, 'press');
+fireEvent(getByA11yLabel, 'press', 'data');
+fireEvent(getByA11yLabel, 'press', 'param1', 'param2');
+fireEvent.press(getByA11yLabel);
+fireEvent.changeText(getByA11yLabel, 'string');
+fireEvent.scroll(getByA11yLabel, 'eventData');
 
 // shallow API
 const shallowTree: { output: React.ReactElement<any> } = shallow(
@@ -251,10 +253,10 @@ const shallowTree: { output: React.ReactElement<any> } = shallow(
 const waitForFlush: Promise<any> = flushMicrotasksQueue();
 
 const waitBy: Promise<ReactTestInstance> = waitFor<ReactTestInstance>(() =>
-  tree.getByName('View')
+  tree.getByA11yLabel('label')
 );
 const waitByAll: Promise<ReactTestInstance[]> = waitFor<ReactTestInstance[]>(
-  () => tree.getAllByName('View'),
+  () => tree.getAllByA11yLabel('label'),
   { timeout: 1000, interval: 50 }
 );
 

From b4fdf578ff9dd775f7e23b1a792298008572a1c1 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 15:45:53 +0200
Subject: [PATCH 10/19] Update src/waitFor.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Pierzchała <thymikee@gmail.com>
---
 src/waitFor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/waitFor.js b/src/waitFor.js
index be4400575..5275643e5 100644
--- a/src/waitFor.js
+++ b/src/waitFor.js
@@ -40,8 +40,8 @@ export default function waitFor<T>(
 
 export function waitForElement<T>(
   expectation: () => T,
-  timeout: number = 4500, // eslint-disable-line no-unused-vars
-  interval: number = 50 // eslint-disable-line no-unused-vars
+  _timeout: number = 4500,
+  _interval: number = 50
 ): Promise<T> {
   throwRemovedFunctionError(
     'waitForElement',

From 573fa3d034dc8e852c742026fe460073bf8166b6 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 15:55:59 +0200
Subject: [PATCH 11/19] Update website/docs/Migration20.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Pierzchała <thymikee@gmail.com>
---
 website/docs/Migration20.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/Migration20.md b/website/docs/Migration20.md
index 748416429..a44aedba4 100644
--- a/website/docs/Migration20.md
+++ b/website/docs/Migration20.md
@@ -45,7 +45,7 @@ Global `debug()` and `shallow()` functions have been removed in favor of `debug(
 
 ## Removed functions
 
-Following query fuctions have been removed after being deprecated:
+Following query functions have been removed after being deprecated for more than a year now:
 
 - `getByName`
 - `getAllByName`

From ec6ae1ef2fd8a4bff2dea6c0a699a5cce8909e21 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 15:42:11 +0200
Subject: [PATCH 12/19] Code review changes

---
 src/__tests__/render.test.js |  3 +--
 src/helpers/getByAPI.js      | 24 ++++--------------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/__tests__/render.test.js b/src/__tests__/render.test.js
index f4846510b..617cd105b 100644
--- a/src/__tests__/render.test.js
+++ b/src/__tests__/render.test.js
@@ -264,8 +264,7 @@ test('update', () => {
   const fn = jest.fn();
   const { getByText, update, rerender } = render(<Banana onUpdate={fn} />);
 
-  const button = getByText('Change freshness!');
-  fireEvent.press(button);
+  fireEvent.press(getByText('Change freshness!'));
 
   update(<Banana onUpdate={fn} />);
   rerender(<Banana onUpdate={fn} />);
diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index 960d6233c..ea2342655 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -185,12 +185,8 @@ export const getAllByTestId = (instance: ReactTestInstance) =>
     return results;
   };
 
-export const UNSAFE_getByType = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) =>
+export const UNSAFE_getByType = (instance: ReactTestInstance) =>
   function getByTypeFn(type: React.ComponentType<any>) {
-    warnFn && warnFn('getByType');
     try {
       return instance.findByType(type);
     } catch (error) {
@@ -198,12 +194,8 @@ export const UNSAFE_getByType = (
     }
   };
 
-export const UNSAFE_getByProps = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) =>
+export const UNSAFE_getByProps = (instance: ReactTestInstance) =>
   function getByPropsFn(props: { [propName: string]: any }) {
-    warnFn && warnFn('getByProps');
     try {
       return instance.findByProps(props);
     } catch (error) {
@@ -211,12 +203,8 @@ export const UNSAFE_getByProps = (
     }
   };
 
-export const UNSAFE_getAllByType = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) =>
+export const UNSAFE_getAllByType = (instance: ReactTestInstance) =>
   function getAllByTypeFn(type: React.ComponentType<any>) {
-    warnFn && warnFn('getAllByType');
     const results = instance.findAllByType(type);
     if (results.length === 0) {
       throw new ErrorWithStack('No instances found', getAllByTypeFn);
@@ -224,12 +212,8 @@ export const UNSAFE_getAllByType = (
     return results;
   };
 
-export const UNSAFE_getAllByProps = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) =>
+export const UNSAFE_getAllByProps = (instance: ReactTestInstance) =>
   function getAllByPropsFn(props: { [propName: string]: any }) {
-    warnFn && warnFn('getAllByProps');
     const results = instance.findAllByProps(props);
     if (results.length === 0) {
       throw new ErrorWithStack(

From 81db39dbbfa061f6badf057f341c7821ef0f6b39 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 15:45:20 +0200
Subject: [PATCH 13/19] More code review changes

---
 src/shallow.js              | 2 +-
 website/docs/Migration20.md | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/shallow.js b/src/shallow.js
index 4629d829a..828f4dd61 100644
--- a/src/shallow.js
+++ b/src/shallow.js
@@ -21,6 +21,6 @@ export function shallowInternal(
 export default function shallow(_: ReactTestInstance | React.Element<any>) {
   throwRemovedFunctionError(
     'shallow',
-    'migration-v2#removed-global-debug-functions'
+    'migration-v2#removed-global-shallow-function'
   );
 }
diff --git a/website/docs/Migration20.md b/website/docs/Migration20.md
index a44aedba4..d5e2b03a4 100644
--- a/website/docs/Migration20.md
+++ b/website/docs/Migration20.md
@@ -39,9 +39,13 @@ Both changes should improve code readibility.
 Please note that in many cases `waitFor` call can be replaced by proper use of `findBy` asynchonous queries resulting in more streamlined test code.
 :::
 
-## Removed global debug functions
+## Removed global `debug` function
 
-Global `debug()` and `shallow()` functions have been removed in favor of `debug()` method returned from `render()` function.
+Global `debug()` function has been removed in favor of `debug()` method returned from `render()` function.
+
+## Removed global `shallow` function
+
+Global `shallow()` functions which has been previously deprecated has been removed.
 
 ## Removed functions
 

From 959d3ce6dd0d5415f9f477fb8a13b462b9044892 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 15:55:41 +0200
Subject: [PATCH 14/19] Code review changes

---
 typings/index.d.ts          | 39 +++++++++++++++++++++++++++++--------
 website/docs/Migration20.md | 13 +++++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/typings/index.d.ts b/typings/index.d.ts
index 35515a190..22296d4ef 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -32,11 +32,29 @@ interface GetByAPI {
   ) => Array<ReactTestInstance>;
 
   // Removed
+  /**
+   * @deprecated This functions has been removed. Please use other queries.
+   */
   getByName: (name: React.ReactType | string) => ReactTestInstance;
+  /**
+   * @deprecated This functions has been renamed to `UNSAFE_getByType`.
+   */
   getByType: <P>(type: React.ComponentType<P>) => ReactTestInstance;
+  /**
+   * @deprecated This functions has been renamed to `UNSAFE_getByProps`.
+   */
   getByProps: (props: Record<string, any>) => ReactTestInstance;
+  /**
+   * @deprecated This functions has been removed. Please use other queries.
+   */
   getAllByName: (name: React.ReactType | string) => Array<ReactTestInstance>;
+  /**
+   * @deprecated This functions has been renamed to `UNSAFE_getAllByType`.
+   */
   getAllByType: <P>(type: React.ComponentType<P>) => Array<ReactTestInstance>;
+  /**
+   * @deprecated This functions has been renamed to `UNSAFE_getAllByProps`.
+   */
   getAllByProps: (props: Record<string, any>) => Array<ReactTestInstance>;
 }
 
@@ -77,11 +95,6 @@ interface QueryByAPI {
   ) => Array<ReactTestInstance> | [];
 }
 
-export interface WaitForOptions {
-  timeout: number;
-  interval: number;
-}
-
 interface FindByAPI {
   findByText: (
     text: string | RegExp,
@@ -245,12 +258,22 @@ export declare const render: (
   component: React.ReactElement<any>,
   options?: RenderOptions
 ) => RenderAPI;
-export declare const shallow: <P = {}>(
-  instance: ReactTestInstance | React.ReactElement<P>
-) => { output: React.ReactElement<P> };
+
 export declare const flushMicrotasksQueue: () => Promise<any>;
 export declare const cleanup: () => void;
 export declare const fireEvent: FireEventAPI;
 export declare const waitFor: WaitForFunction;
 export declare const act: (callback: () => void) => Thenable;
 export declare const within: (instance: ReactTestInstance) => Queries;
+
+/**
+ * @deprecated This functions has been removed. Please use `waitFor` function.
+ */
+export declare const waitForElement: WaitForFunction;
+
+/**
+ * @deprecated This functions has been removed.
+ */
+export declare const shallow: <P = {}>(
+  instance: ReactTestInstance | React.ReactElement<P>
+) => { output: React.ReactElement<P> };
diff --git a/website/docs/Migration20.md b/website/docs/Migration20.md
index d5e2b03a4..7176a426a 100644
--- a/website/docs/Migration20.md
+++ b/website/docs/Migration20.md
@@ -47,6 +47,19 @@ Global `debug()` function has been removed in favor of `debug()` method returned
 
 Global `shallow()` functions which has been previously deprecated has been removed.
 
+Shallow rendering React component is usually not a good idea, so we decided to remove the API. However, if you find it useful or need to support legacy tests, feel free to implement it yourself. Here's a sample implementation:
+
+```js
+import ShallowRenderer from 'react-test-renderer/shallow';
+
+export function shallow(instance: ReactTestInstance | React.Element<any>) {
+  const renderer = new ShallowRenderer();
+  renderer.render(React.createElement(instance.type, instance.props));
+
+  return { output: renderer.getRenderOutput() };
+}
+```
+
 ## Removed functions
 
 Following query functions have been removed after being deprecated for more than a year now:

From 1a7b987547ae5efa865c79f3a9de33671c6b066a Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 15:58:09 +0200
Subject: [PATCH 15/19] More code review changes

---
 website/docs/Migration20.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/website/docs/Migration20.md b/website/docs/Migration20.md
index 7176a426a..cdf4ecd85 100644
--- a/website/docs/Migration20.md
+++ b/website/docs/Migration20.md
@@ -69,16 +69,16 @@ Following query functions have been removed after being deprecated for more than
 - `queryByName`
 - `queryAllByName`
 
-Following query functions are still available but have been prefixed with `UNSAFE_`:
-
-- `UNSAFE_getByType`
-- `UNSAFE_getAllByType`
-- `UNSAFE_queryByType`
-- `UNSAFE_queryAllByType`
-- `UNSAFE_getByProps`
-- `UNSAFE_getAllByProps`
-- `UNSAFE_queryByProps`
-- `UNSAFE_queryAllByProps`
+The `*ByType` and `*ByProps` queries has been prefixed with `UNSAFE_`. You can safely rename them using global search/replace in your project:
+
+- `getByType` -> `UNSAFE_getByType`
+- `getAllByType` -> `UNSAFE_getAllByType`
+- `queryByType` -> `UNSAFE_queryByType`
+- `queryAllByType` -> `UNSAFE_queryAllByType`
+- `getByProps` -> `UNSAFE_getByProps`
+- `getAllByProps` -> `UNSAFE_getAllByProps`
+- `queryByProps` -> `UNSAFE_queryByProps`
+- `queryAllByProps` -> `UNSAFE_queryAllByProps`
 
 ## Some `byTestId` queries behavior changes
 

From 2b78010b9ec3936279b20cbb30725ffafd7d9fd5 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 16:01:04 +0200
Subject: [PATCH 16/19] Added @deprecated messages for TS type defs

---
 typings/index.d.ts | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/typings/index.d.ts b/typings/index.d.ts
index 22296d4ef..122ac3585 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -81,15 +81,33 @@ interface QueryByAPI {
   UNSAFE_queryAllByProps: (props: Record<string, any>) => Array<ReactTestInstance> | [];
 
   // Removed
+  /**
+   * @deprecated This functions has been removed. Please use other queries.
+   */
   queryByName: (name: React.ReactType | string) => ReactTestInstance | null;
+  /**
+   * @deprecated This functions has been renamed to `UNSAFE_queryByType`.
+   */
   queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null;
+  /**
+   * @deprecated This functions has been renamed to `UNSAFE_queryByProps`.
+   */
   queryByProps: (props: Record<string, any>) => ReactTestInstance | null;
+  /**
+   * @deprecated This functions has been removed. Please use other queries.
+   */
   queryAllByName: (
     name: React.ReactType | string
   ) => Array<ReactTestInstance> | [];
+  /**
+   * @deprecated This functions has been renamed to `UNSAFE_queryAllByType`.
+   */
   queryAllByType: <P>(
     type: React.ComponentType<P>
   ) => Array<ReactTestInstance> | [];
+  /**
+   * @deprecated This functions has been renamed to `UNSAFE_queryAllByProps`.
+   */
   queryAllByProps: (
     props: Record<string, any>
   ) => Array<ReactTestInstance> | [];
@@ -129,10 +147,10 @@ interface FindByAPI {
 
 // Not yet available in DefinitelyTyped
 export type A11yValue = {
-  min?: number,
-  max?: number,
-  now?: number,
-  text?: string,
+  min?: number;
+  max?: number;
+  now?: number;
+  text?: string;
 };
 
 type A11yAPI = {

From 208c114c280ed12809cf13ab0f9cd7153080ca46 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 16:03:39 +0200
Subject: [PATCH 17/19] Spelling mistake

---
 typings/index.d.ts | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/typings/index.d.ts b/typings/index.d.ts
index 122ac3585..a7973dbcd 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -33,27 +33,27 @@ interface GetByAPI {
 
   // Removed
   /**
-   * @deprecated This functions has been removed. Please use other queries.
+   * @deprecated This function has been removed. Please use other queries.
    */
   getByName: (name: React.ReactType | string) => ReactTestInstance;
   /**
-   * @deprecated This functions has been renamed to `UNSAFE_getByType`.
+   * @deprecated This function has been renamed to `UNSAFE_getByType`.
    */
   getByType: <P>(type: React.ComponentType<P>) => ReactTestInstance;
   /**
-   * @deprecated This functions has been renamed to `UNSAFE_getByProps`.
+   * @deprecated This function has been renamed to `UNSAFE_getByProps`.
    */
   getByProps: (props: Record<string, any>) => ReactTestInstance;
   /**
-   * @deprecated This functions has been removed. Please use other queries.
+   * @deprecated This function has been removed. Please use other queries.
    */
   getAllByName: (name: React.ReactType | string) => Array<ReactTestInstance>;
   /**
-   * @deprecated This functions has been renamed to `UNSAFE_getAllByType`.
+   * @deprecated This function has been renamed to `UNSAFE_getAllByType`.
    */
   getAllByType: <P>(type: React.ComponentType<P>) => Array<ReactTestInstance>;
   /**
-   * @deprecated This functions has been renamed to `UNSAFE_getAllByProps`.
+   * @deprecated This function has been renamed to `UNSAFE_getAllByProps`.
    */
   getAllByProps: (props: Record<string, any>) => Array<ReactTestInstance>;
 }
@@ -82,31 +82,31 @@ interface QueryByAPI {
 
   // Removed
   /**
-   * @deprecated This functions has been removed. Please use other queries.
+   * @deprecated This function has been removed. Please use other queries.
    */
   queryByName: (name: React.ReactType | string) => ReactTestInstance | null;
   /**
-   * @deprecated This functions has been renamed to `UNSAFE_queryByType`.
+   * @deprecated This function has been renamed to `UNSAFE_queryByType`.
    */
   queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null;
   /**
-   * @deprecated This functions has been renamed to `UNSAFE_queryByProps`.
+   * @deprecated This function has been renamed to `UNSAFE_queryByProps`.
    */
   queryByProps: (props: Record<string, any>) => ReactTestInstance | null;
   /**
-   * @deprecated This functions has been removed. Please use other queries.
+   * @deprecated This function has been removed. Please use other queries.
    */
   queryAllByName: (
     name: React.ReactType | string
   ) => Array<ReactTestInstance> | [];
   /**
-   * @deprecated This functions has been renamed to `UNSAFE_queryAllByType`.
+   * @deprecated This function has been renamed to `UNSAFE_queryAllByType`.
    */
   queryAllByType: <P>(
     type: React.ComponentType<P>
   ) => Array<ReactTestInstance> | [];
   /**
-   * @deprecated This functions has been renamed to `UNSAFE_queryAllByProps`.
+   * @deprecated This function has been renamed to `UNSAFE_queryAllByProps`.
    */
   queryAllByProps: (
     props: Record<string, any>
@@ -285,12 +285,12 @@ export declare const act: (callback: () => void) => Thenable;
 export declare const within: (instance: ReactTestInstance) => Queries;
 
 /**
- * @deprecated This functions has been removed. Please use `waitFor` function.
+ * @deprecated This function has been removed. Please use `waitFor` function.
  */
 export declare const waitForElement: WaitForFunction;
 
 /**
- * @deprecated This functions has been removed.
+ * @deprecated This function has been removed.
  */
 export declare const shallow: <P = {}>(
   instance: ReactTestInstance | React.ReactElement<P>

From f593d4c9b5dd97f2d5f732879eb2d33df2ecaf2c Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 16:13:42 +0200
Subject: [PATCH 18/19] Reformatted index.d.ts

---
 typings/index.d.ts | 78 ++++++++++++++++++++++++++++------------------
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/typings/index.d.ts b/typings/index.d.ts
index a7973dbcd..d38f9c0c6 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1,5 +1,9 @@
 import * as React from 'react';
-import { AccessibilityState, AccessibilityStates, AccessibilityRole } from 'react-native';
+import {
+  AccessibilityState,
+  AccessibilityStates,
+  AccessibilityRole,
+} from 'react-native';
 import { ReactTestInstance, ReactTestRendererJSON } from 'react-test-renderer';
 
 type GetReturn = ReactTestInstance;
@@ -22,11 +26,11 @@ interface GetByAPI {
   getAllByDisplayValue: (value: string | RegExp) => Array<ReactTestInstance>;
 
   // Unsafe aliases
-  UNSAFE_getByType: <P>(type: React.ComponentType<P>) => ReactTestInstance,
+  UNSAFE_getByType: <P>(type: React.ComponentType<P>) => ReactTestInstance;
   UNSAFE_getAllByType: <P>(
     type: React.ComponentType<P>
   ) => Array<ReactTestInstance>;
-  UNSAFE_getByProps: (props: Record<string, any>) => ReactTestInstance,
+  UNSAFE_getByProps: (props: Record<string, any>) => ReactTestInstance;
   UNSAFE_getAllByProps: (
     props: Record<string, any>
   ) => Array<ReactTestInstance>;
@@ -75,10 +79,16 @@ interface QueryByAPI {
   ) => Array<ReactTestInstance> | [];
 
   // Unsafe aliases
-  UNSAFE_queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null;
-  UNSAFE_queryAllByType: <P>(type: React.ComponentType<P>) => Array<ReactTestInstance> | [];
+  UNSAFE_queryByType: <P>(
+    type: React.ComponentType<P>
+  ) => ReactTestInstance | null;
+  UNSAFE_queryAllByType: <P>(
+    type: React.ComponentType<P>
+  ) => Array<ReactTestInstance> | [];
   UNSAFE_queryByProps: (props: Record<string, any>) => ReactTestInstance | null;
-  UNSAFE_queryAllByProps: (props: Record<string, any>) => Array<ReactTestInstance> | [];
+  UNSAFE_queryAllByProps: (
+    props: Record<string, any>
+  ) => Array<ReactTestInstance> | [];
 
   // Removed
   /**
@@ -155,10 +165,10 @@ export type A11yValue = {
 
 type A11yAPI = {
   // Label
-  getByA11yLabel: (matcher: string | RegExp) => GetReturn,
-  getAllByA11yLabel: (matcher: string | RegExp) => GetAllReturn,
-  queryByA11yLabel: (matcher: string | RegExp) => QueryReturn,
-  queryAllByA11yLabel: (matcher: string | RegExp) => QueryAllReturn,
+  getByA11yLabel: (matcher: string | RegExp) => GetReturn;
+  getAllByA11yLabel: (matcher: string | RegExp) => GetAllReturn;
+  queryByA11yLabel: (matcher: string | RegExp) => QueryReturn;
+  queryAllByA11yLabel: (matcher: string | RegExp) => QueryAllReturn;
   findByA11yLabel: (
     matcher: string | RegExp,
     waitForOptions?: WaitForOptions
@@ -169,10 +179,10 @@ type A11yAPI = {
   ) => FindAllReturn;
 
   // Hint
-  getByA11yHint: (matcher: string | RegExp) => GetReturn,
-  getAllByA11yHint: (matcher: string | RegExp) => GetAllReturn,
-  queryByA11yHint: (matcher: string | RegExp) => QueryReturn,
-  queryAllByA11yHint: (matcher: string | RegExp) => QueryAllReturn,
+  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
@@ -183,10 +193,10 @@ type A11yAPI = {
   ) => FindAllReturn;
 
   // Role
-  getByA11yRole: (matcher: AccessibilityRole | RegExp) => GetReturn,
-  getAllByA11yRole: (matcher: AccessibilityRole | RegExp) => GetAllReturn,
-  queryByA11yRole: (matcher: AccessibilityRole | RegExp) => QueryReturn,
-  queryAllByA11yRole: (matcher: AccessibilityRole | RegExp) => QueryAllReturn,
+  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
@@ -197,16 +207,24 @@ type A11yAPI = {
   ) => FindAllReturn;
 
   // States
-  getByA11yStates: (matcher: AccessibilityStates | Array<AccessibilityStates>) => GetReturn,
-  getAllByA11yStates: (matcher: AccessibilityStates | Array<AccessibilityStates>) => GetAllReturn,
-  queryByA11yStates: (matcher: AccessibilityStates | Array<AccessibilityStates>) => QueryReturn,
-  queryAllByA11yStates: (matcher: AccessibilityStates | Array<AccessibilityStates>) => QueryAllReturn,
+  getByA11yStates: (
+    matcher: AccessibilityStates | Array<AccessibilityStates>
+  ) => GetReturn;
+  getAllByA11yStates: (
+    matcher: AccessibilityStates | Array<AccessibilityStates>
+  ) => GetAllReturn;
+  queryByA11yStates: (
+    matcher: AccessibilityStates | Array<AccessibilityStates>
+  ) => QueryReturn;
+  queryAllByA11yStates: (
+    matcher: AccessibilityStates | Array<AccessibilityStates>
+  ) => QueryAllReturn;
 
   // State
-  getByA11yState: (matcher: AccessibilityState) => GetReturn,
-  getAllByA11yState: (matcher: AccessibilityState) => GetAllReturn,
-  queryByA11yState: (matcher: AccessibilityState) => QueryReturn,
-  queryAllByA11yState: (matcher: AccessibilityState) => QueryAllReturn,
+  getByA11yState: (matcher: AccessibilityState) => GetReturn;
+  getAllByA11yState: (matcher: AccessibilityState) => GetAllReturn;
+  queryByA11yState: (matcher: AccessibilityState) => QueryReturn;
+  queryAllByA11yState: (matcher: AccessibilityState) => QueryAllReturn;
   findByA11yState: (
     matcher: AccessibilityState,
     waitForOptions?: WaitForOptions
@@ -217,10 +235,10 @@ type A11yAPI = {
   ) => FindAllReturn;
 
   // Value
-  getByA11yValue: (matcher: A11yValue) => GetReturn,
-  getAllByA11yValue: (matcher: A11yValue) => GetAllReturn,
-  queryByA11yValue: (matcher: A11yValue) => QueryReturn,
-  queryAllByA11yValue: (matcher: A11yValue) => QueryAllReturn,
+  getByA11yValue: (matcher: A11yValue) => GetReturn;
+  getAllByA11yValue: (matcher: A11yValue) => GetAllReturn;
+  queryByA11yValue: (matcher: A11yValue) => QueryReturn;
+  queryAllByA11yValue: (matcher: A11yValue) => QueryAllReturn;
   findByA11yValue: (
     matcher: A11yValue,
     waitForOptions?: WaitForOptions

From 2a29cb85ebc7146357043b2a8896a1c857577256 Mon Sep 17 00:00:00 2001
From: Maciej Jastrzebski <mdjastrzebski@gmail.com>
Date: Tue, 19 May 2020 16:13:54 +0200
Subject: [PATCH 19/19] Removed remaining refs to warnFn

---
 src/helpers/queryByAPI.js | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/helpers/queryByAPI.js b/src/helpers/queryByAPI.js
index a71c73b2f..5566e3e4d 100644
--- a/src/helpers/queryByAPI.js
+++ b/src/helpers/queryByAPI.js
@@ -92,12 +92,8 @@ export const queryAllByTestId = (instance: ReactTestInstance) => (
   }
 };
 
-export const UNSAFE_queryByType = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) =>
+export const UNSAFE_queryByType = (instance: ReactTestInstance) =>
   function queryByTypeFn(type: React.ComponentType<any>) {
-    warnFn && warnFn('queryByType');
     try {
       return UNSAFE_getByType(instance)(type);
     } catch (error) {
@@ -105,12 +101,8 @@ export const UNSAFE_queryByType = (
     }
   };
 
-export const UNSAFE_queryByProps = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) =>
+export const UNSAFE_queryByProps = (instance: ReactTestInstance) =>
   function queryByPropsFn(props: { [propName: string]: any }) {
-    warnFn && warnFn('queryByProps');
     try {
       return UNSAFE_getByProps(instance)(props);
     } catch (error) {
@@ -118,11 +110,9 @@ export const UNSAFE_queryByProps = (
     }
   };
 
-export const UNSAFE_queryAllByType = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) => (type: React.ComponentType<any>) => {
-  warnFn && warnFn('queryAllByType');
+export const UNSAFE_queryAllByType = (instance: ReactTestInstance) => (
+  type: React.ComponentType<any>
+) => {
   try {
     return UNSAFE_getAllByType(instance)(type);
   } catch (error) {
@@ -130,11 +120,9 @@ export const UNSAFE_queryAllByType = (
   }
 };
 
-export const UNSAFE_queryAllByProps = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) => (props: { [propName: string]: any }) => {
-  warnFn && warnFn('queryAllByProps');
+export const UNSAFE_queryAllByProps = (instance: ReactTestInstance) => (props: {
+  [propName: string]: any,
+}) => {
   try {
     return UNSAFE_getAllByProps(instance)(props);
   } catch (error) {