Skip to content

fix(deps): update jest monorepo (major) #42364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scinos merged 3 commits into from
May 22, 2020
Merged

fix(deps): update jest monorepo (major) #42364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4dc9cb
fix(deps): update jest monorepo
renovate-bot May 19, 2020
cac7196
Undo mass dedupe
scinos May 19, 2020
d7d78f3
Replace require.requireActual
scinos May 20, 2020
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
2 changes: 1 addition & 1 deletion client/lib/media/test/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jest.mock( 'lib/impure-lodash', () => ( {
return false;
}

return require.requireActual( 'lodash' ).isPlainObject( obj );
return jest.requireActual( 'lodash' ).isPlainObject( obj );
},
uniqueId: () => 'media-1',
} ) );
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
"@wordpress/viewport": "^2.17.0",
"acorn": "^7.0.0",
"babel-eslint": "^10.0.3",
"babel-jest": "^25.1.0",
"babel-jest": "^26.0.0",
"babel-plugin-add-module-exports": "^1.0.2",
"babel-plugin-dynamic-import-node": "^2.3.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
Expand Down Expand Up @@ -297,8 +297,8 @@
"imports-loader": "^0.8.0",
"interpolate-components": "^1.1.1",
"is-number": "^7.0.0",
"jest": "^25.1.0",
"jest-docblock": "^25.1.0",
"jest": "^26.0.0",
"jest-docblock": "^26.0.0",
"jest-emotion": "^10.0.27",
"jest-enzyme": "^7.1.2",
"jest-fetch-mock": "^2.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/calypso-build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@wordpress/browserslist-config": "^2.6.0",
"@wordpress/dependency-extraction-webpack-plugin": "^2.4.0",
"autoprefixer": "^9.7.3",
"babel-jest": "^25.1.0",
"babel-jest": "^26.0.0",
"babel-loader": "^8.0.6",
"browserslist": "^4.8.2",
"caniuse-api": "^3.0.0",
Expand All @@ -57,7 +57,7 @@
"enzyme-adapter-react-16": "^1.15.1",
"enzyme-to-json": "^3.4.3",
"file-loader": "^4.3.0",
"jest-config": "^25.1.0",
"jest-config": "^26.0.0",
"jest-emotion": "^10.0.27",
"jest-enzyme": "^7.1.2",
"node-sass": "^4.13.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/calypso-codemods/setup-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const fs = require( 'fs' );
const path = require( 'path' );
const api = require.requireActual( './api' );
const api = jest.requireActual( './api' );

function test_folder( dir ) {
const testFiles = fs
Expand Down
18 changes: 9 additions & 9 deletions test/client/setup-test-framework.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,24 @@ afterAll( () => {
let mockEnzymeSetup = false;

jest.mock( 'enzyme', () => {
const actualEnzyme = require.requireActual( 'enzyme' );
const actualEnzyme = jest.requireActual( 'enzyme' );
if ( ! mockEnzymeSetup ) {
mockEnzymeSetup = true;

// configure custom enzyme matchers for chai
const chai = require.requireActual( 'chai' );
const chaiEnzyme = require.requireActual( 'chai-enzyme' );
const chai = jest.requireActual( 'chai' );
const chaiEnzyme = jest.requireActual( 'chai-enzyme' );
chai.use( chaiEnzyme() );

// configure custom Enzyme matchers for Jest
require.requireActual( 'jest-enzyme' );
jest.requireActual( 'jest-enzyme' );

// configure enzyme 3 for React, from docs: http://airbnb.io/enzyme/docs/installation/index.html
const Adapter = require.requireActual( 'enzyme-adapter-react-16' );
const Adapter = jest.requireActual( 'enzyme-adapter-react-16' );
actualEnzyme.configure( { adapter: new Adapter() } );

// configure snapshot serializer for enzyme
const { createSerializer } = require.requireActual( 'enzyme-to-json' );
const { createSerializer } = jest.requireActual( 'enzyme-to-json' );
expect.addSnapshotSerializer( createSerializer( { mode: 'deep' } ) );
}
return actualEnzyme;
Expand All @@ -54,13 +54,13 @@ jest.mock( 'enzyme', () => {
let mockSinonSetup = false;

jest.mock( 'sinon', () => {
const actualSinon = require.requireActual( 'sinon' );
const actualSinon = jest.requireActual( 'sinon' );
if ( ! mockSinonSetup ) {
mockSinonSetup = true;

// configure custom sinon matchers for chai
const chai = require.requireActual( 'chai' );
const sinonChai = require.requireActual( 'sinon-chai' );
const chai = jest.requireActual( 'chai' );
const sinonChai = jest.requireActual( 'sinon-chai' );
chai.use( sinonChai );
actualSinon.assert.expose( chai.assert, { prefix: '' } );
}
Expand Down
Loading