diff --git a/package.json b/package.json index f594088..6f91fc8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tua-api", - "version": "1.2.0", + "version": "1.2.1", "description": "🏗 A common tool helps converting configs to api functions", "main": "dist/TuaApi.cjs.js", "module": "dist/TuaApi.esm.js", diff --git a/src/index.js b/src/index.js index 3d56377..0163893 100644 --- a/src/index.js +++ b/src/index.js @@ -139,7 +139,6 @@ class TuaApi { data: method === 'GET' ? {} : data, method, ...axiosOptions, - ...rest, } return getAxiosPromise(params) @@ -147,7 +146,7 @@ class TuaApi { // 对于 post 请求使用 axios return method === 'POST' - ? getAxiosPromise({ url, data, ...axiosOptions, ...rest }) + ? getAxiosPromise({ url, data, ...axiosOptions }) : getFetchJsonpPromise({ url: fullUrl, jsonpOptions: { ...jsonpOptions, callbackName }, diff --git a/test/__tests__/axios.test.js b/test/__tests__/axios.test.js index d906c41..3b1b641 100644 --- a/test/__tests__/axios.test.js +++ b/test/__tests__/axios.test.js @@ -13,6 +13,7 @@ const params = { const reqAPUrl = `http://example-base.com/fake-post/array-params` const reqOPUrl = `http://example-base.com/fake-post/object-params` +const reqGOPUrl = `http://example-base.com/fake-get/object-params` const reqOHUrl = `http://example-test.com/fake-post/own-host` const reqTAUrl = `http://example-base.com/fake-get/req-type-axios?asyncCp=asyncCp` const reqEAPUrl = `http://example-base.com/fake-post/empty-array-params` @@ -56,6 +57,10 @@ describe('error handling', () => { }) describe('fake get requests', () => { + beforeEach(() => { + mock.resetHistory() + }) + test('req-type-axios', async () => { const data = { code: 0, data: 'req-type-axios' } mock.onGet(reqTAUrl).reply(200, data) @@ -75,6 +80,15 @@ describe('fake get requests', () => { expect(resData).toEqual(data) }) + + test('required param', async () => { + const data = [ 0, 'array data' ] + mock.onGet(reqGOPUrl + `?param1=1217¶m2=steve¶m3=young`).reply(200, data) + const resData = await fakeGetApi.op({ param3: 'young' }, { reqType: 'axios' }) + + expect(mock.history.get[0].params).toBe(undefined) + expect(resData).toEqual({ code: 0, data: 'array data' }) + }) }) describe('fake post requests', () => {