Merge branch 'next' of github.com:bcarroll22/native-testing-library into next

Author: Brandon Carroll

.all-contributorsrc

@@ -68,6 +68,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "elyalvarado",
+      "name": "Ely Alvarado",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/545352?v=4",
+      "profile": "https://github.com/elyalvarado",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -24,7 +24,7 @@
 [![downloads](https://img.shields.io/npm/dm/native-testing-library.svg?style=flat-square)](http://www.npmtrends.com/native-testing-library)
 [![MIT License](https://img.shields.io/npm/l/native-testing-library.svg?style=flat-square)](https://github.com/testing-library/native-testing-library/blob/master/LICENSE)
 
-[![All Contributors](https://img.shields.io/badge/all_contributors-6-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-7-orange.svg?style=flat-square)](#contributors)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 [![Code of Conduct](https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square)](https://github.com/testing-library/native-testing-library/blob/master/CODE_OF_CONDUCT.md)
 
@@ -196,7 +196,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore -->
-<table><tr><td align="center"><a href="https://github.com/bcarroll22"><img src="https://avatars2.githubusercontent.com/u/11020406?v=4" width="100px;" alt="Brandon Carroll"/><br /><sub><b>Brandon Carroll</b></sub></a><br /><a href="https://github.com/testing-library/native-testing-library/commits?author=bcarroll22" title="Code">💻</a> <a href="https://github.com/testing-library/native-testing-library/commits?author=bcarroll22" title="Documentation">📖</a> <a href="#infra-bcarroll22" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/testing-library/native-testing-library/commits?author=bcarroll22" title="Tests">⚠️</a></td><td align="center"><a href="http://tagraves.com"><img src="https://avatars1.githubusercontent.com/u/2263711?v=4" width="100px;" alt="Tommy Graves"/><br /><sub><b>Tommy Graves</b></sub></a><br /><a href="#ideas-TAGraves" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-TAGraves" title="Maintenance">🚧</a> <a href="#review-TAGraves" title="Reviewed Pull Requests">👀</a></td><td align="center"><a href="https://kentcdodds.com"><img src="https://avatars.githubusercontent.com/u/1500684?v=3" width="100px;" alt="Kent C. Dodds"/><br /><sub><b>Kent C. Dodds</b></sub></a><br /><a href="#ideas-kentcdodds" title="Ideas, Planning, & Feedback">🤔</a></td><td align="center"><a href="https://github.com/sz-piotr"><img src="https://avatars2.githubusercontent.com/u/17070569?v=4" width="100px;" alt="Piotr Szlachciak"/><br /><sub><b>Piotr Szlachciak</b></sub></a><br /><a href="https://github.com/testing-library/native-testing-library/commits?author=sz-piotr" title="Code">💻</a></td><td align="center"><a href="https://github.com/mcgloneleviROOT"><img src="https://avatars3.githubusercontent.com/u/48258981?v=4" width="100px;" alt="mcgloneleviROOT"/><br /><sub><b>mcgloneleviROOT</b></sub></a><br /><a href="https://github.com/testing-library/native-testing-library/issues?q=author%3AmcgloneleviROOT" title="Bug reports">🐛</a> <a href="https://github.com/testing-library/native-testing-library/commits?author=mcgloneleviROOT" title="Code">💻</a></td><td align="center"><a href="http://exercism.io/profiles/wolverineks/619ce225090a43cb891d2edcbbf50401"><img src="https://avatars2.githubusercontent.com/u/8462274?v=4" width="100px;" alt="Kevin Sullivan"/><br /><sub><b>Kevin Sullivan</b></sub></a><br /><a href="https://github.com/testing-library/native-testing-library/commits?author=wolverineks" title="Documentation">📖</a></td></tr></table>
+<table><tr><td align="center"><a href="https://github.com/bcarroll22"><img src="https://avatars2.githubusercontent.com/u/11020406?v=4" width="100px;" alt="Brandon Carroll"/><br /><sub><b>Brandon Carroll</b></sub></a><br /><a href="https://github.com/testing-library/native-testing-library/commits?author=bcarroll22" title="Code">💻</a> <a href="https://github.com/testing-library/native-testing-library/commits?author=bcarroll22" title="Documentation">📖</a> <a href="#infra-bcarroll22" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/testing-library/native-testing-library/commits?author=bcarroll22" title="Tests">⚠️</a></td><td align="center"><a href="http://tagraves.com"><img src="https://avatars1.githubusercontent.com/u/2263711?v=4" width="100px;" alt="Tommy Graves"/><br /><sub><b>Tommy Graves</b></sub></a><br /><a href="#ideas-TAGraves" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-TAGraves" title="Maintenance">🚧</a> <a href="#review-TAGraves" title="Reviewed Pull Requests">👀</a></td><td align="center"><a href="https://kentcdodds.com"><img src="https://avatars.githubusercontent.com/u/1500684?v=3" width="100px;" alt="Kent C. Dodds"/><br /><sub><b>Kent C. Dodds</b></sub></a><br /><a href="#ideas-kentcdodds" title="Ideas, Planning, & Feedback">🤔</a></td><td align="center"><a href="https://github.com/sz-piotr"><img src="https://avatars2.githubusercontent.com/u/17070569?v=4" width="100px;" alt="Piotr Szlachciak"/><br /><sub><b>Piotr Szlachciak</b></sub></a><br /><a href="https://github.com/testing-library/native-testing-library/commits?author=sz-piotr" title="Code">💻</a></td><td align="center"><a href="https://github.com/mcgloneleviROOT"><img src="https://avatars3.githubusercontent.com/u/48258981?v=4" width="100px;" alt="mcgloneleviROOT"/><br /><sub><b>mcgloneleviROOT</b></sub></a><br /><a href="https://github.com/testing-library/native-testing-library/issues?q=author%3AmcgloneleviROOT" title="Bug reports">🐛</a> <a href="https://github.com/testing-library/native-testing-library/commits?author=mcgloneleviROOT" title="Code">💻</a></td><td align="center"><a href="http://exercism.io/profiles/wolverineks/619ce225090a43cb891d2edcbbf50401"><img src="https://avatars2.githubusercontent.com/u/8462274?v=4" width="100px;" alt="Kevin Sullivan"/><br /><sub><b>Kevin Sullivan</b></sub></a><br /><a href="https://github.com/testing-library/native-testing-library/commits?author=wolverineks" title="Documentation">📖</a></td><td align="center"><a href="https://github.com/elyalvarado"><img src="https://avatars1.githubusercontent.com/u/545352?v=4" width="100px;" alt="Ely Alvarado"/><br /><sub><b>Ely Alvarado</b></sub></a><br /><a href="https://github.com/testing-library/native-testing-library/commits?author=elyalvarado" title="Code">💻</a></td></tr></table>
 
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 

package.json

@@ -56,15 +56,15 @@
     "metro-react-native-babel-preset": "^0.52.0",
     "prettier": "^1.16.4",
     "pretty-quick": "^1.10.0",
-    "react": "^16.8.5",
+    "react": "16.8.3",
     "react-hooks-testing-library": "^0.5.0",
     "react-intl": "^2.8.0",
     "react-intl-native": "^2.1.2",
-    "react-native": "^0.59.0",
+    "react-native": "^0.59.5",
     "react-native-gesture-handler": "^1.1.0",
     "react-navigation": "^3.5.1",
-    "react-redux": "6.0.1",
-    "redux": "^4.0.0",
+    "react-redux": "^7.0.3",
+    "redux": "^4.0.1",
     "semantic-release": "^15.13.3"
   },
   "peerDependencies": {

src/__tests__/bugs.js

@@ -0,0 +1,21 @@
+import { queryAllByProp } from '../lib';
+import { render } from '../index';
+import { Text, View } from 'react-native';
+import React from 'react';
+
+// This is to ensure custom queries can be passed to render. In most cases, you
+// wouldn't/shouldn't need to do this, but we do allow it so we'll test to
+// make sure that it works for those who use it.
+test('returns the queries passed as options bound to the container', () => {
+  const queryAllBySelectionColor = queryAllByProp.bind(null, 'selectionColor');
+  const queries = { queryAllBySelectionColor };
+
+  const { queryAllBySelectionColor: queryAllByImplementationDetail } = render(
+    <View>
+      <Text selectionColor="blue">hello world</Text>
+    </View>,
+    { queries },
+  );
+
+  expect(queryAllByImplementationDetail('blue')).toHaveLength(1);
+});

src/__tests__/render.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { View } from 'react-native';
-import { render } from '../';
+import { Text, View } from 'react-native';
+import { queryAllByProp, render } from '../';
 
 test('renders View', () => {
   const { container } = render(<View />);

src/index.js

@@ -21,7 +21,7 @@ configureNTL({
   },
 });
 
-function render(ui, { options = {}, wrapper: WrapperComponent } = {}) {
+function render(ui, { options = {}, wrapper: WrapperComponent, queries } = {}) {
   const wrapUiIfNeeded = innerElement =>
     WrapperComponent ? <WrapperComponent>{innerElement}</WrapperComponent> : innerElement;
 
@@ -41,7 +41,7 @@ function render(ui, { options = {}, wrapper: WrapperComponent } = {}) {
         testRenderer.update(wrapUiIfNeeded(rerenderUi));
       });
     },
-    ...getQueriesForElement(testRenderer),
+    ...getQueriesForElement(testRenderer, queries),
   };
 }
 

typings/index.d.ts

@@ -59,3 +59,4 @@ export * from './queries';
 export * from './query-helpers';
 export * from './wait';
 export * from './wait-for-element';
+export * from './wait-for-element-to-be-removed';

typings/matches.d.ts

@@ -1,14 +1,18 @@
+import { NativeTestInstance } from './query-helpers';
+
 export type MatcherFunction = (content: string, element: HTMLElement) => boolean;
 export type Matcher = string | RegExp | MatcherFunction;
 
 export type NormalizerFn = (text: string) => string;
+export type SelectorFn = (element: NativeTestInstance) => boolean;
 
 export interface MatcherOptions {
   exact?: boolean;
   /** Use normalizer with getDefaultNormalizer instead */
   trim?: boolean;
   /** Use normalizer with getDefaultNormalizer instead */
   collapseWhitespace?: boolean;
+  selector?: SelectorFn;
   normalizer?: NormalizerFn;
 }