chore: cleanup some tests

Author: Kent C. Dodds

src/__tests__/act.js

@@ -1,7 +1,5 @@
 import React from 'react'
-import {render, cleanup, fireEvent} from '../'
-
-afterEach(cleanup)
+import {render, fireEvent} from '../'
 
 test('render calls useEffect immediately', () => {
   const effectCb = jest.fn()

src/__tests__/bugs.js

@@ -20,13 +20,13 @@ function App() {
   return 123
 }
 
-it('cleanup-after-each does not leave any hanging microtasks: part 1', () => {
+test('does not leave any hanging microtasks: part 1', () => {
   render(<App />)
   expect(document.body.textContent).toBe('123')
   expect(log).toEqual([])
 })
 
-it('cleanup-after-each does not leave any hanging microtasks: part 2', () => {
+test('does not leave any hanging microtasks: part 2', () => {
   expect(log).toEqual([0])
   expect(document.body.innerHTML).toBe('')
 })

src/__tests__/cleanup-after-each.js

@@ -0,0 +1,28 @@
+import React from 'react'
+import {render, cleanup} from '../'
+
+test('cleans up the document', () => {
+  const spy = jest.fn()
+  const divId = 'my-div'
+
+  class Test extends React.Component {
+    componentWillUnmount() {
+      expect(document.getElementById(divId)).toBeInTheDocument()
+      spy()
+    }
+
+    render() {
+      return <div id={divId} />
+    }
+  }
+
+  render(<Test />)
+  cleanup()
+  expect(document.body.innerHTML).toBe('')
+  expect(spy).toHaveBeenCalledTimes(1)
+})
+
+test('cleanup does not error when an element is not a child', () => {
+  render(<div />, {container: document.createElement('div')})
+  cleanup()
+})

src/__tests__/cleanup.js

@@ -1,12 +1,11 @@
 import React from 'react'
-import {render, cleanup} from '../'
+import {render} from '../'
 
 beforeEach(() => {
   jest.spyOn(console, 'log').mockImplementation(() => {})
 })
 
 afterEach(() => {
-  cleanup()
   console.log.mockRestore()
 })
 

src/__tests__/debug.js

@@ -1,7 +1,5 @@
 import React from 'react'
-import {render, wait, cleanup} from '../'
-
-afterEach(cleanup)
+import {render, wait} from '../'
 
 const fetchAMessage = () =>
   new Promise(resolve => {

src/__tests__/end-to-end.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import {render, cleanup, fireEvent} from '../'
+import {render, fireEvent} from '../'
 
 const eventTypes = [
   {
@@ -128,8 +128,6 @@ const eventTypes = [
   },
 ]
 
-afterEach(cleanup)
-
 eventTypes.forEach(({type, events, elementType, init}) => {
   describe(`${type} Events`, () => {
     events.forEach(eventName => {

src/__tests__/events.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import {render, cleanup} from '../'
+import {render} from '../'
 
 // these are created once per test suite and reused for each case
 let treeA, treeB
@@ -15,8 +15,6 @@ afterAll(() => {
   treeB.parentNode.removeChild(treeB)
 })
 
-afterEach(cleanup)
-
 test('baseElement isolates trees from one another', () => {
   const {getByText: getByTextInA} = render(<div>Jekyll</div>, {
     baseElement: treeA,

src/__tests__/multi-base.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import {render, cleanup} from '../'
+import {render} from '../'
 
 test('renders div into document', () => {
   const ref = React.createRef()
@@ -52,28 +52,7 @@ test('returns baseElement which defaults to document.body', () => {
   expect(baseElement).toBe(document.body)
 })
 
-it('cleansup document', () => {
-  const spy = jest.fn()
-  const divId = 'my-div'
-
-  class Test extends React.Component {
-    componentWillUnmount() {
-      expect(document.getElementById(divId)).toBeInTheDocument()
-      spy()
-    }
-
-    render() {
-      return <div id={divId} />
-    }
-  }
-
-  render(<Test />)
-  cleanup()
-  expect(document.body.innerHTML).toBe('')
-  expect(spy).toHaveBeenCalledTimes(1)
-})
-
-it('supports fragments', () => {
+test('supports fragments', () => {
   class Test extends React.Component {
     render() {
       return (
@@ -86,8 +65,6 @@ it('supports fragments', () => {
 
   const {asFragment} = render(<Test />)
   expect(asFragment()).toMatchSnapshot()
-  cleanup()
-  expect(document.body.innerHTML).toBe('')
 })
 
 test('renders options.wrapper around node', () => {

src/__tests__/render.js

@@ -1,7 +1,5 @@
 import React from 'react'
-import {render, cleanup, fireEvent} from '../'
-
-afterEach(cleanup)
+import {render, fireEvent} from '../'
 
 class StopWatch extends React.Component {
   state = {lapse: 0, running: false}