Skip to content

Commit 0ee1738

Browse files
priscilawebdevpriscilawebdev
committed
more conversions
1 parent 56c4223 commit 0ee1738

File tree

8 files changed

+47
-55
lines changed

8 files changed

+47
-55
lines changed

‎tests/js/spec/components/events/interfaces/threadsV2.spec.tsx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {initializeOrg} from 'sentry-test/initializeOrg';
2-
import {fireEvent, mountWithTheme, screen, within} from 'sentry-test/reactTestingLibrary';
2+
import {mountWithTheme, screen, userEvent, within} from 'sentry-test/reactTestingLibrary';
33

44
import ThreadsV2 from 'app/components/events/interfaces/threadsV2';
55
import {EventOrGroupType} from 'app/types';
@@ -237,7 +237,7 @@ describe('ThreadsV2', function () {
237237
mountWithTheme(<ThreadsV2 {...props} />, {organization: org});
238238

239239
expect(screen.getByRole('checkbox', {name: 'Raw'})).not.toBeChecked();
240-
fireEvent.click(screen.getByRole('checkbox', {name: 'Raw'}));
240+
userEvent.click(screen.getByRole('checkbox', {name: 'Raw'}));
241241
expect(screen.getByRole('checkbox', {name: 'Raw'})).toBeChecked();
242242

243243
// Actions must not be rendered
@@ -262,7 +262,7 @@ describe('ThreadsV2', function () {
262262
)
263263
).toBeInTheDocument();
264264

265-
fireEvent.click(screen.getByRole('button', {name: 'Sort By Recent first'}));
265+
userEvent.click(screen.getByRole('button', {name: 'Sort By Recent first'}));
266266

267267
expect(screen.queryAllByLabelText('Sort option')).toHaveLength(2);
268268
expect(screen.queryAllByLabelText('Sort option')[0]).toHaveTextContent(
@@ -272,7 +272,7 @@ describe('ThreadsV2', function () {
272272
'Recent last'
273273
);
274274

275-
fireEvent.click(screen.getByText('Recent last'));
275+
userEvent.click(screen.getByText('Recent last'));
276276

277277
expect(
278278
screen.getByRole('button', {name: 'Sort By Recent last'})
@@ -284,9 +284,9 @@ describe('ThreadsV2', function () {
284284
)
285285
).toBeInTheDocument();
286286

287-
fireEvent.click(screen.getByRole('button', {name: 'Sort By Recent last'}));
287+
userEvent.click(screen.getByRole('button', {name: 'Sort By Recent last'}));
288288

289-
fireEvent.click(screen.getByText('Recent first'));
289+
userEvent.click(screen.getByText('Recent first'));
290290

291291
expect(
292292
screen.getByRole('button', {name: 'Sort By Recent first'})
@@ -300,7 +300,7 @@ describe('ThreadsV2', function () {
300300
screen.getByRole('button', {name: 'Options 1 Active'})
301301
).toBeInTheDocument();
302302

303-
fireEvent.click(screen.getByRole('button', {name: 'Options 1 Active'}));
303+
userEvent.click(screen.getByRole('button', {name: 'Options 1 Active'}));
304304

305305
expect(screen.queryAllByLabelText('Display option')).toHaveLength(2);
306306

@@ -313,7 +313,7 @@ describe('ThreadsV2', function () {
313313
);
314314

315315
// hover over the Minified option
316-
fireEvent.mouseEnter(within(displayOption0).getByText('Minified'));
316+
userEvent.hover(within(displayOption0).getByText('Minified'));
317317
expect(
318318
await screen.findByText('Minified version not available')
319319
).toBeInTheDocument();
@@ -330,7 +330,7 @@ describe('ThreadsV2', function () {
330330
expect(screen.queryAllByTestId('stack-trace-frame')).toHaveLength(4);
331331

332332
// Uncheck Full Stack Trace
333-
fireEvent.click(screen.queryAllByLabelText('Display option')[1]);
333+
userEvent.click(screen.queryAllByLabelText('Display option')[1]);
334334
expect(
335335
within(screen.queryAllByLabelText('Display option')[1]).getByRole('checkbox')
336336
).not.toBeChecked();
@@ -894,7 +894,7 @@ describe('ThreadsV2', function () {
894894
mountWithTheme(<ThreadsV2 {...props} />, {organization: org});
895895

896896
expect(screen.getByRole('checkbox', {name: 'Raw'})).not.toBeChecked();
897-
fireEvent.click(screen.getByRole('checkbox', {name: 'Raw'}));
897+
userEvent.click(screen.getByRole('checkbox', {name: 'Raw'}));
898898
expect(screen.getByRole('checkbox', {name: 'Raw'})).toBeChecked();
899899

900900
// Actions must not be rendered
@@ -919,7 +919,7 @@ describe('ThreadsV2', function () {
919919
)
920920
).toBeInTheDocument();
921921

922-
fireEvent.click(screen.getByRole('button', {name: 'Sort By Recent first'}));
922+
userEvent.click(screen.getByRole('button', {name: 'Sort By Recent first'}));
923923

924924
expect(screen.queryAllByLabelText('Sort option')).toHaveLength(2);
925925
expect(screen.queryAllByLabelText('Sort option')[0]).toHaveTextContent(
@@ -929,7 +929,7 @@ describe('ThreadsV2', function () {
929929
'Recent last'
930930
);
931931

932-
fireEvent.click(screen.getByText('Recent last'));
932+
userEvent.click(screen.getByText('Recent last'));
933933

934934
expect(
935935
screen.getByRole('button', {name: 'Sort By Recent last'})
@@ -941,9 +941,9 @@ describe('ThreadsV2', function () {
941941
)
942942
).toBeInTheDocument();
943943

944-
fireEvent.click(screen.getByRole('button', {name: 'Sort By Recent last'}));
944+
userEvent.click(screen.getByRole('button', {name: 'Sort By Recent last'}));
945945

946-
fireEvent.click(screen.getByText('Recent first'));
946+
userEvent.click(screen.getByText('Recent first'));
947947

948948
expect(
949949
screen.getByRole('button', {name: 'Sort By Recent first'})
@@ -956,7 +956,7 @@ describe('ThreadsV2', function () {
956956
expect(
957957
screen.getByRole('button', {name: 'Options 1 Active'})
958958
).toBeInTheDocument();
959-
fireEvent.click(screen.getByRole('button', {name: 'Options 1 Active'}));
959+
userEvent.click(screen.getByRole('button', {name: 'Options 1 Active'}));
960960

961961
expect(screen.queryAllByLabelText('Display option')).toHaveLength(5);
962962

@@ -1010,7 +1010,7 @@ describe('ThreadsV2', function () {
10101010
)
10111011
).toBeInTheDocument();
10121012

1013-
fireEvent.click(screen.queryAllByLabelText('Display option')[3]);
1013+
userEvent.click(screen.queryAllByLabelText('Display option')[3]);
10141014
expect(within(displayOption3).getByRole('checkbox')).toBeChecked();
10151015

10161016
expect(
@@ -1024,7 +1024,7 @@ describe('ThreadsV2', function () {
10241024
within(screen.queryAllByTestId('stack-trace-frame')[1]).getByText('+0x085ac')
10251025
).toBeInTheDocument();
10261026

1027-
fireEvent.click(screen.queryAllByLabelText('Display option')[1]);
1027+
userEvent.click(screen.queryAllByLabelText('Display option')[1]);
10281028
expect(
10291029
within(screen.queryAllByLabelText('Display option')[1]).getByRole('checkbox')
10301030
).toBeChecked();
@@ -1034,7 +1034,7 @@ describe('ThreadsV2', function () {
10341034
).toBeInTheDocument();
10351035

10361036
// Uncheck Full Stack Trace
1037-
fireEvent.click(screen.queryAllByLabelText('Display option')[4]);
1037+
userEvent.click(screen.queryAllByLabelText('Display option')[4]);
10381038
expect(
10391039
within(screen.queryAllByLabelText('Display option')[4]).getByRole('checkbox')
10401040
).not.toBeChecked();

‎tests/js/spec/components/forms/teamSelector.spec.jsx

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {mountWithTheme, screen, userEvent} from 'sentry-test/reactTestingLibrary';
1+
import {act, mountWithTheme, screen, userEvent} from 'sentry-test/reactTestingLibrary';
22

33
import {addTeamToProject} from 'app/actionCreators/projects';
44
import {TeamSelector} from 'app/components/forms/teamSelector';
@@ -120,15 +120,12 @@ describe('Team Selector', function () {
120120
it('allows searching by slug with useId', function () {
121121
const onChangeMock = jest.fn();
122122
createWrapper({useId: true, onChange: onChangeMock});
123-
openSelectMenu();
123+
userEvent.type(screen.getByText('Select...'), '{keyDown}');
124124

125-
fireEvent.change(screen.getByLabelText('Select a team'), {
126-
target: {value: 'team2'},
127-
});
125+
userEvent.type(screen.getByLabelText('Select a team'), 'team2');
128126

129127
expect(screen.getByText('#team2')).toBeInTheDocument();
130-
131-
fireEvent.click(screen.getByText('#team2'));
128+
userEvent.click(screen.getByText('#team2'));
132129
expect(onChangeMock).toHaveBeenCalledWith(
133130
expect.objectContaining({value: '2'}),
134131
expect.anything()

‎tests/js/spec/components/modals/dashboardWidgetLibraryModal.spec.jsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// import {mountWithTheme} from 'sentry-test/enzyme';
21
import {initializeOrg} from 'sentry-test/initializeOrg';
3-
import {fireEvent, mountWithTheme, screen} from 'sentry-test/reactTestingLibrary';
2+
import {mountWithTheme, screen, userEvent} from 'sentry-test/reactTestingLibrary';
43

54
import DashboardWidgetLibraryModal from 'app/components/modals/dashboardWidgetLibraryModal';
65

@@ -48,8 +47,8 @@ describe('Modals -> DashboardWidgetLibraryModal', function () {
4847

4948
// Select some widgets
5049
const selectButtons = screen.getAllByRole('button');
51-
fireEvent.click(selectButtons[4]);
52-
fireEvent.click(selectButtons[5]);
50+
userEvent.click(selectButtons[4]);
51+
userEvent.click(selectButtons[5]);
5352

5453
expect(screen.getByTestId('selected-badge')).toHaveTextContent('2 Selected');
5554
expect(screen.queryAllByText('Select')).toHaveLength(4);

‎tests/js/spec/utils/discover/arrayValue.spec.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {fireEvent, mountWithTheme, screen} from 'sentry-test/reactTestingLibrary';
1+
import {mountWithTheme, screen, userEvent} from 'sentry-test/reactTestingLibrary';
22

33
import ArrayValue from 'app/utils/discover/arrayValue';
44

@@ -19,7 +19,7 @@ describe('Discover > ArrayValue', function () {
1919

2020
// Should have a button
2121
let button = screen.getByRole('button');
22-
fireEvent.click(button);
22+
userEvent.click(button);
2323

2424
// Button text should update.
2525
button = screen.getByRole('button');

‎tests/js/spec/views/alerts/incidentRules/metricField.spec.jsx

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
import {initializeOrg} from 'sentry-test/initializeOrg';
2-
import {fireEvent, mountWithTheme, screen} from 'sentry-test/reactTestingLibrary';
2+
import {mountWithTheme, screen, userEvent} from 'sentry-test/reactTestingLibrary';
33

44
import MetricField from 'app/views/alerts/incidentRules/metricField';
55
import {Dataset} from 'app/views/alerts/incidentRules/types';
66
import Form from 'app/views/settings/components/forms/form';
77
import FormModel from 'app/views/settings/components/forms/model';
88

99
function openSelectMenu(text) {
10-
const keyDownEvent = {
11-
key: 'ArrowDown',
12-
};
13-
1410
const placeholder = screen.getByText(text);
15-
fireEvent.keyDown(placeholder, keyDownEvent);
11+
userEvent.type(placeholder, '{keyDown}');
1612
}
1713

1814
describe('MetricField', function () {
@@ -45,7 +41,7 @@ describe('MetricField', function () {
4541
expect(screen.getByText('count_unique(…)')).toBeInTheDocument();
4642

4743
// Select count_unique and verify the tags
48-
fireEvent.click(screen.getByText('count_unique(…)'));
44+
userEvent.click(screen.getByText('count_unique(…)'));
4945

5046
expect(model.fields.get('metric')).toBe('count_unique(tags[sentry:user])');
5147
expect(screen.getByText('tags[sentry:user]')).toBeInTheDocument();
@@ -61,7 +57,7 @@ describe('MetricField', function () {
6157

6258
// 10 error aggregate configs
6359
expect(screen.getAllByTestId('label')).toHaveLength(10);
64-
fireEvent.click(screen.getByText('avg(…)'));
60+
userEvent.click(screen.getByText('avg(…)'));
6561
expect(model.fields.get('metric')).toBe('avg(transaction.duration)');
6662

6763
openSelectMenu('transaction.duration');
@@ -77,12 +73,12 @@ describe('MetricField', function () {
7773
</Form>
7874
);
7975
openSelectMenu('(Required)');
80-
fireEvent.click(screen.getByText('failure_rate()'));
76+
userEvent.click(screen.getByText('failure_rate()'));
8177

8278
expect(screen.getByLabelText('Failure rate')).toBeDisabled();
8379

8480
openSelectMenu('failure_rate()');
85-
fireEvent.click(screen.getByText('p95(…)'));
81+
userEvent.click(screen.getByText('p95(…)'));
8682

8783
expect(screen.getByLabelText('Latency')).toBeDisabled();
8884
});
@@ -94,7 +90,7 @@ describe('MetricField', function () {
9490
</Form>
9591
);
9692

97-
fireEvent.click(screen.getByText('Failure rate'));
93+
userEvent.click(screen.getByText('Failure rate'));
9894

9995
expect(screen.getByText('failure_rate()')).toBeInTheDocument();
10096
});

‎tests/js/spec/views/alerts/list/index.spec.jsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import {initializeOrg} from 'sentry-test/initializeOrg';
22
import {
33
act,
4-
fireEvent,
54
mountWithTheme,
65
screen,
6+
userEvent,
77
within,
88
} from 'sentry-test/reactTestingLibrary';
99

@@ -192,15 +192,15 @@ describe('IncidentsList', function () {
192192
it('filters by opened issues', function () {
193193
createWrapper();
194194

195-
fireEvent.click(screen.getByTestId('filter-button'));
195+
userEvent.click(screen.getByTestId('filter-button'));
196196

197197
const resolved = screen.getByText('Resolved');
198198
expect(resolved).toBeInTheDocument();
199199
expect(
200200
within(resolved.parentElement).getByTestId('checkbox-fancy')
201201
).not.toBeChecked();
202202

203-
fireEvent.click(resolved);
203+
userEvent.click(resolved);
204204

205205
expect(router.push).toHaveBeenCalledWith({
206206
pathname: undefined,
@@ -241,8 +241,7 @@ describe('IncidentsList', function () {
241241
const input = screen.getByPlaceholderText('Search by name');
242242
expect(input).toBeInTheDocument();
243243
const testQuery = 'test name';
244-
fireEvent.change(input, {target: {value: testQuery}});
245-
fireEvent.submit(input);
244+
userEvent.type(input, `${testQuery}{enter}`);
246245

247246
expect(router.push).toHaveBeenCalledWith(
248247
expect.objectContaining({

‎tests/js/spec/views/alerts/rules/index.spec.jsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {initializeOrg} from 'sentry-test/initializeOrg';
2-
import {act, fireEvent, mountWithTheme, screen} from 'sentry-test/reactTestingLibrary';
2+
import {act, mountWithTheme, screen, userEvent} from 'sentry-test/reactTestingLibrary';
33

44
import OrganizationStore from 'app/stores/organizationStore';
55
import ProjectsStore from 'app/stores/projectsStore';
@@ -190,8 +190,7 @@ describe('OrganizationRuleList', () => {
190190
expect(search).toBeInTheDocument();
191191

192192
const testQuery = 'test name';
193-
fireEvent.change(search, {target: {value: testQuery}});
194-
fireEvent.submit(search);
193+
userEvent.type(search, `${testQuery}{enter}`);
195194

196195
expect(router.push).toHaveBeenCalledWith(
197196
expect.objectContaining({
@@ -214,10 +213,10 @@ describe('OrganizationRuleList', () => {
214213
getComponent({location: {query: {team: 'myteams'}, search: '?team=myteams`'}})
215214
);
216215

217-
fireEvent.click(await screen.findByTestId('filter-button'));
216+
userEvent.click(await screen.findByTestId('filter-button'));
218217

219218
// Uncheck myteams
220-
fireEvent.click(await screen.findByText('My Teams'));
219+
userEvent.click(await screen.findByText('My Teams'));
221220

222221
expect(router.push).toHaveBeenCalledWith(
223222
expect.objectContaining({
@@ -266,7 +265,7 @@ describe('OrganizationRuleList', () => {
266265
});
267266
expect(await screen.findByText('First Issue Alert')).toBeInTheDocument();
268267

269-
fireEvent.click(screen.getByLabelText('Next'));
268+
userEvent.click(screen.getByLabelText('Next'));
270269

271270
expect(router.push).toHaveBeenCalledWith(
272271
expect.objectContaining({

‎tests/js/spec/views/performance/transactionSpans/opsFilter.spec.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Location} from 'history';
22

33
import {initializeOrg} from 'sentry-test/initializeOrg';
4-
import {fireEvent, mountWithTheme, screen} from 'sentry-test/reactTestingLibrary';
4+
import {mountWithTheme, screen, userEvent} from 'sentry-test/reactTestingLibrary';
55

66
import EventView from 'app/utils/discover/eventView';
77
import OpsFilter from 'app/views/performance/transactionSummary/transactionSpans/opsFilter';
@@ -23,6 +23,8 @@ function initializeData({query} = {query: {}}) {
2323
},
2424
},
2525
},
26+
project: {},
27+
projects: [],
2628
});
2729
return initialData;
2830
}
@@ -93,7 +95,7 @@ describe('Performance > Transaction Spans', function () {
9395
expect(handleOpChange).not.toHaveBeenCalled();
9496
const item = (await screen.findByText('op1')).closest('li');
9597
expect(item).toBeInTheDocument();
96-
fireEvent.click(item!);
98+
userEvent.click(item!);
9799
expect(handleOpChange).toHaveBeenCalledTimes(1);
98100
expect(handleOpChange).toHaveBeenCalledWith('op1');
99101
});

0 commit comments

Comments
 (0)