Merge remote-tracking branch 'origin/master' into pr/74

* origin/master:
  chore: Update flow-bin to the latest version 🚀 (callstack#86)
  chore: Greenkeeper/@types/react 16.7.11 (callstack#82)
  chore: release 1.4.2
  fix: add errors for queryBy* helpers when more instances found (callstack#79)
  chore: release 1.4.1
  chore: release 1.4.1-es5.1
  fix: remove deprecated existential Flow type and use any for now (callstack#77)
  docs: add note about new APIs in v1.4 (callstack#76)
  chore: Update flow-bin to the latest version 🚀 (callstack#75)

Author: thymikee

.flowconfig

@@ -69,4 +69,4 @@ include_warnings=true
 .*/Libraries/YellowBox/UI/YellowBoxList.js
 
 [version]
-^0.86.0
+^0.88.0

docs/api.md

@@ -8,10 +8,10 @@ Defined as:
 
 ```jsx
 function render(
-  component: React.Element<*>,
+  component: React.Element<any>,
   options?: {
     /* You won't often use this, but it's helpful when testing refs */
-    createNodeMock: (element: React.Element<*>) => any,
+    createNodeMock: (element: React.Element<any>) => any,
   }
 ): RenderResult {}
 ```
@@ -59,10 +59,14 @@ A method returning an array of `ReactTestInstance`s with matching props object.
 
 ### `getByType: (type: React.ComponentType<*>)`
 
+> Note: added in v1.4
+
 A method returning a `ReactTestInstance` with matching a React component type. Throws when no matches.
 
 ### `getAllByType: (type: React.ComponentType<*>)`
 
+> Note: added in v1.4
+
 A method returning an array of `ReactTestInstance`s with matching a React component type.
 
 ### `[DEPRECATED] getByName: (name: React.ComponentType<*>)`
@@ -77,7 +81,7 @@ A method returning an array of `ReactTestInstance`s with matching a React compon
 
 > This method has been **deprecated** because using it results in fragile tests that may break between minor React Native versions. It will be removed in next major release (v2.0). Use [`getAllByType`](#getallbytype-type-reactcomponenttype) instead.
 
-### `update: (element: React.Element<*>) => void`
+### `update: (element: React.Element<any>) => void`
 
 Re-render the in-memory tree with a new root element. This simulates a React update at the root. If the new element has the same type and key as the previous element, the tree will be updated; otherwise, it will re-mount a new tree.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-testing-library",
-  "version": "1.4.1-es5.0",
+  "version": "1.4.2",
   "description": "Simple React Native testing utilities helping you write better tests with less effort",
   "main": "build/index.js",
   "typings": "./typings/index.d.ts",
@@ -13,15 +13,15 @@
     "@babel/core": "^7.1.2",
     "@babel/runtime": "^7.1.2",
     "@callstack/eslint-config": "^3.0.0",
-    "@types/react": "^16.4.15",
+    "@types/react": "^16.7.11",
     "@types/react-test-renderer": "^16.0.3",
     "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^23.6.0",
     "chalk": "^2.4.1",
     "conventional-changelog-cli": "^2.0.11",
     "dedent": "^0.7.0",
     "eslint": "^5.6.1",
-    "flow-bin": "^0.86.0",
+    "flow-bin": "^0.88.0",
     "flow-copy-source": "^2.0.2",
     "jest": "^23.6.0",
     "metro-react-native-babel-preset": "^0.49.0",
@@ -41,7 +41,7 @@
   },
   "scripts": {
     "test": "jest",
-    "flow-check": "flow check",
+    "flow-check": "flow check --ignore-version",
     "typescript-check": "tsc --noEmit --skipLibCheck --jsx react ./typings/__tests__/*",
     "lint": "eslint src --cache",
     "release": "release-it",
@@ -52,6 +52,13 @@
   "jest": {
     "preset": "react-native"
   },
+  "greenkeeper": {
+    "ignore": [
+      "react",
+      "react-test-renderer",
+      "metro-react-native-babel-preset"
+    ]
+  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   }

src/__tests__/__snapshots__/shallow.test.js.snap

@@ -13,7 +13,9 @@ exports[`shallow rendering React Test Instance 1`] = `
 `;
 
 exports[`shallow rendering React elements 1`] = `
-<View>
+<View
+  testID="2"
+>
   <Text
     testID="text-button"
   >

src/__tests__/render.test.js

@@ -124,6 +124,7 @@ test('getByText, queryByText', () => {
 
   expect(queryByText(/change/i)).toBe(button);
   expect(queryByText('InExistent')).toBeNull();
+  expect(() => queryByText(/fresh/)).toThrow('Expected 1 but found 3');
 });
 
 test('getAllByText, queryAllByText', () => {

src/__tests__/shallow.test.js

@@ -3,14 +3,18 @@ import React from 'react';
 import { View, Text } from 'react-native';
 import { shallow, render } from '..';
 
-const TextPress = () => (
-  <View>
+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 />);
+  const { output } = shallow(<TextPress dummyID="2" />);
 
   expect(output).toMatchSnapshot();
 });

src/debug.js

@@ -10,11 +10,11 @@ import format from './helpers/format';
  * Log pretty-printed deep test component instance
  */
 function debugDeepElementOrInstance(
-  instance: React.Element<*> | ?ReactTestRendererJSON,
+  instance: React.Element<any> | ?ReactTestRendererJSON,
   message?: any = ''
 ) {
   try {
-    // We're assuming React.Element<*> here and fallback to
+    // We're assuming React.Element<any> here and fallback to
     // rendering ?ReactTestRendererJSON
     // $FlowFixMe
     const { toJSON } = render(instance);
@@ -29,7 +29,10 @@ function debugDeepElementOrInstance(
   }
 }
 
-function debug(instance: ReactTestInstance | React.Element<*>, message?: any) {
+function debug(
+  instance: ReactTestInstance | React.Element<any>,
+  message?: any
+) {
   return debugShallow(instance, message);
 }
 

src/helpers/debugShallow.js

@@ -7,7 +7,7 @@ import format from './format';
  * Log pretty-printed shallow test component instance
  */
 export default function debugShallow(
-  instance: ReactTestInstance | React.Element<*>,
+  instance: ReactTestInstance | React.Element<any>,
   message?: any
 ) {
   const { output } = shallow(instance);

src/helpers/queryByAPI.js

@@ -11,58 +11,60 @@ import {
   getAllByText,
   getAllByProps,
 } from './getByAPI';
-import { logDeprecationWarning } from './errors';
+import { ErrorWithStack, logDeprecationWarning } from './errors';
 
-export const queryByName = (instance: ReactTestInstance) => (
-  name: string | React.ComponentType<*>
-) => {
-  logDeprecationWarning('queryByName', 'getByName');
-  try {
-    return getByName(instance)(name);
-  } catch (error) {
+const createQueryByError = (error: Error, callsite: Function) => {
+  if (error.message.includes('No instances found')) {
     return null;
   }
+  throw new ErrorWithStack(error.message, callsite);
 };
 
-export const queryByType = (instance: ReactTestInstance) => (
-  type: React.ComponentType<*>
-) => {
-  try {
-    return getByType(instance)(type);
-  } catch (error) {
-    return null;
-  }
-};
+export const queryByName = (instance: ReactTestInstance) =>
+  function queryByNameFn(name: string | React.ComponentType<*>) {
+    logDeprecationWarning('queryByName', 'getByName');
+    try {
+      return getByName(instance)(name);
+    } catch (error) {
+      return createQueryByError(error, queryByNameFn);
+    }
+  };
 
-export const queryByText = (instance: ReactTestInstance) => (
-  text: string | RegExp
-) => {
-  try {
-    return getByText(instance)(text);
-  } catch (error) {
-    return null;
-  }
-};
+export const queryByType = (instance: ReactTestInstance) =>
+  function queryByTypeFn(type: React.ComponentType<*>) {
+    try {
+      return getByType(instance)(type);
+    } catch (error) {
+      return createQueryByError(error, queryByTypeFn);
+    }
+  };
 
-export const queryByProps = (instance: ReactTestInstance) => (props: {
-  [propName: string]: any,
-}) => {
-  try {
-    return getByProps(instance)(props);
-  } catch (error) {
-    return null;
-  }
-};
+export const queryByText = (instance: ReactTestInstance) =>
+  function queryByTextFn(text: string | RegExp) {
+    try {
+      return getByText(instance)(text);
+    } catch (error) {
+      return createQueryByError(error, queryByTextFn);
+    }
+  };
 
-export const queryByTestId = (instance: ReactTestInstance) => (
-  testID: string
-) => {
-  try {
-    return getByTestId(instance)(testID);
-  } catch (error) {
-    return null;
-  }
-};
+export const queryByProps = (instance: ReactTestInstance) =>
+  function queryByPropsFn(props: { [propName: string]: any }) {
+    try {
+      return getByProps(instance)(props);
+    } catch (error) {
+      return createQueryByError(error, queryByPropsFn);
+    }
+  };
+
+export const queryByTestId = (instance: ReactTestInstance) =>
+  function queryByTestIdFn(testID: string) {
+    try {
+      return getByTestId(instance)(testID);
+    } catch (error) {
+      return createQueryByError(error, queryByTestIdFn);
+    }
+  };
 
 export const queryAllByName = (instance: ReactTestInstance) => (
   name: string | React.ComponentType<*>

src/render.js

@@ -11,8 +11,8 @@ import debugDeep from './helpers/debugDeep';
  * to assert on the output.
  */
 export default function render(
-  component: React.Element<*>,
-  options?: { createNodeMock: (element: React.Element<*>) => any }
+  component: React.Element<any>,
+  options?: { createNodeMock: (element: React.Element<any>) => any }
 ) {
   const renderer = TestRenderer.create(component, options);
   const instance = renderer.root;