From 25005d158ba8eb38f2eea349d1739b6471563871 Mon Sep 17 00:00:00 2001 From: Brice BERNARD Date: Tue, 5 Dec 2017 19:43:30 +0100 Subject: [PATCH] [with-jest] Fix tests (#3395) * Fix tests * Follow linting rules --- examples/with-jest/.babelrc | 9 +++----- .../__snapshots__/index.test.js.snap | 6 ++--- examples/with-jest/jest.config.js | 4 ++++ examples/with-jest/jest.setup.js | 5 ++++ examples/with-jest/package.json | 23 ++++++++----------- examples/with-jest/shim.js | 3 --- 6 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 examples/with-jest/jest.config.js create mode 100644 examples/with-jest/jest.setup.js delete mode 100644 examples/with-jest/shim.js diff --git a/examples/with-jest/.babelrc b/examples/with-jest/.babelrc index ca67af2f..711f94ae 100644 --- a/examples/with-jest/.babelrc +++ b/examples/with-jest/.babelrc @@ -1,16 +1,13 @@ { "env": { "development": { - "presets": "next/babel" + "presets": ["next/babel"] }, "production": { - "presets": "next/babel" + "presets": ["next/babel"] }, "test": { - "presets": [ - ["env", { "modules": "commonjs" }], - "next/babel" - ] + "presets": [["env", { "modules": "commonjs" }], "next/babel"] } } } diff --git a/examples/with-jest/__tests__/__snapshots__/index.test.js.snap b/examples/with-jest/__tests__/__snapshots__/index.test.js.snap index ed68b9d1..9d371459 100644 --- a/examples/with-jest/__tests__/__snapshots__/index.test.js.snap +++ b/examples/with-jest/__tests__/__snapshots__/index.test.js.snap @@ -2,12 +2,12 @@ exports[`With Snapshot Testing App shows "Hello world!" 1`] = `

Hello World!

-`; +` diff --git a/examples/with-jest/jest.config.js b/examples/with-jest/jest.config.js new file mode 100644 index 00000000..61113a97 --- /dev/null +++ b/examples/with-jest/jest.config.js @@ -0,0 +1,4 @@ +module.exports = { + setupFiles: ['/jest.setup.js'], + testPathIgnorePatterns: ['/.next/', '/node_modules/'] +} diff --git a/examples/with-jest/jest.setup.js b/examples/with-jest/jest.setup.js new file mode 100644 index 00000000..8a8ff6cd --- /dev/null +++ b/examples/with-jest/jest.setup.js @@ -0,0 +1,5 @@ +import 'raf/polyfill' +import { configure } from 'enzyme' +import Adapter from 'enzyme-adapter-react-16' + +configure({ adapter: new Adapter() }) diff --git a/examples/with-jest/package.json b/examples/with-jest/package.json index 57278ae2..aae78395 100644 --- a/examples/with-jest/package.json +++ b/examples/with-jest/package.json @@ -1,26 +1,23 @@ { "name": "with-jest", "version": "1.0.0", - "jest": { - "setupFiles": [ - "/shim.js" - ] - }, "dependencies": { "next": "latest", - "react": "^16.0.0", - "react-dom": "^16.0.0" + "react": "16.2.0", + "react-dom": "16.2.0" }, "devDependencies": { - "enzyme": "^2.8.2", - "jest": "^21.0.0", - "react-addons-test-utils": "^15.6.0", - "react-test-renderer": "^16.0.0" + "enzyme": "3.2.0", + "enzyme-adapter-react-16": "1.1.0", + "jest": "21.2.1", + "raf": "3.4.0", + "react-addons-test-utils": "15.6.2", + "react-test-renderer": "16.2.0" }, "scripts": { - "test": "jest", + "test": "NODE_ENV=test jest", "dev": "next", "build": "next build", "start": "next start" } -} \ No newline at end of file +} diff --git a/examples/with-jest/shim.js b/examples/with-jest/shim.js deleted file mode 100644 index fafd6bb5..00000000 --- a/examples/with-jest/shim.js +++ /dev/null @@ -1,3 +0,0 @@ -global.requestAnimationFrame = callback => { - setTimeout(callback, 0) -}