From 10e696165101a1e58c1293dc4a69ed9c8491115b Mon Sep 17 00:00:00 2001
From: Karl Dominick Cinco <dominick@compassstarltd.com>
Date: Mon, 26 Nov 2018 13:48:48 +0800
Subject: [PATCH 1/2] refactor: Modify ByType API typings to allow required
 props

---
 typings/__tests__/index.test.tsx | 75 ++++++++++++++++++++------------
 typings/index.d.ts               | 14 +++---
 2 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/typings/__tests__/index.test.tsx b/typings/__tests__/index.test.tsx
index c85827090..8a32da5e5 100644
--- a/typings/__tests__/index.test.tsx
+++ b/typings/__tests__/index.test.tsx
@@ -1,16 +1,23 @@
-import * as React from 'react';
-import { ReactTestInstance } from 'react-test-renderer';
+import * as React from "react";
+import { ReactTestInstance } from "react-test-renderer";
 import {
   render,
   fireEvent,
   shallow,
   flushMicrotasksQueue,
   debug,
-  waitForElement,
-} from '../..';
+  waitForElement
+} from "../..";
+
+interface HasRequiredProp {
+  requiredProp: string;
+}
 
 const View = props => props.children;
 const Text = props => props.children;
+const ElementWithRequiredProps = (props: HasRequiredProp) => (
+  <Text>{props.requiredProp}</Text>
+);
 
 const TestComponent = () => (
   <View>
@@ -21,64 +28,76 @@ const TestComponent = () => (
 const tree = render(<TestComponent />);
 
 // getByAPI tests
-const getByNameString: ReactTestInstance = tree.getByName('View');
+const getByNameString: ReactTestInstance = tree.getByName("View");
 const getByNameContructor: ReactTestInstance = tree.getByName(View);
 const getByType: ReactTestInstance = tree.getByType(View);
-const getByTextString: ReactTestInstance = tree.getByText('<View />');
+const getByTypeWithRequiredProps: ReactTestInstance = tree.getByType(
+  ElementWithRequiredProps
+);
+const getByTextString: ReactTestInstance = tree.getByText("<View />");
 const getByTextRegExp: ReactTestInstance = tree.getByText(/View/g);
 const getByProps: ReactTestInstance = tree.getByProps({ value: 2 });
-const getByTestId: ReactTestInstance = tree.getByTestId('test-id');
-const getAllByNameString: Array<ReactTestInstance> = tree.getAllByName('View');
+const getByTestId: ReactTestInstance = tree.getByTestId("test-id");
+const getAllByNameString: Array<ReactTestInstance> = tree.getAllByName("View");
 const getAllByNameConstructor: Array<ReactTestInstance> = tree.getAllByName(
   View
 );
 const getAllByType: Array<ReactTestInstance> = tree.getAllByType(View);
+const getAllByTypeWithRequiredProps: Array<
+  ReactTestInstance
+> = tree.getAllByType(ElementWithRequiredProps);
 const getAllByTextString: Array<ReactTestInstance> = tree.getAllByText(
-  '<View />'
+  "<View />"
 );
 const getAllByTextRegExp: Array<ReactTestInstance> = tree.getAllByText(/Text/g);
 const getAllByProps: Array<ReactTestInstance> = tree.getAllByProps({
-  value: 2,
+  value: 2
 });
 
 // queuryByAPI tests
-const queryByNameString: ReactTestInstance | null = tree.queryByName('View');
+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(
+  ElementWithRequiredProps
+);
 const queryByTextString: ReactTestInstance | null = tree.queryByText(
-  '<View />'
+  "<View />"
 );
 const queryByTextRegExp: ReactTestInstance | null = tree.queryByText(/View/g);
 const queryByProps: ReactTestInstance | null = tree.queryByProps({ value: 2 });
-const queryByTestId: ReactTestInstance | null = tree.queryByTestId('test-id');
+const queryByTestId: ReactTestInstance | null = tree.queryByTestId("test-id");
 const queryAllByNameString: Array<ReactTestInstance> = tree.getAllByName(
-  'View'
+  "View"
 );
 const queryAllByNameConstructor: Array<ReactTestInstance> = tree.getAllByName(
   View
 );
 const queryAllByType: Array<ReactTestInstance> = tree.getAllByType(View);
+const queryAllByTypeWithRequiredProps: Array<
+  ReactTestInstance
+> = tree.getAllByType(ElementWithRequiredProps);
 const queryAllByTextString: Array<ReactTestInstance> = tree.queryAllByText(
-  'View'
+  "View"
 );
 const queryAllByTextRegExp: Array<ReactTestInstance> = tree.queryAllByText(
   /View/g
 );
 const queryAllByProps: Array<ReactTestInstance> = tree.getAllByProps({
-  value: 2,
+  value: 2
 });
-const debugFn = tree.debug()
-const debugFnWithMessage = tree.debug('my message')
+const debugFn = tree.debug();
+const debugFnWithMessage = tree.debug("my message");
 
 tree.update(<View />);
 tree.unmount();
 
 // fireEvent API tests
-fireEvent(getByNameString, 'press');
-fireEvent(getByNameString, 'press', 'data');
+fireEvent(getByNameString, "press");
+fireEvent(getByNameString, "press", "data");
 fireEvent.press(getByNameString);
-fireEvent.changeText(getByNameString, 'string');
-fireEvent.scroll(getByNameString, 'eventData');
+fireEvent.changeText(getByNameString, "string");
+fireEvent.scroll(getByNameString, "eventData");
 
 // shallow API
 const shallowTree: { output: React.ReactElement<any> } = shallow(
@@ -89,18 +108,18 @@ const waitForFlush: Promise<any> = flushMicrotasksQueue();
 
 // debug API
 debug(<TestComponent />);
-debug(<TestComponent />, 'message');
+debug(<TestComponent />, "message");
 debug(getByNameString);
-debug(getByNameString, 'message');
+debug(getByNameString, "message");
 debug.shallow(<TestComponent />);
-debug.shallow(<TestComponent />, 'message');
+debug.shallow(<TestComponent />, "message");
 debug.deep(<TestComponent />);
-debug.deep(<TestComponent />, 'message');
+debug.deep(<TestComponent />, "message");
 debug.deep(tree.toJSON());
 
 const waitBy: Promise<ReactTestInstance> = waitForElement<ReactTestInstance>(
-  () => tree.getByName('View')
+  () => tree.getByName("View")
 );
 const waitByAll: Promise<Array<ReactTestInstance>> = waitForElement<
   Array<ReactTestInstance>
->(() => tree.getAllByName('View'), 1000, 50);
+>(() => tree.getAllByName("View"), 1000, 50);
diff --git a/typings/index.d.ts b/typings/index.d.ts
index bc3ab1f04..2ea1c5ec4 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1,26 +1,28 @@
-import * as React from 'react';
-import { ReactTestInstance, ReactTestRendererJSON } from 'react-test-renderer';
+import * as React from "react";
+import { ReactTestInstance, ReactTestRendererJSON } from "react-test-renderer";
 
 export interface GetByAPI {
   getByName: (name: React.ReactType) => ReactTestInstance;
-  getByType: (type: React.ComponentType) => ReactTestInstance;
+  getByType: <P>(type: React.ComponentType<P>) => ReactTestInstance;
   getByText: (text: string | RegExp) => ReactTestInstance;
   getByProps: (props: Record<string, any>) => ReactTestInstance;
   getByTestId: (testID: string) => ReactTestInstance;
   getAllByName: (name: React.ReactType) => Array<ReactTestInstance>;
-  getAllByType: (type: React.ComponentType) => Array<ReactTestInstance>;
+  getAllByType: <P>(type: React.ComponentType<P>) => Array<ReactTestInstance>;
   getAllByText: (text: string | RegExp) => Array<ReactTestInstance>;
   getAllByProps: (props: Record<string, any>) => Array<ReactTestInstance>;
 }
 
 export interface QueryByAPI {
   queryByName: (name: React.ReactType) => ReactTestInstance | null;
-  queryByType: (type: React.ComponentType) => ReactTestInstance | null;
+  queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null;
   queryByText: (name: string | RegExp) => ReactTestInstance | null;
   queryByProps: (props: Record<string, any>) => ReactTestInstance | null;
   queryByTestId: (testID: string) => ReactTestInstance | null;
   queryAllByName: (name: React.ReactType) => Array<ReactTestInstance> | [];
-  queryAllByType: (type: React.ComponentType) => Array<ReactTestInstance> | [];
+  queryAllByType: <P>(
+    type: React.ComponentType<P>
+  ) => Array<ReactTestInstance> | [];
   queryAllByText: (text: string | RegExp) => Array<ReactTestInstance> | [];
   queryAllByProps: (
     props: Record<string, any>

From 0f448e059b7d009f70c5b91223d7636dd693e426 Mon Sep 17 00:00:00 2001
From: Karl Dominick Cinco <dominick@compassstarltd.com>
Date: Mon, 26 Nov 2018 13:56:45 +0800
Subject: [PATCH 2/2] refactor: Modify ByType API typings to allow required
 props

---
 typings/__tests__/index.test.tsx | 56 ++++++++++++++++----------------
 typings/index.d.ts               |  4 +--
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/typings/__tests__/index.test.tsx b/typings/__tests__/index.test.tsx
index 8a32da5e5..4b1d744d3 100644
--- a/typings/__tests__/index.test.tsx
+++ b/typings/__tests__/index.test.tsx
@@ -1,13 +1,13 @@
-import * as React from "react";
-import { ReactTestInstance } from "react-test-renderer";
+import * as React from 'react';
+import { ReactTestInstance } from 'react-test-renderer';
 import {
   render,
   fireEvent,
   shallow,
   flushMicrotasksQueue,
   debug,
-  waitForElement
-} from "../..";
+  waitForElement,
+} from '../..';
 
 interface HasRequiredProp {
   requiredProp: string;
@@ -28,17 +28,17 @@ const TestComponent = () => (
 const tree = render(<TestComponent />);
 
 // getByAPI tests
-const getByNameString: ReactTestInstance = tree.getByName("View");
+const getByNameString: ReactTestInstance = tree.getByName('View');
 const getByNameContructor: ReactTestInstance = tree.getByName(View);
 const getByType: ReactTestInstance = tree.getByType(View);
 const getByTypeWithRequiredProps: ReactTestInstance = tree.getByType(
   ElementWithRequiredProps
 );
-const getByTextString: ReactTestInstance = tree.getByText("<View />");
+const getByTextString: ReactTestInstance = tree.getByText('<View />');
 const getByTextRegExp: ReactTestInstance = tree.getByText(/View/g);
 const getByProps: ReactTestInstance = tree.getByProps({ value: 2 });
-const getByTestId: ReactTestInstance = tree.getByTestId("test-id");
-const getAllByNameString: Array<ReactTestInstance> = tree.getAllByName("View");
+const getByTestId: ReactTestInstance = tree.getByTestId('test-id');
+const getAllByNameString: Array<ReactTestInstance> = tree.getAllByName('View');
 const getAllByNameConstructor: Array<ReactTestInstance> = tree.getAllByName(
   View
 );
@@ -47,28 +47,28 @@ const getAllByTypeWithRequiredProps: Array<
   ReactTestInstance
 > = tree.getAllByType(ElementWithRequiredProps);
 const getAllByTextString: Array<ReactTestInstance> = tree.getAllByText(
-  "<View />"
+  '<View />'
 );
 const getAllByTextRegExp: Array<ReactTestInstance> = tree.getAllByText(/Text/g);
 const getAllByProps: Array<ReactTestInstance> = tree.getAllByProps({
-  value: 2
+  value: 2,
 });
 
 // queuryByAPI tests
-const queryByNameString: ReactTestInstance | null = tree.queryByName("View");
+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(
   ElementWithRequiredProps
 );
 const queryByTextString: ReactTestInstance | null = tree.queryByText(
-  "<View />"
+  '<View />'
 );
 const queryByTextRegExp: ReactTestInstance | null = tree.queryByText(/View/g);
 const queryByProps: ReactTestInstance | null = tree.queryByProps({ value: 2 });
-const queryByTestId: ReactTestInstance | null = tree.queryByTestId("test-id");
+const queryByTestId: ReactTestInstance | null = tree.queryByTestId('test-id');
 const queryAllByNameString: Array<ReactTestInstance> = tree.getAllByName(
-  "View"
+  'View'
 );
 const queryAllByNameConstructor: Array<ReactTestInstance> = tree.getAllByName(
   View
@@ -78,26 +78,26 @@ const queryAllByTypeWithRequiredProps: Array<
   ReactTestInstance
 > = tree.getAllByType(ElementWithRequiredProps);
 const queryAllByTextString: Array<ReactTestInstance> = tree.queryAllByText(
-  "View"
+  'View'
 );
 const queryAllByTextRegExp: Array<ReactTestInstance> = tree.queryAllByText(
   /View/g
 );
 const queryAllByProps: Array<ReactTestInstance> = tree.getAllByProps({
-  value: 2
+  value: 2,
 });
-const debugFn = tree.debug();
-const debugFnWithMessage = tree.debug("my message");
+const debugFn = tree.debug()
+const debugFnWithMessage = tree.debug('my message')
 
 tree.update(<View />);
 tree.unmount();
 
 // fireEvent API tests
-fireEvent(getByNameString, "press");
-fireEvent(getByNameString, "press", "data");
+fireEvent(getByNameString, 'press');
+fireEvent(getByNameString, 'press', 'data');
 fireEvent.press(getByNameString);
-fireEvent.changeText(getByNameString, "string");
-fireEvent.scroll(getByNameString, "eventData");
+fireEvent.changeText(getByNameString, 'string');
+fireEvent.scroll(getByNameString, 'eventData');
 
 // shallow API
 const shallowTree: { output: React.ReactElement<any> } = shallow(
@@ -108,18 +108,18 @@ const waitForFlush: Promise<any> = flushMicrotasksQueue();
 
 // debug API
 debug(<TestComponent />);
-debug(<TestComponent />, "message");
+debug(<TestComponent />, 'message');
 debug(getByNameString);
-debug(getByNameString, "message");
+debug(getByNameString, 'message');
 debug.shallow(<TestComponent />);
-debug.shallow(<TestComponent />, "message");
+debug.shallow(<TestComponent />, 'message');
 debug.deep(<TestComponent />);
-debug.deep(<TestComponent />, "message");
+debug.deep(<TestComponent />, 'message');
 debug.deep(tree.toJSON());
 
 const waitBy: Promise<ReactTestInstance> = waitForElement<ReactTestInstance>(
-  () => tree.getByName("View")
+  () => tree.getByName('View')
 );
 const waitByAll: Promise<Array<ReactTestInstance>> = waitForElement<
   Array<ReactTestInstance>
->(() => tree.getAllByName("View"), 1000, 50);
+>(() => tree.getAllByName('View'), 1000, 50);
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 2ea1c5ec4..d1ce52fda 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -1,5 +1,5 @@
-import * as React from "react";
-import { ReactTestInstance, ReactTestRendererJSON } from "react-test-renderer";
+import * as React from 'react';
+import { ReactTestInstance, ReactTestRendererJSON } from 'react-test-renderer';
 
 export interface GetByAPI {
   getByName: (name: React.ReactType) => ReactTestInstance;