From b31aca0e74410c546e5dc556ea0bca5c467999b8 Mon Sep 17 00:00:00 2001 From: "954270063@qq.com" <954270063@qq.com> Date: Tue, 21 Apr 2020 10:02:11 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=A2=9E=E5=BC=BA=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +-- src/core/request.ts | 11 ++-- src/types.ts | 4 +- test/axios.test.ts | 51 +++++++----------- test/cancel/CancelToken.test.ts | 18 +++---- test/cancel/isCancel.test.ts | 4 +- test/core/Axios.test.ts | 28 +++++----- test/core/dispatchRequest.test.ts | 53 ++++++++----------- test/core/request.test.ts | 41 +++++++------- test/{helper => helpers}/buildURL.test.ts | 0 test/{helper => helpers}/combineURL.test.ts | 0 .../{helper => helpers}/isAbsoluteURL.test.ts | 0 test/{helper => helpers}/utils.test.ts | 0 13 files changed, 96 insertions(+), 122 deletions(-) rename test/{helper => helpers}/buildURL.test.ts (100%) rename test/{helper => helpers}/combineURL.test.ts (100%) rename test/{helper => helpers}/isAbsoluteURL.test.ts (100%) rename test/{helper => helpers}/utils.test.ts (100%) diff --git a/README.md b/README.md index 3c0e94a..c22aecd 100644 --- a/README.md +++ b/README.md @@ -130,18 +130,18 @@ axios.post('/test', { test: 1 }, { |参数|类型|默认值|说明|全平台兼容| |:-|:-|:-|:-|:-| -|adapter|Function|[查看](https://github.com/early-autumn/axios-miniprogram/blob/master/src/helpers/defaults.ts#L11)|自定义适配器|是| +|adapter|Function|[查看](https://github.com/early-autumn/axios-miniprogram/blob/master/src/defaults.ts#L11)|自定义适配器|是| |baseURL|String| |基础地址|是| |url|String| |请求地址|是| |method|String|get|请求方法| | |params|Object| |请求参数|是| |data|String/Object/ArrayBuffer| |请求数据|是| -|headers|Object|[查看](https://github.com/early-autumn/axios-miniprogram/blob/master/src/helpers/defaults.ts#L13)|请求头|是| -|validateStatus|Function|[查看](https://github.com/early-autumn/axios-miniprogram/blob/master/src/helpers/defaults.ts#L30)|自定义合法状态码|是| +|headers|Object|[查看](https://github.com/early-autumn/axios-miniprogram/blob/master/src/defaults.ts#L13)|请求头|是| +|validateStatus|Function|[查看](https://github.com/early-autumn/axios-miniprogram/blob/master/src/defaults.ts#L30)|自定义合法状态码|是| |paramsSerializer|Function| |自定义参数序列化|是| |transformRequest|Function/Array<.Function>| |自定义转换请求数据|是| |transformResponse|Function/Array<.Function>| |自定义转换响应数据|是| -|cancelToken|Object| |取消令牌| | +|cancelToken|Object|是|取消令牌| | |timeout|Number|0|超时时间| | |dataType|String|json|响应数据格式|是| |responseType|String|text|响应数据类型|是| diff --git a/src/core/request.ts b/src/core/request.ts index 4b89bc5..794e079 100644 --- a/src/core/request.ts +++ b/src/core/request.ts @@ -2,7 +2,7 @@ * @Author: early-autumn * @Date: 2020-04-16 00:48:45 * @LastEditors: early-autumn - * @LastEditTime: 2020-04-20 14:24:07 + * @LastEditTime: 2020-04-21 09:49:45 */ import { AxiosRequestConfig, AxiosResponse, Response } from '../types'; import transformRequest from './transformRequest'; @@ -44,7 +44,7 @@ export default function request(config: AxiosRequestConfig): Promise { - it('default', (done) => { - axios('/test').catch((error) => { + it('default', () => { + axios('/test').then(undefined, (error) => { expect(error.isAxiosError).toBe(true); expect(error.message).toBe('平台适配失败，您需要参阅文档使用自定义适配器手动适配当前平台'); - done(); }); }); it('axios call', async () => { - axios.defaults.adapter = jest.fn((config) => { - expect(config.method).toBe('GET'); - expect(config.url).toBe('/test'); - - config.success({ status: 200, data: '{"a":0}', headers: {} }); - - return task; - }); - - await axios({ url: '/test' }); - await axios('/test'); - await axios.request({ url: '/test' }); - - axios.defaults.adapter = jest.fn((config) => { - expect(config.method).toBe(config.url.toUpperCase().replace('/', '')); - + axios.defaults.adapter = (config): any => { config.success({ status: 200, data: {}, headers: {} }); - return task; - }); + expect(config.method).toBe(config.url.toUpperCase().replace('/', '')); + return 'task'; + }; + + await axios({ url: '/get' }); + await axios('/get'); + await axios.request({ url: '/get' }); await axios.options('options'); await axios.get('get'); await axios.head('head'); @@ -55,13 +42,13 @@ describe('测试 src/axios.ts', () => { id: 1, }; - axios.defaults.adapter = (config) => { + axios.defaults.adapter = (config): any => { + config.success({ status: 200, data: {}, headers: {} }); + expect(config.method).toBe('GET'); expect(config.url).toBe('/test?id=1'); - config.success({ status: 200, data: '', headers: {} }); - - return task; + return 'task'; }; await axios({ @@ -79,14 +66,14 @@ describe('测试 src/axios.ts', () => { const data = { id: 1, }; - axios.defaults.adapter = (config) => { + axios.defaults.adapter = (config): any => { + config.success({ status: 200, data: '', headers: {} }); + expect(config.method).toBe('POST'); expect(config.url).toBe(url); expect(config.data).toEqual(data); - config.success({ status: 200, data: '', headers: {} }); - - return task; + return 'task'; }; await axios({ diff --git a/test/cancel/CancelToken.test.ts b/test/cancel/CancelToken.test.ts index cf66c1d..8b0f5e6 100644 --- a/test/cancel/CancelToken.test.ts +++ b/test/cancel/CancelToken.test.ts @@ -2,36 +2,32 @@ * @Author: early-autumn * @Date: 2020-04-20 15:17:50 * @LastEditors: early-autumn - * @LastEditTime: 2020-04-20 22:10:39 + * @LastEditTime: 2020-04-21 09:01:02 */ import CancelToken from '../../src/cancel/CancelToken'; describe('测试 src/cancel/CancelToken.ts', () => { - it('实例化', (done) => { + it('实例化', () => { const token = new CancelToken(function(cancel) { cancel('取消'); }); - setTimeout(() => { - // 应该抛出取消 - expect(() => token.throwIfRequested()).toThrow(); - - done(); - }); + // 应该抛出取消 + expect(() => token.throwIfRequested()).toThrow(); }); - it('工厂方法', async () => { + it('工厂方法', () => { const source = CancelToken.source(); // 还没有取消 返回 Undefuned expect(source.token.throwIfRequested()).toBeUndefined(); - await source.cancel('取消'); + source.cancel('取消'); // 应该抛出取消 expect(() => source.token.throwIfRequested()).toThrow(); // 重复取消无效 - await source.cancel('取消'); + source.cancel('取消'); }); }); diff --git a/test/cancel/isCancel.test.ts b/test/cancel/isCancel.test.ts index 88ae968..03c5e83 100644 --- a/test/cancel/isCancel.test.ts +++ b/test/cancel/isCancel.test.ts @@ -2,14 +2,14 @@ * @Author: early-autumn * @Date: 2020-04-20 15:12:17 * @LastEditors: early-autumn - * @LastEditTime: 2020-04-20 15:17:16 + * @LastEditTime: 2020-04-21 08:57:38 */ import isCancel from '../../src/cancel/isCancel'; import Cancel from '../../src/cancel/Cancel'; describe('测试 src/cancel/isCancel', () => { it('是一个取消?', () => { - const cancel1 = 0; + const cancel1 = {}; const cancel2 = new Cancel(); expect(isCancel(cancel1)).toBe(false); diff --git a/test/core/Axios.test.ts b/test/core/Axios.test.ts index 8543026..8a4a028 100644 --- a/test/core/Axios.test.ts +++ b/test/core/Axios.test.ts @@ -2,7 +2,7 @@ * @Author: early-autumn * @Date: 2020-04-20 20:47:09 * @LastEditors: early-autumn - * @LastEditTime: 2020-04-20 22:17:18 + * @LastEditTime: 2020-04-21 09:34:14 */ import Axios from '../../src/core/Axios'; @@ -20,13 +20,13 @@ describe('测试 src/core/Axios.ts', () => { expect(instance.getUri({ url: '/test', params: { id: 1 } })).toEqual('/test?id=1'); }); - it('interceptors 成功', async () => { - instance.defaults.adapter = function adapter({ data, success }) { + it('interceptors 成功', () => { + instance.defaults.adapter = function adapter({ data, success }): any { expect(data).toBe('interceptors_request'); success({ data: 'data', headers: {} }); - return { abort: jest.fn() }; + return 'task'; }; instance.interceptors.request.use(function(config) { @@ -39,7 +39,7 @@ describe('测试 src/core/Axios.ts', () => { return response; }); - await instance + instance .request({ method: 'post', data: '', @@ -47,27 +47,23 @@ describe('测试 src/core/Axios.ts', () => { .then(({ data }) => expect(data).toBe('interceptors_response')); }); - it('interceptors 失败', async () => { - instance.interceptors.response.use(function(response) { - throw response; - }); + it('interceptors 失败', () => { + instance.interceptors.response.use((response) => Promise.reject(response)); - await instance + instance .request({ method: 'post', data: '', }) - .catch((error) => expect(error.data).toBe('interceptors_response')); + .then(undefined, (error) => expect(error.data).toBe('interceptors_response')); - instance.interceptors.request.use(function(config) { - throw config; - }); + instance.interceptors.request.use((config) => Promise.reject(config)); - await instance + instance .request({ method: 'post', data: '', }) - .catch((error) => expect(error.method).toBe('post')); + .then(undefined, (error) => expect(error.method).toBe('post')); }); }); diff --git a/test/core/dispatchRequest.test.ts b/test/core/dispatchRequest.test.ts index 5b5a47d..2192f1e 100644 --- a/test/core/dispatchRequest.test.ts +++ b/test/core/dispatchRequest.test.ts @@ -2,53 +2,46 @@ * @Author: early-autumn * @Date: 2020-04-20 22:42:46 * @LastEditors: early-autumn - * @LastEditTime: 2020-04-20 23:22:29 + * @LastEditTime: 2020-04-21 09:57:39 */ +import { CancelAction } from '../../src/types'; import dispatchRequest from '../../src/core/dispatchRequest'; import CancelToken from '../../src/cancel/CancelToken'; import isCancel from '../../src/cancel/isCancel'; -import { CancelAction } from '../../src/types'; - -const task = { - abort: jest.fn(), -}; describe('测试 src/core/dispatchRequest.ts', () => { - it('默认', async () => { - await dispatchRequest({}).catch((err) => { + it('默认', () => { + dispatchRequest({}).then(undefined, (err) => { expect(err.message).toBe('平台适配失败，您需要参阅文档使用自定义适配器手动适配当前平台'); }); }); - it('请求失败', async () => { - await dispatchRequest({ - adapter({ success }) { + it('请求失败', () => { + dispatchRequest({ + adapter({ success }): any { success({ status: 200, data: '' }); - return task; + + return 'task'; }, validateStatus(status) { return status === -1; }, - }).catch((err) => expect(err.response.status).toBe(200)); + }).then(undefined, (err) => expect(err.response.status).toBe(200)); }); it('取消请求', () => { - try { - let cancel: CancelAction; - dispatchRequest({ - adapter({ success }) { - cancel(); - setTimeout(() => { - success({ status: 200, data: '' }); - }); - return task; - }, - cancelToken: new CancelToken(function executor(c) { - cancel = c; - }), - }); - } catch (err) { - expect(isCancel(err)).toBe(true); - } + let cancel: CancelAction; + + dispatchRequest({ + adapter({ success }) { + cancel(); + setTimeout(() => { + success({ status: 200, data: '' }); + }); + }, + cancelToken: new CancelToken(function executor(c) { + cancel = c; + }), + }).then(undefined, (err) => expect(isCancel(err)).toBe(true)); }); }); diff --git a/test/core/request.test.ts b/test/core/request.test.ts index 7b6cd3e..e132d93 100644 --- a/test/core/request.test.ts +++ b/test/core/request.test.ts @@ -2,42 +2,41 @@ * @Author: early-autumn * @Date: 2020-04-20 22:51:26 * @LastEditors: early-autumn - * @LastEditTime: 2020-04-20 23:26:18 + * @LastEditTime: 2020-04-21 09:37:30 */ import request from '../../src/core/request'; import CancelToken from '../../src/cancel/CancelToken'; import isCancel from '../../src/cancel/isCancel'; -const task = { - abort: jest.fn(), -}; - describe('测试 src/core/request.ts', () => { - it('默认', async () => { - await request({}).catch((err) => { - expect(err.message).toBe('平台适配失败，您需要参阅文档使用自定义适配器手动适配当前平台'); - }); + it('默认', () => { + request({}).then(undefined, (err) => + expect(err.message).toBe('平台适配失败，您需要参阅文档使用自定义适配器手动适配当前平台') + ); }); - it('请求失败', async () => { - await request({ - adapter({ fail }) { + it('请求失败', () => { + request({ + adapter({ fail }): any { fail({}); - return task; + + return 'task'; }, - }).catch((err) => { - expect(err.message).toBe('配置不正确或者网络异常'); - }); + }).then(undefined, (err) => expect(err.message).toBe('配置不正确或者网络异常')); }); - it('取消请求', async () => { - await request({ - adapter() { - return task; + it('取消请求', () => { + request({ + adapter({ fail }) { + setTimeout(fail); + + return { + abort: jest.fn(), + }; }, cancelToken: new CancelToken(function executor(c) { c(); }), - }).catch((err) => expect(isCancel(err)).toBe(true)); + }).then(undefined, (err) => expect(isCancel(err)).toBe(true)); }); }); diff --git a/test/helper/buildURL.test.ts b/test/helpers/buildURL.test.ts similarity index 100% rename from test/helper/buildURL.test.ts rename to test/helpers/buildURL.test.ts diff --git a/test/helper/combineURL.test.ts b/test/helpers/combineURL.test.ts similarity index 100% rename from test/helper/combineURL.test.ts rename to test/helpers/combineURL.test.ts diff --git a/test/helper/isAbsoluteURL.test.ts b/test/helpers/isAbsoluteURL.test.ts similarity index 100% rename from test/helper/isAbsoluteURL.test.ts rename to test/helpers/isAbsoluteURL.test.ts diff --git a/test/helper/utils.test.ts b/test/helpers/utils.test.ts similarity index 100% rename from test/helper/utils.test.ts rename to test/helpers/utils.test.ts