Skip to content

Commit 8b5d9c7

Browse files
committed
test: optimize
1 parent b45b533 commit 8b5d9c7

File tree

1 file changed

+17
-45
lines changed

1 file changed

+17
-45
lines changed

tests/uploader.spec.tsx

Lines changed: 17 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ describe('uploader', () => {
349349
}, 100);
350350
});
351351

352-
it('paste to upload', done => {
352+
it('paste to upload', async () => {
353353
const { container } = render(<Upload {...props} pastable />);
354354
const input = container.querySelector('input')!;
355355

@@ -366,23 +366,21 @@ describe('uploader', () => {
366366
handlers.onSuccess = (ret, file) => {
367367
expect(ret[1]).toEqual(file.name);
368368
expect(file).toHaveProperty('uid');
369-
done();
370369
};
371370

372371
handlers.onError = err => {
373-
done(err);
372+
throw err;
374373
};
375374

376375
fireEvent.paste(input, {
377376
clipboardData: { files },
378377
});
379378

380-
setTimeout(() => {
381-
requests[0].respond(200, {}, `["","${files[0].name}"]`);
382-
}, 100);
379+
await sleep(100);
380+
requests[0].respond(200, {}, `["","${files[0].name}"]`);
383381
});
384382

385-
it('paste unaccepted type files to upload will not trigger onStart', done => {
383+
it('paste unaccepted type files to upload will not trigger onStart', () => {
386384
const input = uploader.container.querySelector('input')!;
387385
const files = [
388386
{
@@ -399,13 +397,11 @@ describe('uploader', () => {
399397
});
400398
const mockStart = jest.fn();
401399
handlers.onStart = mockStart;
402-
setTimeout(() => {
403-
expect(mockStart.mock.calls.length).toBe(0);
404-
done();
405-
}, 100);
400+
401+
expect(mockStart.mock.calls.length).toBe(0);
406402
});
407403

408-
it('paste files with multiple false', done => {
404+
it('paste files with multiple false', async () => {
409405
const { container } = render(<Upload {...props} multiple={false} pastable />);
410406
const input = container.querySelector('input')!;
411407
const files = [
@@ -422,28 +418,21 @@ describe('uploader', () => {
422418
triggerTimes += 1;
423419
};
424420
handlers.onSuccess = (ret, file) => {
425-
try {
426-
expect(ret[1]).toEqual(file.name);
427-
expect(file).toHaveProperty('uid');
428-
expect(triggerTimes).toEqual(1);
429-
done();
430-
} catch (error) {
431-
done(error);
432-
}
421+
expect(ret[1]).toEqual(file.name);
422+
expect(file).toHaveProperty('uid');
423+
expect(triggerTimes).toEqual(1);
433424
};
434425
handlers.onError = error => {
435-
done(error);
426+
throw error;
436427
};
437-
438428
Object.defineProperty(input, 'files', {
439429
value: files,
440430
});
441431

442432
fireEvent.paste(input, { clipboardData: { files } });
443433

444-
setTimeout(() => {
445-
handlers.onSuccess!(['', files[0].name] as any, files[0] as any, null!);
446-
}, 100);
434+
await sleep(100);
435+
handlers.onSuccess!(['', files[0].name] as any, files[0] as any, null!);
447436
});
448437

449438
it('support action and data is function returns Promise', async () => {
@@ -499,21 +488,6 @@ describe('uploader', () => {
499488

500489
fireEvent.change(input, { target: { files } });
501490
});
502-
503-
it('support onMouseEnter and onMouseLeave', async () => {
504-
const onMouseEnter = jest.fn();
505-
const onMouseLeave = jest.fn();
506-
507-
const { container } = render(
508-
<Upload onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave} />,
509-
);
510-
const rcUpload = container.querySelector('.rc-upload')!;
511-
512-
fireEvent.mouseEnter(rcUpload);
513-
fireEvent.mouseLeave(rcUpload);
514-
expect(onMouseEnter).toHaveBeenCalled();
515-
expect(onMouseLeave).toHaveBeenCalled();
516-
});
517491
});
518492

519493
describe('directory uploader', () => {
@@ -779,7 +753,7 @@ describe('uploader', () => {
779753
}, 100);
780754
});
781755

782-
it('paste directory', done => {
756+
it('paste directory', async () => {
783757
const { container } = render(<Upload {...props} pastable />);
784758
const rcUpload = container.querySelector('.rc-upload')!;
785759
const files = {
@@ -796,10 +770,8 @@ describe('uploader', () => {
796770
const mockStart = jest.fn();
797771
handlers.onStart = mockStart;
798772

799-
setTimeout(() => {
800-
expect(mockStart.mock.calls.length).toBe(1);
801-
done();
802-
}, 100);
773+
await sleep(100);
774+
expect(mockStart.mock.calls.length).toBe(1);
803775
});
804776
});
805777

0 commit comments

Comments
 (0)