Skip to content
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.

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

Upgrades jest to v27 #1301

Merged
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
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ module.exports = {
{
files: ['**/*.test.{js,mjs,ts,tsx}'],
rules: {
'jest/valid-describe': 'error',
tmarkley marked this conversation as resolved.
Show resolved Hide resolved
'jest/valid-describe-callback': 'error',
},
},

Expand Down
39 changes: 18 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"@types/yauzl": "^2.9.1",
"JSONStream": "1.3.5",
"abortcontroller-polyfill": "^1.4.0",
"angular": "^1.8.0",
"angular": "^1.8.2",
"angular-elastic": "^2.5.1",
"angular-sanitize": "^1.8.0",
"bluebird": "3.5.5",
Expand Down Expand Up @@ -233,12 +233,12 @@
"@osd/utility-types": "1.0.0",
"@percy/cli": "^1.0.0-beta.74",
"@percy/sdk-utils": "^1.0.0-beta.74",
"@testing-library/dom": "^7.24.2",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.0.4",
"@testing-library/react-hooks": "^3.4.1",
"@types/angular": "^1.6.56",
"@types/angular-mocks": "^1.7.0",
"@testing-library/dom": "^8.11.3",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.2",
"@testing-library/react-hooks": "^7.0.2",
"@types/angular": "^1.8.4",
"@types/angular-mocks": "^1.7.1",
"@types/archiver": "^3.1.0",
"@types/babel__core": "^7.1.17",
"@types/bluebird": "^3.1.1",
Expand Down Expand Up @@ -267,7 +267,7 @@
"@types/has-ansi": "^3.0.0",
"@types/history": "^4.7.3",
"@types/hjson": "^2.4.2",
"@types/jest": "^26.0.14",
"@types/jest": "^27.4.0",
"@types/joi": "^13.4.2",
"@types/jquery": "^3.3.31",
"@types/js-yaml": "^3.11.1",
Expand Down Expand Up @@ -304,12 +304,11 @@
"@types/sinon": "^7.0.13",
"@types/strip-ansi": "^5.2.1",
"@types/styled-components": "^5.1.19",
"@types/supertest": "^2.0.5",
"@types/supertest": "^2.0.11",
"@types/supertest-as-promised": "^2.0.38",
"@types/tapable": "^1.0.6",
"@types/tar": "^4.0.3",
"@types/testing-library__jest-dom": "^5.9.3",
"@types/testing-library__react-hooks": "^3.4.0",
"@types/testing-library__jest-dom": "^5.14.2",
"@types/tough-cookie": "^4.0.1",
"@types/type-detect": "^4.0.1",
"@types/uuid": "^3.4.4",
Expand All @@ -321,15 +320,14 @@
"@typescript-eslint/eslint-plugin": "^3.10.0",
"@typescript-eslint/parser": "^3.10.0",
"angular-aria": "^1.8.0",
"angular-mocks": "^1.7.9",
"angular-mocks": "^1.8.2",
"angular-recursion": "^1.0.5",
"angular-route": "^1.8.0",
"angular-sortable-view": "^0.0.17",
"archiver": "^3.1.1",
"axe-core": "^4.0.2",
"babel-eslint": "^10.0.3",
"babel-jest": "^26.3.0",
"babel-plugin-istanbul": "^6.0.0",
"babel-jest": "^27.5.1",
"brace": "0.11.1",
"chai": "3.5.0",
"chance": "1.0.18",
Expand All @@ -350,8 +348,8 @@
"eslint-plugin-ban": "^1.4.0",
"eslint-plugin-cypress": "^2.8.1",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-jest": "^24.0.2",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^26.1.1",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-mocha": "^6.2.2",
"eslint-plugin-no-unsanitized": "^3.0.2",
Expand All @@ -378,9 +376,8 @@
"history": "^4.9.0",
"immer": "^9.0.6",
"intl-messageformat-parser": "^1.4.0",
"jest": "^26.4.2",
"jest-canvas-mock": "^2.2.0",
"jest-environment-jsdom-thirteen": "^1.0.1",
"jest": "^27.5.1",
"jest-canvas-mock": "^2.3.1",
"jest-raw-loader": "^1.0.1",
"jimp": "^0.14.0",
"jquery": "^3.5.0",
Expand All @@ -406,7 +403,7 @@
"ngreact": "^0.5.1",
"nock": "12.0.3",
"normalize-path": "^3.0.0",
"nyc": "^14.1.1",
"nyc": "^15.1.0",
"pixelmatch": "^5.1.0",
"pngjs": "^3.4.0",
"postcss": "^8.4.5",
Expand All @@ -431,7 +428,7 @@
"simple-git": "1.116.0",
"sinon": "^7.4.2",
"strip-ansi": "^6.0.0",
"supertest": "^3.1.0",
"supertest": "^6.2.2",
"supertest-as-promised": "^4.0.2",
"tape": "^5.0.1",
"topojson-client": "3.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"eslint-plugin-ban": "^1.4.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-jest": "^24.0.2",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^26.1.1",
"eslint-plugin-mocha": "^6.2.2",
"eslint-plugin-no-unsanitized": "^3.0.2",
"eslint-plugin-prefer-object-spread": "^1.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-optimizer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"del": "^5.1.0",
"execa": "^4.0.2",
"file-loader": "^4.2.0",
"jest-diff": "^26.4.2",
"jest-diff": "^27.5.1",
"js-yaml": "^3.14.0",
"json-stable-stringify": "^1.0.1",
"lmdb-store": "^1.6.11",
Expand Down
6 changes: 3 additions & 3 deletions packages/osd-optimizer/src/optimizer/cache_keys.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import Path from 'path';

import jestDiff from 'jest-diff';
import { diff } from 'jest-diff';
import { REPO_ROOT } from '@osd/utils';
import { createAbsolutePathSerializer } from '@osd/dev-utils';

Expand Down Expand Up @@ -187,7 +187,7 @@ describe('diffCacheKey()', () => {

describe('reformatJestDiff()', () => {
it('reformats large jestDiff output to focus on the changed lines', () => {
const diff = jestDiff(
const jestDiff = diff(
{
a: ['1', '1', '1', '1', '1', '1', '1', '2', '1', '1', '1', '1', '1', '1', '1', '1', '1'],
},
Expand All @@ -196,7 +196,7 @@ describe('reformatJestDiff()', () => {
}
);

expect(reformatJestDiff(diff)).toMatchInlineSnapshot(`
expect(reformatJestDiff(jestDiff)).toMatchInlineSnapshot(`
"- Expected
+ Received

Expand Down
8 changes: 4 additions & 4 deletions packages/osd-optimizer/src/optimizer/cache_keys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import execa from 'execa';
import { REPO_ROOT } from '@osd/utils';
import stripAnsi from 'strip-ansi';

import jestDiff from 'jest-diff';
import { diff } from 'jest-diff';
import jsonStable from 'json-stable-stringify';
import { ascending, CacheableWorkerConfig } from '../common';

Expand All @@ -62,11 +62,11 @@ export function diffCacheKey(expected?: unknown, actual?: unknown) {
return;
}

return reformatJestDiff(jestDiff(expectedJson, actualJson));
return reformatJestDiff(diff(expectedJson, actualJson));
}

export function reformatJestDiff(diff: string | null) {
const diffLines = diff?.split('\n') || [];
export function reformatJestDiff(jestDiff: string | null) {
const diffLines = jestDiff?.split('\n') || [];

if (
diffLines.length < 4 ||
Expand Down
16 changes: 16 additions & 0 deletions packages/osd-optimizer/src/optimizer/optimizer_config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,10 @@ describe('OptimizerConfig::create()', () => {
"invocationCallOrder": Array [
21,
],
"lastCall": Array [
Symbol(parsed plugin scan dirs),
Symbol(parsed plugin paths),
],
"results": Array [
Object {
"type": "return",
Expand All @@ -491,6 +495,13 @@ describe('OptimizerConfig::create()', () => {
"invocationCallOrder": Array [
23,
],
"lastCall": Array [
Array [],
Array [
Symbol(bundle1),
Symbol(bundle2),
],
],
"results": Array [
Object {
"type": "return",
Expand All @@ -515,6 +526,11 @@ describe('OptimizerConfig::create()', () => {
"invocationCallOrder": Array [
22,
],
"lastCall": Array [
Symbol(new platform plugins),
Symbol(parsed repo root),
Symbol(parsed output root),
],
"results": Array [
Object {
"type": "return",
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-spec-to-console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"homepage": "https://github.com/jbudz/spec-to-console#readme",
"devDependencies": {
"jest": "^26.4.2",
"jest": "^27.5.1",
"prettier": "^2.1.1"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-ui-shared-deps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@osd/i18n": "1.0.0",
"@osd/monaco": "1.0.0",
"abortcontroller-polyfill": "^1.4.0",
"angular": "^1.8.0",
"angular": "^1.8.2",
"axios": "^0.21.4",
"compression-webpack-plugin": "^4.0.0",
"core-js": "^3.6.5",
Expand Down
8 changes: 3 additions & 5 deletions src/core/TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -783,17 +783,15 @@ describe('saved query service', () => {
expect(response).toBe(mockReturnValue);
});

it('should reject with an error when saved objects client errors', async (done) => {
it('should reject with an error when saved objects client errors', (done) => {
mockSavedObjectsClient.create.mockRejectedValue(new Error('timeout'));

try {
await savedQueryService.saveQuery(savedQueryAttributes);
} catch (err) {
savedQueryService.saveQuery(savedQueryAttributes).catch((err) => {
expect(err).toMatchInlineSnapshot(
`[Error: Unable to create saved query, please try again.]`
);
done();
}
});
});
});
});
Expand Down
4 changes: 3 additions & 1 deletion src/core/public/plugins/plugins_service.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
*/

import { omit, pick } from 'lodash';
import { setImmediate } from 'timers';

import {
MockedPluginInitializer,
Expand Down Expand Up @@ -268,7 +269,8 @@ describe('PluginsService', () => {
describe('timeout', () => {
const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
beforeAll(() => {
jest.useFakeTimers();
jest.useFakeTimers('legacy');
setImmediate(() => {});
});
afterAll(() => {
jest.useRealTimers();
Expand Down
Loading