FriendsOfReactJS
diff --git a/‎package.json‎
Lines changed: 7 additions & 6 deletions b/‎package.json‎
Lines changed: 7 additions & 6 deletions
diff --git a/‎test/components/ThemeProvider.spec.js‎
Lines changed: 16 additions & 12 deletions b/‎test/components/ThemeProvider.spec.js‎
Lines changed: 16 additions & 12 deletions
@@ -22,7 +22,8 @@
   ],
   "dependencies": {
     "hoist-non-react-statics": "^3.0.1",
-    "invariant": "^2.2.4"
+    "invariant": "^2.2.4",
+    "jest": "^23.4.2"
   },
   "devDependencies": {
     "@types/react": "^16.4.7",
@@ -37,10 +38,8 @@
     "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-prettier": "^2.6.2",
     "eslint-plugin-react": "^7.10.0",
-    "expect": "^1.18.0",
     "fbjs": "^0.8.17",
     "jsdom": "^9.8.3",
-    "mocha": "^3.3.0",
     "prettier": "^1.14.0",
     "prop-types": "^15.6.2",
     "react": "^16.4.2",
@@ -58,7 +57,7 @@
     "lint": "eslint src test",
     "lint-check": "eslint --print-config .eslintrc.js | eslint-config-prettier-check",
     "prepublish": "rimraf lib && npm run build",
-    "test": "mocha --compilers js:babel-core/register --recursive --reporter spec --require ./test/setup.js",
+    "test": "jest",
     "test:watch": "npm test -- --watch"
   },
   "license": "MIT",
@@ -72,9 +71,11 @@
   },
   "greenkeeper": {
     "ignore": [
-      "expect",
-      "mocha",
       "jsdom"
     ]
+  },
+  "jest": {
+    "verbose": true,
+    "testURL": "http://localhost/"
   }
 }
@@ -1,16 +1,21 @@
 import React, { Component } from 'react'
-import expect from 'expect'
 import PropTypes from 'prop-types'
 import TestUtils from 'react-dom/test-utils'
 import { ThemeProvider } from '../../src/index'
+import { jsdom } from 'jsdom'
 
-before(function() {
-  /* eslint-disable no-console */
-  console.error = function() {}
+const documentDom = jsdom('<!doctype html><html><body></body></html>')
+beforeEach(() => {
+  global.document = documentDom
+  global.window = document.defaultView
+  global.navigator = global.window.navigator
+
+  jest.spyOn(console, 'error')
+  global.console.error.mockImplementation(() => {})
 })
 
-after(function() {
-  delete console.error
+afterEach(() => {
+  global.console.error.mockRestore()
 })
 
 describe('ThemeProvider', () => {
@@ -24,7 +29,7 @@ describe('ThemeProvider', () => {
     themr: PropTypes.object.isRequired
   }
 
-  it('enforces a single child', () => {
+  test('enforces a single child', () => {
     const theme = {}
 
     // Ignore propTypes warnings
@@ -38,7 +43,7 @@ describe('ThemeProvider', () => {
             <div />
           </ThemeProvider>
         )
-      ).toNotThrow()
+      ).not.toThrow()
 
       expect(() =>
         TestUtils.renderIntoDocument(
@@ -57,7 +62,7 @@ describe('ThemeProvider', () => {
     }
   })
 
-  it('should add the theme to the child context', () => {
+  test('should add the theme to the child context', () => {
     const theme = {}
 
     TestUtils.renderIntoDocument(
@@ -66,14 +71,13 @@ describe('ThemeProvider', () => {
       </ThemeProvider>
     )
 
-    const spy = expect.spyOn(console, 'error')
+    const spy = jest.spyOn(console, 'error')
     const tree = TestUtils.renderIntoDocument(
       <ThemeProvider theme={theme}>
         <Child />
       </ThemeProvider>
     )
-    spy.destroy()
-    expect(spy.calls.length).toBe(0)
+    expect(spy.mock.calls.length).toBe(0)
 
     const child = TestUtils.findRenderedComponentWithType(tree, Child)
     expect(child.context.themr.theme).toBe(theme)