paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 30 Packages Projects Releases Wiki Activity

Merge pull request #920 from spotify/eide/bump-jest-26

Browse Source 
Bump to jest 26.0.1
This commit is contained in:
Marcus Eide
2020-05-19 15:15:39 +02:00
committed by GitHub
parent 12a0f5688e d794c65c2e
commit 06466d1b72
24 changed files with 936 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/package.json
+1 -1
View File
@@ -30,7 +30,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/jquery": "^3.3.34",
"@types/node": "^12.0.0",
"@types/react-router-dom": "^5.1.3",
packages/backend-common/package.json
+1 -1
View File
@@ -40,7 +40,7 @@
"@types/yaml": "^1.9.7",
"get-port": "^5.1.1",
"http-errors": "^1.7.3",
"jest": "^25.1.0",
"jest": "^26.0.1",
"jest-fetch-mock": "^3.0.3",
"supertest": "^4.0.2",
"typescript": "^3.9.2"
packages/backend/package.json
+1 -1
View File
@@ -35,7 +35,7 @@
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5",
"@types/helmet": "^0.0.47",
"jest": "^25.1.0",
"jest": "^26.0.1",
"tsc-watch": "^4.2.3",
"typescript": "^3.9.2",
"winston": "^3.2.1"
packages/cli/package.json
+2 -1
View File
@@ -51,7 +51,8 @@
"handlebars": "^4.7.3",
"html-webpack-plugin": "^3.2.0",
"inquirer": "^7.0.4",
"jest": "^25.1.0",
"jest": "^26.0.1",
"ts-jest": "^26.0.0",
"jest-css-modules": "^2.1.0",
"jest-esm-transformer": "^1.0.0",
"mini-css-extract-plugin": "^0.9.0",
packages/cli/templates/default-app/packages/app/package.json.hbs
+1 -1
View File
@@ -19,7 +19,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/react-router-dom": "^5.1.3",
"@types/testing-library__jest-dom": "^5.0.4",
packages/cli/templates/default-plugin/package.json.hbs
+1 -1
View File
@@ -35,7 +35,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
packages/core/package.json
+1 -1
View File
@@ -33,7 +33,7 @@
"@material-ui/icons": "^4.9.1",
"@types/classnames": "^2.2.9",
"@types/google-protobuf": "^3.7.2",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/react-helmet": "^5.0.15",
"@types/react-sparklines": "^1.7.0",
packages/core/src/layout/Sidebar/Bar.tsx
+3 -3
View File
@@ -74,7 +74,7 @@ export const Sidebar: FC<Props> = ({
}) => {
const classes = useStyles();
const [state, setState] = useState(State.Closed);
const hoverTimerRef = useRef<NodeJS.Timer>();
const hoverTimerRef = useRef<number>();
const handleOpen = () => {
if (hoverTimerRef.current) {
@@ -82,7 +82,7 @@ export const Sidebar: FC<Props> = ({
hoverTimerRef.current = undefined;
}
if (state !== State.Open) {
hoverTimerRef.current = setTimeout(() => {
hoverTimerRef.current = window.setTimeout(() => {
hoverTimerRef.current = undefined;
setState(State.Open);
}, openDelayMs);
@@ -99,7 +99,7 @@ export const Sidebar: FC<Props> = ({
if (state === State.Peek) {
setState(State.Closed);
} else if (state === State.Open) {
hoverTimerRef.current = setTimeout(() => {
hoverTimerRef.current = window.setTimeout(() => {
hoverTimerRef.current = undefined;
setState(State.Closed);
}, closeDelayMs);
packages/dev-utils/package.json
+1 -1
View File
@@ -37,7 +37,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"react": "^16.12.0",
"react-dom": "^16.12.0",
packages/test-utils-core/package.json
+1 -1
View File
@@ -30,7 +30,7 @@
"dependencies": {
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"react": "^16.12.0",
"react-dom": "^16.12.0"
packages/test-utils/package.json
+1 -1
View File
@@ -35,7 +35,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"react": "^16.12.0",
"react-dom": "^16.12.0",
plugins/catalog/package.json
+1 -1
View File
@@ -33,7 +33,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
plugins/explore/package.json
+1 -1
View File
@@ -34,7 +34,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
plugins/graphiql/package.json
+1 -1
View File
@@ -49,7 +49,7 @@
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/codemirror": "^0.0.93",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3",
plugins/home-page/package.json
+1 -1
View File
@@ -32,7 +32,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3",
plugins/lighthouse/package.json
+1 -1
View File
@@ -35,7 +35,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
plugins/lighthouse/src/components/AuditList/index.test.tsx
+3 -2
View File
@@ -15,12 +15,13 @@
*/
jest.mock('react-router-dom', () => {
const actual = jest.requireActual('react-router-dom');
const mocks = {
replace: jest.fn(),
push: jest.fn(),
};
return {
...jest.requireActual('react-router-dom'),
...actual,
useHistory: jest.fn(() => mocks),
};
});
@@ -41,7 +42,7 @@ import AuditList from '.';
import * as data from '../../__fixtures__/website-list-response.json';
const { useHistory } = require.requireMock('react-router-dom');
const { useHistory } = jest.requireMock('react-router-dom');
const websiteListResponse = data as WebsiteListResponse;
describe('AuditList', () => {
plugins/lighthouse/src/components/AuditView/index.test.tsx
+8 -5
View File
@@ -16,10 +16,13 @@
/* eslint-disable jest/no-disabled-tests */
jest.mock('react-router-dom', () => ({
...jest.requireActual('react-router-dom'),
useParams: jest.fn(() => ({})),
}));
jest.mock('react-router-dom', () => {
const actual = jest.requireActual('react-router-dom');
return {
...actual,
useParams: jest.fn(() => ({})),
};
});
import React from 'react';
import mockFetch from 'jest-fetch-mock';
@@ -32,7 +35,7 @@ import { lighthouseApiRef, LighthouseRestApi, Audit, Website } from '../../api';
import { formatTime } from '../../utils';
import * as data from '../../__fixtures__/website-response.json';
const { useParams }: { useParams: jest.Mock } = require.requireMock(
const { useParams }: { useParams: jest.Mock } = jest.requireMock(
'react-router-dom',
);
const websiteResponse = data as Website;
plugins/lighthouse/src/components/CreateAudit/index.test.tsx
+3 -2
View File
@@ -15,12 +15,13 @@
*/
jest.mock('react-router-dom', () => {
const actual = jest.requireActual('react-router-dom');
const mocks = {
replace: jest.fn(),
push: jest.fn(),
};
return {
...jest.requireActual('react-router-dom'),
...actual,
useHistory: jest.fn(() => mocks),
};
});
@@ -41,7 +42,7 @@ import { lighthouseApiRef, LighthouseRestApi, Audit } from '../../api';
import CreateAudit from '.';
import * as data from '../../__fixtures__/create-audit-response.json';
const { useHistory }: { useHistory: jest.Mock } = require.requireMock(
const { useHistory }: { useHistory: jest.Mock } = jest.requireMock(
'react-router-dom',
);
const createAuditResponse = data as Audit;
plugins/register-component/package.json
+1 -1
View File
@@ -33,7 +33,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
plugins/scaffolder/package.json
+1 -1
View File
@@ -32,7 +32,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
plugins/tech-radar/package.json
+1 -1
View File
@@ -38,7 +38,7 @@
"@testing-library/user-event": "^10.2.4",
"@types/color": "^3.0.1",
"@types/d3-force": "^1.2.1",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
plugins/welcome/package.json
+1 -1
View File
@@ -33,7 +33,7 @@
"@testing-library/jest-dom": "^5.7.0",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^10.2.4",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/node": "^12.0.0",
"@types/testing-library__jest-dom": "^5.0.4",
"jest-fetch-mock": "^3.0.3"
yarn.lock
+899 -29
View File
File diff suppressed because it is too large Load Diff