[pkg] Upgrade to @testing-library/react-hooks

Author: ntucker

docs/api/makeRenderRestHook.md

@@ -7,7 +7,7 @@ function makeRenderRestHook(makeProvider: ProviderType): RenderRestHookFunction;
 ```
 
 `makeRenderRestHook()` is useful to test hooks that rely on the `rest-hooks`. It creates a renderRestHook()
-function that mirrors [react-hooks-testing-library](https://github.com/mpeyper/react-hooks-testing-library)'s [renderHook()](https://github.com/mpeyper/react-hooks-testing-library#renderhookcallback-options) but does so with a `<Suspense/>` boundary
+function that mirrors [@testing-library/react-hooks](https://github.com/testing-library/react-hooks-testing-library)'s [renderHook()](https://react-hooks-testing-library.com/reference/api#renderhook-options) but does so with a `<Suspense/>` boundary
 as well as in a `<Provider />` context.
 
 ## Arguments
@@ -85,7 +85,7 @@ Cleans up all managers used in tests. Should be run in `afterEach()` to ensure e
 - `rerender` (`function([newProps])`) - function to rerender the test component including any hooks called in the `callback` function. If `newProps` are passed, the will replace the `initialProps` passed the the `callback` function for future renders.
 - `unmount` (`function()`) - function to unmount the test component, commonly used to trigger cleanup effects for `useEffect` hooks.
 
-[react-hooks-testing-library reference](https://github.com/mpeyper/react-hooks-testing-library/blob/master/README.md#returns)
+[@testing-library/react-hooks reference](https://react-hooks-testing-library.com/reference/api#renderhook-result)
 
 ## Example
 

docs/guides/unit-testing-hooks.md

@@ -7,7 +7,7 @@ composable functions. This makes testing component behavior potentially much
 easier. But how does this work if you want to use hooks from `rest-hooks`?
 
 We have provided some simple utilities to reduce boilerplate for unit tests
-that are wrappers around [react-hooks-testing-library](https://github.com/mpeyper/react-hooks-testing-library)'s [renderHook()](https://github.com/mpeyper/react-hooks-testing-library#renderhookcallback-options).
+that are wrappers around [@testing-library/react-hooks](https://github.com/testing-library/react-hooks-testing-library)'s [renderHook()](https://react-hooks-testing-library.com/reference/api#renderhook-options).
 
 We want a `renderRestHook()` function that renders in the context of both
 a `Provider` and `Suspense` boundary.

package.json

@@ -80,6 +80,7 @@
     "@anansi/eslint-config": "^0.6.5",
     "@babel/cli": "^7.5.5",
     "@babel/core": "^7.5.5",
+    "@testing-library/react-hooks": "^1.1.0",
     "@types/jest": "^24.0.17",
     "@types/lodash": "^4.14.136",
     "@types/nock": "^10.0.3",
@@ -102,7 +103,7 @@
     "prettier-eslint-cli": "^5.0.0",
     "react": "16.8.6",
     "react-dom": "16.8.6",
-    "react-hooks-testing-library": "^0.4.1",
+    "react-test-renderer": "^16.8.6",
     "react-testing-library": "^6.1.2",
     "rollup": "^1.17.0",
     "rollup-plugin-babel": "^4.3.3",

src/react-integration/__tests__/hooks.tsx

@@ -1,6 +1,6 @@
 import React, { Suspense, useEffect } from 'react';
-import { render, wait } from 'react-testing-library';
-import { cleanup, renderHook } from 'react-hooks-testing-library';
+import { render, cleanup } from 'react-testing-library';
+import { renderHook } from '@testing-library/react-hooks';
 import nock from 'nock';
 import { normalize } from '../../resource';
 

src/react-integration/__tests__/integration.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import { cleanup } from 'react-hooks-testing-library';
 import nock from 'nock';
 
 import {
@@ -14,8 +13,14 @@ import {
   makeExternalCacheProvider,
 } from '../../test/providers';
 
+function onError(e: any) {
+  e.preventDefault();
+}
+beforeEach(() => {
+  window.addEventListener('error', onError);
+});
 afterEach(() => {
-  cleanup();
+  window.removeEventListener('error', onError);
 });
 
 for (const makeProvider of [makeCacheProvider, makeExternalCacheProvider]) {
@@ -66,16 +71,6 @@ for (const makeProvider of [makeCacheProvider, makeExternalCacheProvider]) {
 
     let renderRestHook: ReturnType<typeof makeRenderRestHook>;
 
-    function onError(e: any) {
-      e.preventDefault();
-    }
-    beforeEach(() => {
-      window.addEventListener('error', onError);
-    });
-    afterEach(() => {
-      window.removeEventListener('error', onError);
-    });
-
     beforeEach(() => {
       nock('http://test.com')
         .get(`/article-cooler/${payload.id}`)
@@ -131,7 +126,7 @@ for (const makeProvider of [makeCacheProvider, makeExternalCacheProvider]) {
     });
 
     it('should throw when retrieving an empty string', async () => {
-      const { result, waitForNextUpdate } = renderRestHook(() => {
+      const { result } = renderRestHook(() => {
         return useFetcher(CoolerArticleResource.detailShape());
       });
 
@@ -141,7 +136,7 @@ for (const makeProvider of [makeCacheProvider, makeExternalCacheProvider]) {
     });
 
     it('should not throw on delete', async () => {
-      const { result, waitForNextUpdate } = renderRestHook(() => {
+      const { result } = renderRestHook(() => {
         return [
           useFetcher(CoolerArticleResource.deleteShape()),
           useFetcher(ArticleResource.deleteShape()),
@@ -204,7 +199,7 @@ for (const makeProvider of [makeCacheProvider, makeExternalCacheProvider]) {
 
     it('should not suspend with no params to useResource()', async () => {
       let article: any;
-      const { result, waitForNextUpdate } = renderRestHook(() => {
+      const { result } = renderRestHook(() => {
         article = useResource(CoolerArticleResource.detailShape(), null);
         return 'done';
       });

src/react-integration/__tests__/subscriptions.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
-import { cleanup } from 'react-hooks-testing-library';
-import { renderHook } from 'react-hooks-testing-library';
+import { renderHook } from '@testing-library/react-hooks';
 
 import nock from 'nock';
 
@@ -13,8 +12,6 @@ import {
 } from '../../test/providers';
 import { DispatchContext } from '../context';
 
-afterEach(cleanup);
-
 for (const makeProvider of [makeCacheProvider, makeExternalCacheProvider]) {
   describe(`${makeProvider.name} with subscriptions`, () => {
     const articlePayload = {

src/react-integration/provider/__tests__/middleware.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 // eslint-disable-next-line @typescript-eslint/camelcase
 import { unstable_scheduleCallback } from 'scheduler';
-import { cleanup, renderHook, act } from 'react-hooks-testing-library';
+import { renderHook, act } from '@testing-library/react-hooks';
 import createEnhancedReducerHook from '../middleware';
 import { MiddlewareAPI } from '../../../types';
 
@@ -14,7 +14,6 @@ beforeEach(() => {
 afterEach(() => {
   window.removeEventListener('error', ignoreError);
 });
-afterEach(cleanup);
 
 describe('createEnhancedReducerHook', () => {
   const makeTestActionMiddleware = (test: Function) => () => {

src/test/makeRenderRestHook.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RenderOptions } from 'react-testing-library';
-import { renderHook } from 'react-hooks-testing-library';
+import { renderHook } from '@testing-library/react-hooks';
 
 import { MockNetworkManager } from './managers';
 import mockInitialState, { Fixture } from './mockState';

src/test/managers.ts

@@ -1,4 +1,4 @@
-import { act } from 'react-hooks-testing-library';
+import { act } from '@testing-library/react-hooks';
 
 import { NetworkManager, FetchAction, ReceiveAction } from '..';
 

yarn.lock

@@ -1277,6 +1277,15 @@
   resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.2.tgz#8013f2af54a2b7d735f71560ff360d3a8176a87b"
   integrity sha512-vTCdPp/T/Q3oSqwHmZ5Kpa9oI7iLtGl3RQaA/NyLHikvcrPxACkkKVr/XzkSPJWXHRhKGzVvb0urJsbMlRxi1Q==
 
+"@testing-library/react-hooks@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-1.1.0.tgz#14b6b5c7c3d0e2cb3e55e9cbb248b44321641c64"
+  integrity sha512-piE/ceQoNf134FFVXBABDbttBJ8eLPD4eg7zIciVJv92RyvoIsBHCvvG8Vd4IG5pyuWYrkLsZTO8ucZBwa4twA==
+  dependencies:
+    "@babel/runtime" "^7.4.2"
+    "@types/react" "^16.8.22"
+    "@types/react-test-renderer" "^16.8.2"
+
 "@types/babel__core@^7.1.0":
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.0.tgz#710f2487dda4dcfd010ca6abb2b4dc7394365c51"
@@ -1413,10 +1422,17 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.0.tgz#4c48fed958d6dcf9487195a0ef6456d5f6e0163a"
   integrity sha512-eItQyV43bj4rR3JPV0Skpl1SncRCdziTEK9/v8VwXmV6d/qOUO8/EuWeHBbCZcsfSHfzI5UyMJLCSXtxxznyZg==
 
-"@types/react@^16.8.24":
-  version "16.8.24"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.8.24.tgz#8d1ea1fcbfa214220da3d3c04e506f1077b0deac"
-  integrity sha512-VpFHUoD37YNY2+lr/+c7qL/tZsIU/bKuskUF3tmGUArbxIcQdb5j3zvo4cuuzu2A6UaVmVn7sJ4PgWYNFEBGzg==
+"@types/react-test-renderer@^16.8.2":
+  version "16.9.0"
+  resolved "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.0.tgz#d60f530ecf4c906721511603cca711b4fa830d41"
+  integrity sha512-bN5EyjtuTY35xX7N5j0KP1vg5MpUXHpFTX6tGsqkNOthjNvet4VQOYRxFh+NT5cDSJrATmAFK9NLeYZ4mp/o0Q==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react@*", "@types/react@^16.8.22", "@types/react@^16.8.24":
+  version "16.9.1"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.1.tgz#862c83b4c9d5cd116e42fd9a4f3694843cd2c051"
+  integrity sha512-jGM2x8F7m7/r+81N/BOaUKVwbC5Cdw6ExlWEUpr77XPwVeNvAppnPEnMMLMfxRDYL8FPEX8MHjwtD2NQMJ0yyQ==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
@@ -3121,16 +3137,6 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-testing-library@^3.18.2:
-  version "3.18.2"
-  resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-3.18.2.tgz#07d65166743ad3299b7bee5b488e9622c31241bc"
-  integrity sha512-+nYUgGhHarrCY8kLVmyHlgM+IGwBXXrYsWIJB6vpAx2ne9WFgKfwMGcOkkTKQhuAro0sP6RIuRGfm5NF3+ccmQ==
-  dependencies:
-    "@babel/runtime" "^7.3.4"
-    "@sheerun/mutationobserver-shim" "^0.3.2"
-    pretty-format "^24.5.0"
-    wait-for-expect "^1.1.0"
-
 dom-testing-library@^3.19.0:
   version "3.19.1"
   resolved "https://registry.yarnpkg.com/dom-testing-library/-/dom-testing-library-3.19.1.tgz#ccde9044cacd6d95e5e5629b9cdd2f4de3ea5e1d"
@@ -6565,26 +6571,25 @@ react-dom@16.8.6:
     prop-types "^15.6.2"
     scheduler "^0.13.6"
 
-react-hooks-testing-library@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/react-hooks-testing-library/-/react-hooks-testing-library-0.4.1.tgz#481b960d647d3cc7c8bbaf410014daa8ce0b1360"
-  integrity sha512-ogmlyW7ycZe3+HIk1Y+FUV5ExpZwLi/RlF1qGLLbTkUdaAsGgp9fSF+wFNWi2KNKBTWG0FkkqOrLkcwq0z3ebQ==
-  dependencies:
-    "@babel/runtime" "^7.4.2"
-    react-testing-library "^6.0.3"
-
 react-is@^16.8.1, react-is@^16.8.4:
   version "16.8.4"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
   integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
 
-react-testing-library@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/react-testing-library/-/react-testing-library-6.0.3.tgz#8b5d276a353c17ce4f7486015bb7a1c8827c442c"
-  integrity sha512-tN0A6nywSOoL8kriqru3rSdw31PxuquL7xnW6xBI0aTNw0VO3kZQtaEa0npUH9dX0MIsSunB0nbElRrc4VtAzw==
+react-is@^16.8.6:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
+  integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
+
+react-test-renderer@^16.8.6:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1"
+  integrity sha512-H2srzU5IWYT6cZXof6AhUcx/wEyJddQ8l7cLM/F7gDXYyPr4oq+vCIxJYXVGhId1J706sqziAjuOEjyNkfgoEw==
   dependencies:
-    "@babel/runtime" "^7.4.2"
-    dom-testing-library "^3.18.2"
+    object-assign "^4.1.1"
+    prop-types "^15.6.2"
+    react-is "^16.8.6"
+    scheduler "^0.13.6"
 
 react-testing-library@^6.1.2:
   version "6.1.2"