Merge branch 'beta' into pr/update-node-engine

Author: Kent C. Dodds

Diff for: .all-contributorsrc

@@ -7,6 +7,7 @@
   ],
   "imageSize": 100,
   "commit": false,
+  "skipCi": false,
   "contributors": [
     {
       "login": "kentcdodds",
@@ -1006,9 +1007,36 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "zbrogz",
+      "name": "Zach Brogan",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/319162?v=4",
+      "profile": "http://linkedin.com/in/zachbrogan",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "ryota-murakami",
+      "name": "Ryota Murakami",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5501268?v=4",
+      "profile": "https://ryota-murakami.github.io/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "hottmanmichael",
+      "name": "Michael Hottman",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/10534502?v=4",
+      "profile": "https://github.com/hottmanmichael",
+      "contributions": [
+        "ideas"
+      ]
     }
   ],
   "contributorsPerLine": 7,
-  "repoHost": "https://github.com",
-  "skipCi": true
+  "repoHost": "https://github.com"
 }

Diff for: .github/ISSUE_TEMPLATE.md

@@ -20,9 +20,10 @@ Thanks for your interest in the project. We appreciate bugs filed and PRs submit
 
   ❓ Questions:
   For questions related to using the library, please visit a support community
-  instead of filing an issue on GitHub.
+  instead of filing an issue on GitHub. You can follow the instructions in this
+  codesandbox to make a reproduction of your issue: https://kcd.im/rtl-help
   * React Spectrum
-    https://spectrum.chat/react-testing-library
+    https://spectrum.chat/testing-library
   * Reactiflux on Discord
     https://www.reactiflux.com
   * Stack Overflow
@@ -43,7 +44,7 @@ tutorial to learn how: http://kcd.im/pull-request
 
 -->
 
-- `react-testing-library` version:
+- `@testing-library/react` version:
 - `react` version:
 - `node` version:
 - `npm` (or `yarn`) version:

Diff for: .github/ISSUE_TEMPLATE/Bug_Report.md

@@ -22,7 +22,7 @@ tutorial to learn how: http://kcd.im/pull-request
 
 -->
 
-- `react-testing-library` version:
+- `@testing-library/react` version:
 - `react` version:
 - `node` version:
 - `npm` (or `yarn`) version:

Diff for: .github/ISSUE_TEMPLATE/Question.md

@@ -12,6 +12,10 @@ and feature requests so we recommend not using this medium to ask them here 😁
 
 ## ❓ Support Forums
 
+For questions related to using the library, please visit a support community
+instead of filing an issue on GitHub. You can follow the instructions in this
+codesandbox to make a reproduction of your issue: https://kcd.im/rtl-help
+
 - React Spectrum https://spectrum.chat/react-testing-library
 - Reactiflux on Discord https://www.reactiflux.com
 - Stack Overflow

Diff for: .travis.yml

@@ -1,20 +1,27 @@
-sudo: false
 language: node_js
-cache:
-  directories:
-    - ~/.npm
+cache: npm
 notifications:
   email: false
 node_js:
-  - '10'
-  - '12'
-  - '13'
+  - 10.14
+  - 12
+  - node
 install:
   - npm install
   # as requested by the React team :)
   # https://reactjs.org/blog/2019/10/22/react-release-channels.html#using-the-next-channel-for-integration-testing
-  - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then npm install react@next react-dom@next; fi
-script: npm run validate
-after_success: kcd-scripts travis-after-success
+  - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then npm install react@next
+    react-dom@next; fi
+script:
+  - npm run validate
+  - npx codecov@3
 branches:
-  only: master
+  only:
+    - master
+    - beta
+
+jobs:
+  include:
+    - stage: release
+      node_js: 12
+      script: kcd-scripts travis-release

Diff for: README.md

@@ -171,7 +171,7 @@ export default HiddenMessage
 // __tests__/hidden-message.js
 // these imports are something you'd normally configure Jest to import for you
 // automatically. Learn more in the setup docs: https://testing-library.com/docs/react-testing-library/setup#cleanup
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom'
 // NOTE: jest-dom adds handy assertions to Jest and is recommended, but not required
 
 import React from 'react'
@@ -261,7 +261,7 @@ export default Login
 // __tests__/login.js
 // again, these first two imports are something you'd normally handle in
 // your testing framework configuration rather than importing them in every file.
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom'
 import React from 'react'
 import {render, fireEvent, screen} from '@testing-library/react'
 import Login from '../login'
@@ -521,6 +521,11 @@ Thanks goes to these people ([emoji key][emojis]):
     <td align="center"><a href="http://www.laurensbosscher.nl"><img src="https://avatars0.githubusercontent.com/u/13363196?v=4" width="100px;" alt=""/><br /><sub><b>Laurens Bosscher</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=LaurensBosscher" title="Code">💻</a></td>
     <td align="center"><a href="https://twitter.com/__sakito__"><img src="https://avatars1.githubusercontent.com/u/15010907?v=4" width="100px;" alt=""/><br /><sub><b>Sakito Mukai</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=sakito21" title="Documentation">📖</a></td>
     <td align="center"><a href="http://turkerteke.com"><img src="https://avatars3.githubusercontent.com/u/12457162?v=4" width="100px;" alt=""/><br /><sub><b>Türker Teke</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=tteke" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://linkedin.com/in/zachbrogan"><img src="https://avatars1.githubusercontent.com/u/319162?v=4" width="100px;" alt=""/><br /><sub><b>Zach Brogan</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=zbrogz" title="Code">💻</a> <a href="https://github.com/testing-library/react-testing-library/commits?author=zbrogz" title="Tests">⚠️</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://ryota-murakami.github.io/"><img src="https://avatars2.githubusercontent.com/u/5501268?v=4" width="100px;" alt=""/><br /><sub><b>Ryota Murakami</b></sub></a><br /><a href="https://github.com/testing-library/react-testing-library/commits?author=ryota-murakami" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/hottmanmichael"><img src="https://avatars3.githubusercontent.com/u/10534502?v=4" width="100px;" alt=""/><br /><sub><b>Michael Hottman</b></sub></a><br /><a href="#ideas-hottmanmichael" title="Ideas, Planning, & Feedback">🤔</a></td>
   </tr>
 </table>
 

Diff for: other/manual-releases.md

@@ -41,4 +41,4 @@ change is to release a new patch version.
 Reference: #<the number of a relevant pull request, issue, or commit>
 ```
 
-The number of times we've had to do a manual release is: 4
+The number of times we've had to do a manual release is: 5

Diff for: package.json

@@ -45,19 +45,19 @@
   "author": "Kent C. Dodds <[email protected]> (http://kentcdodds.com/)",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.8.3",
-    "@testing-library/dom": "^6.11.0",
+    "@babel/runtime": "^7.8.4",
+    "@testing-library/dom": "beta",
     "@types/testing-library__react": "^9.1.2"
   },
   "devDependencies": {
-    "@reach/router": "^1.2.1",
-    "@testing-library/jest-dom": "^5.0.0",
-    "cross-env": "^6.0.3",
-    "kcd-scripts": "^4.0.0",
+    "@reach/router": "^1.3.3",
+    "@testing-library/jest-dom": "^5.1.1",
+    "cross-env": "^7.0.1",
+    "kcd-scripts": "^5.4.0",
     "npm-run-all": "^4.1.5",
     "react": "^16.9.0",
     "react-dom": "^16.9.0",
-    "rimraf": "^3.0.0"
+    "rimraf": "^3.0.2"
   },
   "peerDependencies": {
     "react": "*",
@@ -67,6 +67,7 @@
     "extends": "./node_modules/kcd-scripts/eslint.js",
     "rules": {
       "react/prop-types": "off",
+      "react/no-adjacent-inline-elements": "off",
       "import/no-unassigned-import": "off",
       "import/named": "off"
     }

Diff for: src/__tests__/debug.js

@@ -36,4 +36,17 @@ test('debug pretty prints multiple containers', () => {
   )
 })
 
+test('allows same arguments as prettyDOM', () => {
+  const HelloWorld = () => <h1>Hello World</h1>
+  const {debug, container} = render(<HelloWorld />)
+  debug(container, 6, {highlight: false})
+  expect(console.log).toHaveBeenCalledTimes(1)
+  expect(console.log.mock.calls[0]).toMatchInlineSnapshot(`
+    Array [
+      "<div>
+    ...",
+    ]
+  `)
+})
+
 /* eslint no-console:0 */

Diff for: src/__tests__/events.js

@@ -153,6 +153,41 @@ eventTypes.forEach(({type, events, elementType, init}) => {
   })
 })
 
+eventTypes.forEach(({type, events, elementType, init}) => {
+  describe(`Native ${type} Events`, () => {
+    events.forEach(eventName => {
+      let nativeEventName = eventName.toLowerCase()
+
+      // The doubleClick synthetic event maps to the dblclick native event
+      if (nativeEventName === 'doubleclick') {
+        nativeEventName = 'dblclick'
+      }
+
+      it(`triggers native ${nativeEventName}`, () => {
+        const ref = React.createRef()
+        const spy = jest.fn()
+        const Element = elementType
+
+        const NativeEventElement = () => {
+          React.useEffect(() => {
+            const element = ref.current
+            element.addEventListener(nativeEventName, spy)
+            return () => {
+              element.removeEventListener(nativeEventName, spy)
+            }
+          })
+          return <Element ref={ref} />
+        }
+
+        render(<NativeEventElement />)
+
+        fireEvent[eventName](ref.current, init)
+        expect(spy).toHaveBeenCalledTimes(1)
+      })
+    })
+  })
+})
+
 test('onChange works', () => {
   const handleChange = jest.fn()
   const {

Diff for: src/pure.js

@@ -60,12 +60,12 @@ function render(
   return {
     container,
     baseElement,
-    debug: (el = baseElement) =>
+    debug: (el = baseElement, maxLength, options) =>
       Array.isArray(el)
         ? // eslint-disable-next-line no-console
-          el.forEach(e => console.log(prettyDOM(e)))
+          el.forEach(e => console.log(prettyDOM(e, maxLength, options)))
         : // eslint-disable-next-line no-console,
-          console.log(prettyDOM(el)),
+          console.log(prettyDOM(el, maxLength, options)),
     unmount: () => ReactDOM.unmountComponentAtNode(container),
     rerender: rerenderUi => {
       render(wrapUiIfNeeded(rerenderUi), {container, baseElement})
@@ -128,10 +128,20 @@ Object.keys(dtlFireEvent).forEach(key => {
 // React event system tracks native mouseOver/mouseOut events for
 // running onMouseEnter/onMouseLeave handlers
 // @link https://github.com/facebook/react/blob/b87aabdfe1b7461e7331abb3601d9e6bb27544bc/packages/react-dom/src/events/EnterLeaveEventPlugin.js#L24-L31
-fireEvent.mouseEnter = fireEvent.mouseOver
-fireEvent.mouseLeave = fireEvent.mouseOut
+const mouseEnter = fireEvent.mouseEnter
+const mouseLeave = fireEvent.mouseLeave
+fireEvent.mouseEnter = (...args) => {
+  mouseEnter(...args)
+  return fireEvent.mouseOver(...args)
+}
+fireEvent.mouseLeave = (...args) => {
+  mouseLeave(...args)
+  return fireEvent.mouseOut(...args)
+}
 
+const select = fireEvent.select
 fireEvent.select = (node, init) => {
+  select(node, init)
   // React tracks this event only on focused inputs
   node.focus()