diff --git a/package.json b/package.json index 10670322e4c..bb5a47f354e 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "@testing-library/jest-dom": "5.16.4", "@testing-library/react": "12.1.4", "@testing-library/react-hooks": "8.0.1", - "@testing-library/user-event": "14.3.0", + "@testing-library/user-event": "14.4.3", "@types/angular": "1.8.4", "@types/angular-route": "1.7.2", "@types/classnames": "2.3.0", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index c767d6b6aee..017aa1da7b6 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -64,7 +64,7 @@ "@testing-library/jest-dom": "5.16.4", "@testing-library/react": "12.1.4", "@testing-library/react-hooks": "8.0.1", - "@testing-library/user-event": "14.3.0", + "@testing-library/user-event": "14.4.3", "@types/history": "4.7.11", "@types/jest": "28.1.6", "@types/jquery": "3.5.14", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 2aee69b67bf..9e2f8bdc21e 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -52,7 +52,7 @@ "@rollup/plugin-node-resolve": "13.3.0", "@testing-library/dom": "8.13.0", "@testing-library/react": "12.1.4", - "@testing-library/user-event": "14.3.0", + "@testing-library/user-event": "14.4.3", "@types/angular": "1.8.4", "@types/history": "4.7.11", "@types/jest": "28.1.6", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index c3a111a3347..9d1aec7129a 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -130,7 +130,7 @@ "@testing-library/jest-dom": "5.16.4", "@testing-library/react": "12.1.4", "@testing-library/react-hooks": "8.0.1", - "@testing-library/user-event": "14.3.0", + "@testing-library/user-event": "14.4.3", "@types/classnames": "2.3.0", "@types/common-tags": "^1.8.0", "@types/d3": "7.4.0", diff --git a/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx b/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx index c25c1c2397e..d70e1b5c362 100644 --- a/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx +++ b/packages/grafana-ui/src/components/Cascader/Cascader.test.tsx @@ -1,6 +1,5 @@ import { act, render, screen } from '@testing-library/react'; import userEvent, { PointerEventsCheckLevel } from '@testing-library/user-event'; -import { UserEvent } from '@testing-library/user-event/dist/types/setup'; import React from 'react'; import { Cascader, CascaderOption, CascaderProps } from './Cascader'; @@ -47,7 +46,7 @@ describe('Cascader', () => { const placeholder = 'cascader-placeholder'; describe('options from state change', () => { - let user: UserEvent; + let user: ReturnType; beforeEach(() => { jest.useFakeTimers(); diff --git a/packages/grafana-ui/src/components/Slider/Slider.test.tsx b/packages/grafana-ui/src/components/Slider/Slider.test.tsx index 8fd6e559c84..97e0ed4fe2c 100644 --- a/packages/grafana-ui/src/components/Slider/Slider.test.tsx +++ b/packages/grafana-ui/src/components/Slider/Slider.test.tsx @@ -1,6 +1,5 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { UserEvent } from '@testing-library/user-event/dist/types/setup'; import React from 'react'; import { Slider } from './Slider'; @@ -12,7 +11,7 @@ const sliderProps: SliderProps = { }; describe('Slider', () => { - let user: UserEvent; + let user: ReturnType; beforeEach(() => { user = userEvent.setup(); diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json index 85177695cd3..db472b7cba3 100644 --- a/packages/jaeger-ui-components/package.json +++ b/packages/jaeger-ui-components/package.json @@ -12,7 +12,7 @@ "@grafana/tsconfig": "^1.2.0-rc1", "@testing-library/jest-dom": "5.16.4", "@testing-library/react": "12.1.4", - "@testing-library/user-event": "14.3.0", + "@testing-library/user-event": "14.4.3", "@types/classnames": "^2.2.7", "@types/deep-freeze": "^0.1.1", "@types/grafana__slate-react": "npm:@types/slate-react@0.22.5", diff --git a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx index 0a490013b42..1ee6994232b 100644 --- a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx +++ b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx @@ -1,7 +1,6 @@ import { within } from '@testing-library/dom'; import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { UserEvent } from '@testing-library/user-event/dist/types/setup'; import React from 'react'; import { BrowserRouter } from 'react-router-dom'; import { getGrafanaContextMock } from 'test/mocks/getGrafanaContextMock'; @@ -52,7 +51,7 @@ function setup() { } describe('VersionSettings', () => { - let user: UserEvent; + let user: ReturnType; beforeEach(() => { // Need to use delay: null here to work with fakeTimers diff --git a/public/app/features/variables/inspect/VariablesUnknownTable.test.tsx b/public/app/features/variables/inspect/VariablesUnknownTable.test.tsx index e6dd04e8ba6..490b65b6b75 100644 --- a/public/app/features/variables/inspect/VariablesUnknownTable.test.tsx +++ b/public/app/features/variables/inspect/VariablesUnknownTable.test.tsx @@ -1,6 +1,5 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { UserEvent } from '@testing-library/user-event/dist/types/setup'; import React from 'react'; import * as runtime from '@grafana/runtime'; @@ -105,7 +104,7 @@ describe('VariablesUnknownTable', () => { }); describe('but when the unknown processing takes a while', () => { - let user: UserEvent; + let user: ReturnType; beforeEach(() => { jest.useFakeTimers(); diff --git a/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx b/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx index 43c12464346..d0f6ae4aff4 100644 --- a/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx +++ b/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx @@ -1,6 +1,5 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { UserEvent } from '@testing-library/user-event/dist/types/setup'; import React from 'react'; import { of } from 'rxjs'; import { createFetchResponse } from 'test/helpers/createFetchResponse'; @@ -70,7 +69,7 @@ describe('SearchForm', () => { }); describe('SearchForm', () => { - let user: UserEvent; + let user: ReturnType; let query: JaegerQuery; let ds: JaegerDatasource; diff --git a/public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.test.tsx b/public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.test.tsx index c06050ffcea..0672304644b 100644 --- a/public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.test.tsx +++ b/public/app/plugins/datasource/tempo/QueryEditor/NativeSearch.test.tsx @@ -1,6 +1,5 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { UserEvent } from '@testing-library/user-event/dist/types/setup'; import React from 'react'; import { TempoDatasource, TempoQuery } from '../datasource'; @@ -49,7 +48,7 @@ let mockQuery = { } as TempoQuery; describe('NativeSearch', () => { - let user: UserEvent; + let user: ReturnType; beforeEach(() => { jest.useFakeTimers(); diff --git a/yarn.lock b/yarn.lock index b61c1edc07c..4700333e6cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4815,7 +4815,7 @@ __metadata: "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.4 "@testing-library/react-hooks": 8.0.1 - "@testing-library/user-event": 14.3.0 + "@testing-library/user-event": 14.4.3 "@types/d3-interpolate": ^1.4.0 "@types/history": 4.7.11 "@types/jest": 28.1.6 @@ -5004,7 +5004,7 @@ __metadata: "@sentry/browser": 6.19.7 "@testing-library/dom": 8.13.0 "@testing-library/react": 12.1.4 - "@testing-library/user-event": 14.3.0 + "@testing-library/user-event": 14.4.3 "@types/angular": 1.8.4 "@types/history": 4.7.11 "@types/jest": 28.1.6 @@ -5229,7 +5229,7 @@ __metadata: "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.4 "@testing-library/react-hooks": 8.0.1 - "@testing-library/user-event": 14.3.0 + "@testing-library/user-event": 14.4.3 "@types/classnames": 2.3.0 "@types/common-tags": ^1.8.0 "@types/d3": 7.4.0 @@ -5468,7 +5468,7 @@ __metadata: "@grafana/ui": 9.2.0-pre "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.4 - "@testing-library/user-event": 14.3.0 + "@testing-library/user-event": 14.4.3 "@types/classnames": ^2.2.7 "@types/deep-freeze": ^0.1.1 "@types/grafana__slate-react": "npm:@types/slate-react@0.22.5" @@ -10401,12 +10401,12 @@ __metadata: languageName: node linkType: hard -"@testing-library/user-event@npm:14.3.0": - version: 14.3.0 - resolution: "@testing-library/user-event@npm:14.3.0" +"@testing-library/user-event@npm:14.4.3": + version: 14.4.3 + resolution: "@testing-library/user-event@npm:14.4.3" peerDependencies: "@testing-library/dom": ">=7.21.4" - checksum: cbd5954460496519cb2ff3fa506ca598d7e4c2e3d2f2e129b21909758f5ec87573aad7d6c79aebffd4bd0ea843315b3064a2a76e545f196bd4c82489cb3afc1d + checksum: 852c48ea6db1c9471b18276617c84fec4320771e466cd58339a732ca3fd73ad35e5a43ae14f51af51a8d0a150dcf60fcaab049ef367871207bea8f92c4b8195e languageName: node linkType: hard @@ -21815,7 +21815,7 @@ __metadata: "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.4 "@testing-library/react-hooks": 8.0.1 - "@testing-library/user-event": 14.3.0 + "@testing-library/user-event": 14.4.3 "@types/angular": 1.8.4 "@types/angular-route": 1.7.2 "@types/classnames": 2.3.0