Skip to content

Commit 633f024

Browse files
Hyperkid123Hyperkid123
authored
Merge pull request #1237 from rvsia/updateUserEvent14
Update userEvent to version 14
2 parents 725cba7 + 3c9f1c2 commit 633f024

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1221
-1080
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@testing-library/dom": "^8.11.2",
7676
"@testing-library/jest-dom": "^5.16.1",
7777
"@testing-library/react": "^12.1.2",
78-
"@testing-library/user-event": "^13.5.0",
78+
"@testing-library/user-event": "^14.1.1",
7979
"@types/react": "^17.0.21",
8080
"@types/react-dom": "^17.0.9",
8181
"@typescript-eslint/eslint-plugin": "^4.31.1",

‎packages/ant-component-mapper/src/tests/components.test.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ describe('formFields generated tests', () => {
8585
render(<RendererWrapper schema={{ fields: [errorField] }} />);
8686

8787
await act(async () => {
88-
userEvent.click(screen.getByText('Submit'));
88+
await userEvent.click(screen.getByText('Submit'));
8989
});
9090

9191
expect(screen.getByText(errorText)).toBeInTheDocument();
@@ -163,7 +163,7 @@ describe('formFields generated tests', () => {
163163
render(<RendererWrapper schema={{ fields: [errorFields] }} />);
164164

165165
await act(async () => {
166-
userEvent.click(screen.getByText('Submit'));
166+
await userEvent.click(screen.getByText('Submit'));
167167
});
168168

169169
expect(screen.getByText(errorText)).toBeInTheDocument();
@@ -234,7 +234,7 @@ describe('formFields generated tests', () => {
234234
render(<RendererWrapper schema={schema} onSubmit={() => ({ [field.name]: errorText })} />);
235235

236236
await act(async () => {
237-
userEvent.click(screen.getByText('Submit'));
237+
await userEvent.click(screen.getByText('Submit'));
238238
});
239239

240240
expect(screen.getByText(errorText)).toBeInTheDocument();

‎packages/ant-component-mapper/src/tests/dual-list-select.test.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@ describe('DualListSelect', () => {
7070
});
7171

7272
await act(async () => {
73-
userEvent.click(screen.getByText('Submit'));
73+
await userEvent.click(screen.getByText('Submit'));
7474
});
7575

7676
expect(onSubmit).toHaveBeenCalledWith({});
7777
onSubmit.mockClear();
7878

79-
userEvent.click(screen.getByText('cats'));
80-
userEvent.click(screen.getByLabelText('right'));
79+
await userEvent.click(screen.getByText('cats'));
80+
await userEvent.click(screen.getByLabelText('right'));
8181

8282
await act(async () => {
83-
userEvent.click(screen.getByText('Submit'));
83+
await userEvent.click(screen.getByText('Submit'));
8484
});
8585

8686
expect(onSubmit).toHaveBeenCalledWith({ 'dual-Menu': ['cats'] });
@@ -92,17 +92,17 @@ describe('DualListSelect', () => {
9292
});
9393

9494
await act(async () => {
95-
userEvent.click(screen.getByText('Submit'));
95+
await userEvent.click(screen.getByText('Submit'));
9696
});
9797

9898
expect(onSubmit).toHaveBeenCalledWith({ 'dual-Menu': ['cats'] });
9999
onSubmit.mockClear();
100100

101-
userEvent.click(screen.getByText('cats'));
102-
userEvent.click(screen.getByLabelText('left'));
101+
await userEvent.click(screen.getByText('cats'));
102+
await userEvent.click(screen.getByLabelText('left'));
103103

104104
await act(async () => {
105-
userEvent.click(screen.getByText('Submit'));
105+
await userEvent.click(screen.getByText('Submit'));
106106
});
107107

108108
expect(onSubmit).toHaveBeenCalledWith({});

‎packages/ant-component-mapper/src/tests/field-array.test.js‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('<FieldArray/>', () => {
6666
expect(screen.getByText(noItemsMessage)).toBeInTheDocument();
6767
expect(() => screen.getByLabelText('name')).toThrow();
6868

69-
userEvent.click(screen.getByText('CUSTOM ADD'));
69+
await userEvent.click(screen.getByText('CUSTOM ADD'));
7070

7171
expect(() => screen.getByText(noItemsMessage)).toThrow();
7272
expect(screen.getByText('CUSTOM REMOVE')).toBeInTheDocument();
@@ -102,18 +102,18 @@ describe('<FieldArray/>', () => {
102102
render(<FormRenderer {...initialProps} />);
103103

104104
await act(async () => {
105-
userEvent.click(screen.getByText('Submit'));
105+
await userEvent.click(screen.getByText('Submit'));
106106
});
107107

108108
expect(onSubmit).toHaveBeenCalledWith({});
109109
onSubmit.mockClear();
110110

111111
await act(async () => {
112-
userEvent.click(screen.getByText('ADD'));
112+
await userEvent.click(screen.getByText('ADD'));
113113
});
114114

115115
await act(async () => {
116-
userEvent.click(screen.getByText('Submit'));
116+
await userEvent.click(screen.getByText('Submit'));
117117
});
118118

119119
expect(onSubmit).toHaveBeenCalledWith({
@@ -122,11 +122,11 @@ describe('<FieldArray/>', () => {
122122
onSubmit.mockClear();
123123

124124
await act(async () => {
125-
userEvent.click(screen.getByText('REMOVE'));
125+
await userEvent.click(screen.getByText('REMOVE'));
126126
});
127127

128128
await act(async () => {
129-
userEvent.click(screen.getByText('Submit'));
129+
await userEvent.click(screen.getByText('Submit'));
130130
});
131131

132132
expect(onSubmit).toHaveBeenCalledWith({
@@ -156,18 +156,18 @@ describe('<FieldArray/>', () => {
156156
render(<FormRenderer {...initialProps} />);
157157

158158
await act(async () => {
159-
userEvent.click(screen.getByText('Submit'));
159+
await userEvent.click(screen.getByText('Submit'));
160160
});
161161

162162
expect(onSubmit).toHaveBeenCalledWith({});
163163
onSubmit.mockClear();
164164

165165
await act(async () => {
166-
userEvent.click(screen.getByText('ADD'));
166+
await userEvent.click(screen.getByText('ADD'));
167167
});
168168

169169
await act(async () => {
170-
userEvent.click(screen.getByText('Submit'));
170+
await userEvent.click(screen.getByText('Submit'));
171171
});
172172

173173
expect(onSubmit).toHaveBeenCalledWith({
@@ -177,11 +177,11 @@ describe('<FieldArray/>', () => {
177177
onSubmit.mockClear();
178178

179179
await act(async () => {
180-
userEvent.click(screen.getByText('REMOVE'));
180+
await userEvent.click(screen.getByText('REMOVE'));
181181
});
182182

183183
await act(async () => {
184-
userEvent.click(screen.getByText('Submit'));
184+
await userEvent.click(screen.getByText('Submit'));
185185
});
186186

187187
expect(onSubmit).toHaveBeenCalledWith({
@@ -213,11 +213,11 @@ describe('<FieldArray/>', () => {
213213
render(<FormRenderer {...initialProps} />);
214214

215215
await act(async () => {
216-
userEvent.click(screen.getByText('ADD'));
216+
await userEvent.click(screen.getByText('ADD'));
217217
});
218218

219219
await act(async () => {
220-
userEvent.click(screen.getByText('Submit'));
220+
await userEvent.click(screen.getByText('Submit'));
221221
});
222222

223223
expect(onSubmit).toHaveBeenCalledWith({
@@ -226,11 +226,11 @@ describe('<FieldArray/>', () => {
226226
onSubmit.mockClear();
227227

228228
await act(async () => {
229-
userEvent.click(screen.getByText('ADD'));
229+
await userEvent.click(screen.getByText('ADD'));
230230
});
231231

232232
await act(async () => {
233-
userEvent.click(screen.getByText('Submit'));
233+
await userEvent.click(screen.getByText('Submit'));
234234
});
235235

236236
expect(onSubmit).toHaveBeenCalledWith({
@@ -239,11 +239,11 @@ describe('<FieldArray/>', () => {
239239
onSubmit.mockClear();
240240

241241
await act(async () => {
242-
userEvent.click(screen.getByText('ADD'));
242+
await userEvent.click(screen.getByText('ADD'));
243243
});
244244

245245
await act(async () => {
246-
userEvent.click(screen.getByText('Submit'));
246+
await userEvent.click(screen.getByText('Submit'));
247247
});
248248

249249
expect(onSubmit).toHaveBeenCalledWith({
@@ -252,11 +252,11 @@ describe('<FieldArray/>', () => {
252252
onSubmit.mockClear();
253253

254254
await act(async () => {
255-
userEvent.click(screen.getAllByText('REMOVE')[0]);
255+
await userEvent.click(screen.getAllByText('REMOVE')[0]);
256256
});
257257

258258
await act(async () => {
259-
userEvent.click(screen.getByText('Submit'));
259+
await userEvent.click(screen.getByText('Submit'));
260260
});
261261

262262
expect(onSubmit).toHaveBeenCalledWith({
@@ -265,11 +265,11 @@ describe('<FieldArray/>', () => {
265265
onSubmit.mockClear();
266266

267267
await act(async () => {
268-
userEvent.click(screen.getAllByText('REMOVE')[0]);
268+
await userEvent.click(screen.getAllByText('REMOVE')[0]);
269269
});
270270

271271
await act(async () => {
272-
userEvent.click(screen.getByText('Submit'));
272+
await userEvent.click(screen.getByText('Submit'));
273273
});
274274

275275
expect(onSubmit).toHaveBeenCalledWith({
@@ -301,11 +301,11 @@ describe('<FieldArray/>', () => {
301301
expect(() => screen.getByText('Must have at least 3 items.')).toThrow();
302302

303303
await act(async () => {
304-
userEvent.click(screen.getByText('ADD'));
304+
await userEvent.click(screen.getByText('ADD'));
305305
});
306306

307307
await act(async () => {
308-
userEvent.click(screen.getByText('Submit'));
308+
await userEvent.click(screen.getByText('Submit'));
309309
});
310310

311311
expect(onSubmit).not.toHaveBeenCalled();
@@ -338,11 +338,11 @@ describe('<FieldArray/>', () => {
338338
render(<FormRenderer {...initialProps} />);
339339

340340
await act(async () => {
341-
userEvent.click(screen.getByText('ADD'));
341+
await userEvent.click(screen.getByText('ADD'));
342342
});
343343

344344
await act(async () => {
345-
userEvent.click(screen.getByText('Submit'));
345+
await userEvent.click(screen.getByText('Submit'));
346346
});
347347

348348
expect(onSubmit).toHaveBeenCalledWith({
@@ -352,11 +352,11 @@ describe('<FieldArray/>', () => {
352352
onSubmit.mockClear();
353353

354354
await act(async () => {
355-
userEvent.click(screen.getByText('REMOVE'));
355+
await userEvent.click(screen.getByText('REMOVE'));
356356
});
357357

358358
await act(async () => {
359-
userEvent.click(screen.getByText('Submit'));
359+
await userEvent.click(screen.getByText('Submit'));
360360
});
361361

362362
expect(onSubmit).toHaveBeenCalledWith({
@@ -366,11 +366,11 @@ describe('<FieldArray/>', () => {
366366
onSubmit.mockClear();
367367

368368
await act(async () => {
369-
userEvent.click(screen.getByLabelText('undo-button'));
369+
await userEvent.click(screen.getByLabelText('undo-button'));
370370
});
371371

372372
await act(async () => {
373-
userEvent.click(screen.getByText('Submit'));
373+
await userEvent.click(screen.getByText('Submit'));
374374
});
375375

376376
expect(onSubmit).toHaveBeenCalledWith({
@@ -380,31 +380,31 @@ describe('<FieldArray/>', () => {
380380
onSubmit.mockClear();
381381

382382
await act(async () => {
383-
userEvent.click(screen.getByLabelText('redo-button'));
383+
await userEvent.click(screen.getByLabelText('redo-button'));
384384
});
385385

386386
await act(async () => {
387-
userEvent.click(screen.getByText('Submit'));
387+
await userEvent.click(screen.getByText('Submit'));
388388
});
389389

390390
expect(onSubmit).toHaveBeenCalledWith({
391391
nicePeople: [],
392392
});
393393

394394
await act(async () => {
395-
userEvent.click(screen.getByLabelText('undo-button'));
395+
await userEvent.click(screen.getByLabelText('undo-button'));
396396
});
397397

398398
await act(async () => {
399-
userEvent.click(screen.getByText('Submit'));
399+
await userEvent.click(screen.getByText('Submit'));
400400
});
401401

402402
expect(onSubmit).toHaveBeenCalledWith({
403403
nicePeople: [{ name: 'enter a name', lastName: 'enter a last name' }],
404404
});
405405

406406
await act(async () => {
407-
userEvent.click(screen.getByText('ADD'));
407+
await userEvent.click(screen.getByText('ADD'));
408408
});
409409

410410
expect(screen.getByLabelText('redo-button')).toBeDisabled();

‎packages/ant-component-mapper/src/tests/radio.test.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ describe('<Radio />', () => {
5454
]);
5555

5656
await act(async () => {
57-
userEvent.click(screen.getByText('Submit'));
57+
await userEvent.click(screen.getByText('Submit'));
5858
});
5959

6060
expect(onSubmit).toHaveBeenLastCalledWith({ radio: '2' });
6161

62-
userEvent.click(screen.getByText('Hamsters'));
62+
await userEvent.click(screen.getByText('Hamsters'));
6363

6464
expect([...screen.getAllByRole('radio')].map((r) => [r.name, r.value, r.checked])).toEqual([
6565
['radio', '1', false],
@@ -68,7 +68,7 @@ describe('<Radio />', () => {
6868
]);
6969

7070
await act(async () => {
71-
userEvent.click(screen.getByText('Submit'));
71+
await userEvent.click(screen.getByText('Submit'));
7272
});
7373

7474
expect(onSubmit).toHaveBeenLastCalledWith({ radio: '3' });

‎packages/ant-component-mapper/src/tests/select.test.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('<Select />', () => {
2929
expect(screen.getByText('Select')).toBeInTheDocument();
3030

3131
await act(async () => {
32-
userEvent.click(screen.getByText('Please choose'));
32+
await userEvent.click(screen.getByText('Please choose'));
3333
});
3434

3535
expect(screen.getByText('option 1')).toBeInTheDocument();

0 commit comments

Comments
 (0)