Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

chore(deps): update jest monorepo to v24 (major) #1487

Merged
merged 3 commits into from
Mar 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"storybook:build": "cross-env NODE_ENV=storybook build-storybook",
"storybook:deploy": "npm run storybook:build && gh-pages -t -d storybook-static -o origin -b gh-pages",
"test": "npm run lint && npm run lint-styles && npm run flow && npm run build && npm run test-unit && npm run test-e2e",
"test-base": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=true DISABLE_INIT=true ELECTRON_DISABLE_SECURITY_WARNINGS=true node --trace-warnings ./node_modules/jest/bin/jest",
"test-base": "cross-env DISABLE_INIT=true jest",
"test-unit": "npm run test-base -- --coverage ./test/unit",
"test-ci": "npm run test-e2e --selector-timeout 500000 --assertion-timeout 10000 && npm run test-unit",
"pretest-e2e": "npm run build-e2e",
Expand Down Expand Up @@ -193,8 +193,7 @@
"html"
],
"moduleNameMapper": {
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/internals/mocks/fileMock.js",
"\\.(css|less|sass|scss)$": "identity-obj-proxy"
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/internals/mocks/fileMock.js"
},
"moduleFileExtensions": [
"js",
Expand All @@ -205,7 +204,9 @@
"app/node_modules",
"node_modules"
],
"setupTestFrameworkScriptFile": "./test/unit/__helpers__/setup.js",
"setupFilesAfterEnv": [
"<rootDir>/test/unit/__helpers__/setup.js"
],
"transform": {
"^.+\\.js$": "babel-jest"
}
Expand Down Expand Up @@ -236,7 +237,7 @@
"add-asset-html-webpack-plugin": "3.1.3",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "10.0.1",
"babel-jest": "23.6.0",
"babel-jest": "24.2.0-alpha.0",
"babel-loader": "8.0.5",
"babel-plugin-react-intl": "3.0.1",
"babel-plugin-react-intl-auto": "1.6.1",
Expand Down Expand Up @@ -281,10 +282,8 @@
"gh-pages": "2.0.1",
"html-webpack-plugin": "3.2.0",
"husky": "1.3.1",
"identity-obj-proxy": "3.0.0",
"jest": "23.6.0",
"jest": "24.2.0-alpha.0",
"jest-styled-components": "6.3.1",
"jsdom": "13.2.0",
"lint-staged": "8.1.5",
"lnd-binary": "0.3.9",
"minimist": "1.2.0",
Expand Down
4 changes: 0 additions & 4 deletions test/unit/components/LoadingBolt.spec.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
import React from 'react'
import { configure } from 'enzyme'
import Adapter from 'enzyme-adapter-react-16'
import { ThemeProvider } from 'styled-components'
import LoadingBolt from 'components/LoadingBolt'
import CloudLightning from 'components/Icon/CloudLightning'
import { dark } from 'themes'
import { mountWithIntl } from '../__helpers__/intl-enzyme-test-helper'

configure({ adapter: new Adapter() })

describe('component.LoadingBolt', () => {
const el = mountWithIntl(
<ThemeProvider theme={dark}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ exports[`component.Form.PaySummaryOnchain should render correctly 1`] = `
],
"results": Array [
Object {
"isThrow": false,
"type": "return",
"value": undefined,
},
],
Expand Down
5 changes: 1 addition & 4 deletions test/unit/components/UI/Heading.spec.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import React from 'react'
import renderer from 'react-test-renderer'
import { configure, mount } from 'enzyme'
import Adapter from 'enzyme-adapter-react-16'
import { mount } from 'enzyme'
import { Heading } from 'components/UI'

configure({ adapter: new Adapter() })

describe('component.UI.Heading', () => {
it('should render correctly', () => {
const tree = renderer.create(<Heading>Heading here</Heading>).toJSON()
Expand Down
5 changes: 1 addition & 4 deletions test/unit/components/UI/Notification.spec.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import React from 'react'
import renderer from 'react-test-renderer'
import { configure, shallow } from 'enzyme'
import Adapter from 'enzyme-adapter-react-16'
import { shallow } from 'enzyme'
import Success from 'components/Icon/Success'
import Warning from 'components/Icon/Warning'
import Error from 'components/Icon/Error'
import { Notification, Spinner } from 'components/UI'

configure({ adapter: new Adapter() })

describe('component.UI.Notification', () => {
it('should render correctly', () => {
const tree = renderer.create(<Notification />).toJSON()
Expand Down
5 changes: 1 addition & 4 deletions test/unit/components/UI/Sidebar.spec.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import React from 'react'
import renderer from 'react-test-renderer'
import { configure, mount } from 'enzyme'
import Adapter from 'enzyme-adapter-react-16'
import { mount } from 'enzyme'
import { Sidebar } from 'components/UI'

configure({ adapter: new Adapter() })

describe('component.UI.Sidebar', () => {
it('should render correctly', () => {
const tree = renderer.create(<Sidebar />).toJSON()
Expand Down
Loading