Merge branch 'master' into pr/async-utils

Author: mpeyper

.github/PULL_REQUEST_TEMPLATE.md

@@ -32,7 +32,7 @@ merge of your pull request!
 
 <!--
 To check an item, place an "x" in the box like so: "- [x] Documentation"
-Remove any items that are relevant to your changes
+Remove items that are irrelevant to your changes.
 -->
 
 - [ ] Documentation updated

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing
 
-Thanks for wanting to make contribution and wanting to improve this library for everyone!
+Thanks for wanting to make a contribution and wanting to improve this library for everyone!
 
 ## Project setup
 
@@ -29,12 +29,11 @@ Please make sure to run the tests before you commit your changes. You can do so
 
 ### Update Typings
 
-The TypeScript type definitions are in the
-[DefinitelyTyped repo](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/testing-library__react-hooks)
+The TypeScript type definitions can be found in the [DefinitelyTyped repo](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/testing-library__react-hooks).
 
 ## Help needed
 
-Please checkout the
-[the open issues](https://github.com/testing-library/react-hooks-testing-library/issues)
+Please check out the
+[the open issues](https://github.com/testing-library/react-hooks-testing-library/issues).
 
 Also, please watch the repo and respond to questions/bug reports/feature requests! Thanks!

README.md

@@ -27,7 +27,7 @@
 [![downloads](https://img.shields.io/npm/dm/@testing-library/react-hooks.svg?style=flat-square)](http://www.npmtrends.com/@testing-library/react-hooks)
 [![MIT License](https://img.shields.io/npm/l/@testing-library/react-hooks.svg?style=flat-square)](https://github.com/testing-library/react-hooks-testing-library/blob/master/LICENSE.md)
 
-[![All Contributors](https://img.shields.io/badge/all_contributors-13-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-13-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/react-hooks-testing-library/blob/master/CODE_OF_CONDUCT.md)
 [![Netlify Status](https://api.netlify.com/api/v1/badges/9a8f27a5-df38-4910-a248-4908b1ba29a7/deploy-status)](https://app.netlify.com/sites/react-hooks-testing-library/deploys)

docs/api-reference.md

@@ -25,7 +25,7 @@ function renderHook(
 Renders a test component that will call the provided `callback`, including any hooks it calls, every
 time it renders.
 
-The `renderHook` function accept the following arguments:
+The `renderHook` function accepts the following arguments:
 
 ### `callback`
 
@@ -55,7 +55,7 @@ providers from `React.createContext` for the hook to access with `useContext`.
 
 ## `renderHook` Result
 
-The `renderHook` method returns an object that has a following properties:
+The `renderHook` function returns an object that has the following properties:
 
 ### `result`
 
@@ -76,8 +76,7 @@ function rerender(newProps?: any): void
 ```
 
 A function to rerender the test component, causing any hooks to be recalculated. If `newProps` are
-passed, the will replace the `initialProps` passed to the `callback` function for the rerender any
-subsequent renders.
+passed, they will replace the `callback` function's `initialProps` for subsequent rerenders.
 
 ### `unmount`
 
@@ -91,7 +90,7 @@ A function to unmount the test component. This is commonly used to trigger clean
 ### `...asyncUtils`
 
 Utilities to assist with testing asynchronous behaviour. See the
-[Async Utils](/reference/api#async-utils) section for more details.
+[Async Utils](/reference/api#async-utilities) section for more details.
 
 ---
 
@@ -134,8 +133,16 @@ module.exports = {
 }
 ```
 
-Alternatively, setting the `RHTL_SKIP_AUTO_CLEANUP` environment variable to `true` before importing
-`@testing-library/react-hooks` will also disable this feature.
+Alternatively, you can change your test to import from `@testing-library/react-hooks/pure` instead
+of the regular imports.
+
+```diff
+- import { renderHook, cleanup, act } from '@testing-library/react-hooks'
++ import { renderHook, cleanup, act } from '@testing-library/react-hooks/pure'
+```
+
+If neither of these approaches are suitable, setting the `RHTL_SKIP_AUTO_CLEANUP` environment
+variable to `true` before importing `@testing-library/react-hooks` will also disable this feature.
 
 ---
 

docs/introduction.md

@@ -53,7 +53,7 @@ the results.
 
 ### When not to use this library
 
-1. Your hook is defined along side a component and is only used there
+1. Your hook is defined alongside a component and is only used there
 2. Your hook is easy to test by just testing the components using it
 
 ## Installation
@@ -83,5 +83,5 @@ npm install --save-dev react-test-renderer@^16.9.0
 ## Testing Framework
 
 In order to run tests, you will probably want to be using a test framework. If you have not already
-got one, we recommend using [jest](https://jestjs.io/), but this library should work without issues
+got one, we recommend using [Jest](https://jestjs.io/), but this library should work without issues
 with any of the alternatives.