test: fix everything

Author: Kent C. Dodds

CONTRIBUTING.md

@@ -27,21 +27,6 @@ Thanks for being willing to contribute!
 > branch. Whenever you want to update your version of `master`, do a regular
 > `git pull`.
 
-## Add yourself as a contributor
-
-This project follows the [all contributors][all-contributors] specification.
-To add yourself to the table of contributors on the `README.md`, please use the
-automated script as part of your PR:
-
-```console
-npm run add-contributor
-```
-
-Follow the prompt and commit `.all-contributorsrc` and `README.md` in the PR.
-If you've already added yourself to the list and are making
-a new type of contribution, you can run it again and select the added
-contribution type.
-
 ## Committing and Pushing changes
 
 Please make sure to run the tests before you commit your changes. You can run

jest.config.js

@@ -15,6 +15,10 @@ module.exports = {
       testEnvironment: 'jest-environment-node',
     },
   ],
+  watchPlugins: [
+    require.resolve('jest-watch-select-projects'),
+    ...baseConfig.watchPlugins,
+  ],
   // this is for eslint
   modulePaths: baseConfig.modulePaths,
 }

package.json

@@ -24,32 +24,36 @@
     "node": ">=8"
   },
   "scripts": {
-    "add-contributor": "kcd-scripts contributors add",
     "build": "kcd-scripts build && kcd-scripts build --bundle --no-clean",
     "lint": "kcd-scripts lint",
     "test": "kcd-scripts test",
     "test:update": "npm test -- --updateSnapshot --coverage",
     "validate": "kcd-scripts validate",
     "setup": "npm install && npm run validate -s",
-    "precommit": "kcd-scripts precommit",
     "dtslint": "dtslint typings"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "kcd-scripts pre-commit"
+    }
+  },
   "files": [
     "dist",
     "typings"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.1.5",
+    "@babel/runtime": "^7.3.4",
     "@sheerun/mutationobserver-shim": "^0.3.2",
     "pretty-format": "^24.0.0",
     "wait-for-expect": "^1.1.0"
   },
   "devDependencies": {
-    "dtslint": "^0.3.0",
-    "jest-dom": "^2.1.1",
+    "dtslint": "^0.5.3",
+    "jest-dom": "^3.1.2",
     "jest-in-case": "^1.0.2",
-    "jsdom": "^13.0.0",
-    "kcd-scripts": "^0.46.0"
+    "jest-watch-select-projects": "^0.1.1",
+    "jsdom": "^13.2.0",
+    "kcd-scripts": "^1.1.0"
   },
   "eslintConfig": {
     "extends": "./node_modules/kcd-scripts/eslint.js",

src/__tests__/element-queries.js

@@ -1,7 +1,6 @@
 import 'jest-dom/extend-expect'
 import {configure} from '../config'
 import {render, renderIntoDocument} from './helpers/test-utils'
-import document from './helpers/document'
 
 beforeEach(() => {
   document.defaultView.Cypress = null

src/__tests__/events.js

@@ -1,6 +1,4 @@
 import {fireEvent} from '..'
-import document from './helpers/document'
-import window from './helpers/window'
 
 const eventTypes = [
   {

src/__tests__/example.js

@@ -2,7 +2,6 @@
 import {getByLabelText, getByText, getByTestId, queryByTestId, wait} from '../'
 // adds special assertions like toHaveTextContent
 import 'jest-dom/extend-expect'
-import document from './helpers/document'
 
 function getExampleDOM() {
   // This is just a raw example of setting up some DOM

src/__tests__/get-queries-for-element.js

@@ -1,6 +1,5 @@
 import {getQueriesForElement} from '../get-queries-for-element'
 import {queries} from '..'
-import document from './helpers/document'
 
 test('uses default queries', () => {
   const container = document.createElement('div')

src/__tests__/helpers.js

@@ -1,17 +1,7 @@
 import {getDocument, newMutationObserver} from '../helpers'
 
-describe('getDocument', () => {
-  if (typeof document === 'undefined') {
-    test('throws an error if window does not exist', () => {
-      expect(() => getDocument()).toThrowError(
-        /Could not find default container/,
-      )
-    })
-  } else {
-    test('returns global document if exists', () => {
-      expect(getDocument()).toBe(document)
-    })
-  }
+test('returns global document if exists', () => {
+  expect(getDocument()).toBe(document)
 })
 
 class DummyClass {

src/__tests__/helpers/document.js

@@ -1,5 +1,4 @@
 import {getQueriesForElement} from '../../get-queries-for-element'
-import document from './document'
 
 function render(html) {
   const container = document.createElement('div')

src/__tests__/helpers/test-utils.js

@@ -1,6 +1,5 @@
 import {prettyDOM} from '../pretty-dom'
 import {render} from './helpers/test-utils'
-import document from './helpers/document'
 
 test('it prints out the given DOM element tree', () => {
   const {container} = render('<div>Hello World!</div>')

src/__tests__/helpers/window.js

@@ -2,7 +2,6 @@ import {waitForDomChange} from '../'
 // adds special assertions like toBeTruthy
 import 'jest-dom/extend-expect'
 import {render} from './helpers/test-utils'
-import document from './helpers/document'
 
 const skipSomeTime = delayMs =>
   new Promise(resolve => setTimeout(resolve, delayMs))
@@ -16,11 +15,7 @@ test('it waits for the next DOM mutation', async () => {
   const successHandler = jest.fn().mockName('successHandler')
   const errorHandler = jest.fn().mockName('errorHandler')
 
-  if (typeof window === 'undefined') {
-    waitForDomChange({container: document}).then(successHandler, errorHandler)
-  } else {
-    waitForDomChange().then(successHandler, errorHandler)
-  }
+  waitForDomChange().then(successHandler, errorHandler)
 
   // Promise callbacks are always asynchronous.
   expect(successHandler).toHaveBeenCalledTimes(0)
@@ -88,14 +83,7 @@ test('it throws if timeout is exceeded', async () => {
   const successHandler = jest.fn().mockName('successHandler')
   const errorHandler = jest.fn().mockName('errorHandler')
 
-  if (typeof window === 'undefined') {
-    waitForDomChange({container: document, timeout: 70}).then(
-      successHandler,
-      errorHandler,
-    )
-  } else {
-    waitForDomChange({timeout: 70}).then(successHandler, errorHandler)
-  }
+  waitForDomChange({timeout: 70}).then(successHandler, errorHandler)
 
   await skipSomeTimeForMutationObserver(100)
 

src/__tests__/pretty-dom.js

@@ -4,11 +4,6 @@ import {render} from './helpers/test-utils'
 
 jest.useFakeTimers()
 
-// const skipSomeTimeForMutationObserver = (delayMs = 50) => {
-//   jest.advanceTimersByTime(delayMs)
-//   jest.runAllImmediates()
-// }
-
 test('requires a function as the first parameter', () => {
   return expect(
     waitForElementToBeRemoved(),

src/__tests__/wait-for-dom-change.js

@@ -2,7 +2,6 @@ import {waitForElement, wait} from '../'
 // adds special assertions like toBeTruthy
 import 'jest-dom/extend-expect'
 import {render} from './helpers/test-utils'
-import document from './helpers/document'
 
 const skipSomeTime = delayMs =>
   new Promise(resolve => setTimeout(resolve, delayMs))

src/__tests__/wait-for-element-to-be-removed.fake-timers.js

@@ -10,14 +10,3 @@ test('it waits for the data to be loaded', async () => {
   await wait(() => expect(spy).toHaveBeenCalledTimes(1))
   expect(spy).toHaveBeenCalledWith()
 })
-
-test('can just be used for a next tick thing', async () => {
-  jest.useFakeTimers()
-  const spy = jest.fn()
-  Promise.resolve().then(spy)
-  expect(spy).toHaveBeenCalledTimes(0) // promises are always async
-  await wait() // wait for next tick
-  jest.advanceTimersByTime(60)
-  expect(spy).toHaveBeenCalledTimes(1)
-  jest.clearAllTimers()
-})

src/__tests__/wait-for-element.js

@@ -11,6 +11,7 @@ function newMutationObserver(onMutation) {
 }
 
 function getDocument() {
+  /* istanbul ignore if */
   if (typeof window === 'undefined') {
     throw new Error('Could not find default container')
   }

src/__tests__/wait.js

@@ -0,0 +1,10 @@
+import MutationObserver from '@sheerun/mutationobserver-shim'
+
+if (typeof window === 'undefined') {
+  const {JSDOM} = require('jsdom')
+  const dom = new JSDOM()
+  global.window = dom.window
+  global.document = dom.window.document
+  global.window.Date = Date
+  window.MutationObserver = MutationObserver
+}