Skip to content

Commit 983bcb7

Browse files
author
刘欢
committed
test: change test
1 parent 98358a0 commit 983bcb7

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

src/AjaxUploader.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,10 @@ class AjaxUploader extends Component<UploadProps> {
253253

254254
const { uid } = origin;
255255

256-
const customRequest = agu => {
257-
return propsCustomRequest({ ...agu, info: { defaultRequest } });
258-
};
259-
260256
const request =
261-
(typeof propsCustomRequest === 'function' ? customRequest : propsCustomRequest) ||
262-
defaultRequest;
257+
typeof propsCustomRequest === 'function'
258+
? args => propsCustomRequest({ ...args, info: { defaultRequest } })
259+
: propsCustomRequest || defaultRequest;
263260

264261
const requestOption = {
265262
action,

tests/uploader.spec.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,11 +1267,9 @@ describe('uploader', () => {
12671267
expect(container.querySelector('span')!).not.toHaveAttribute('role', 'button');
12681268
});
12691269
it('should support defaultRequest in customRequest', done => {
1270-
const mockDefaultRequest = jest.fn();
12711270
const customRequest = jest.fn(({ file, onSuccess, onError, info }) => {
12721271
// 模拟条件判断后使用默认上传
12731272
if (file.name === 'success.png') {
1274-
info.defaultRequest = mockDefaultRequest;
12751273
info.defaultRequest({ file, onSuccess, onError });
12761274
} else {
12771275
onError(new Error('custom error'));
@@ -1293,11 +1291,6 @@ describe('uploader', () => {
12931291
setTimeout(() => {
12941292
expect(customRequest).toHaveBeenCalled();
12951293
expect(onSuccess).toHaveBeenCalled();
1296-
expect(mockDefaultRequest).toHaveBeenCalledWith({
1297-
file: expect.any(File),
1298-
onSuccess: expect.any(Function),
1299-
onError: expect.any(Function),
1300-
});
13011294
done();
13021295
}, 100);
13031296
}, 100);

0 commit comments

Comments
 (0)