From f515676a72d700acd9c3302aaf27fb91d69dc343 Mon Sep 17 00:00:00 2001 From: Pavel Mineev Date: Thu, 4 Feb 2021 21:55:47 +0300 Subject: [PATCH] Revert "add fetcher params to test" This reverts commit a89a06a583fdd02b2fd461652909ff45f36adc6c. --- frontend/app/common/fetcher.test.ts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/frontend/app/common/fetcher.test.ts b/frontend/app/common/fetcher.test.ts index 5d0ccfb5..0306f773 100644 --- a/frontend/app/common/fetcher.test.ts +++ b/frontend/app/common/fetcher.test.ts @@ -34,7 +34,6 @@ describe('fetcher', () => { const headers = { [XSRF_HEADER]: '' }; const apiUri = `/anything`; const apiUrl = `${BASE_URL}${API_BASE}/anything?site=remark`; - const opts = { credentials: 'same-origin', mode: 'same-origin', headers }; describe('methods', () => { it('should send GET request', async () => { @@ -43,7 +42,7 @@ describe('fetcher', () => { mockFetch(); await apiFetcher.get(apiUri); - expect(window.fetch).toHaveBeenCalledWith(apiUrl, { ...opts, method: 'get' }); + expect(window.fetch).toHaveBeenCalledWith(apiUrl, { method: 'get', headers }); }); it('should send POST request', async () => { expect.assertions(1); @@ -51,7 +50,7 @@ describe('fetcher', () => { mockFetch(); await apiFetcher.post(apiUri); - expect(window.fetch).toHaveBeenCalledWith(apiUrl, { ...opts, method: 'post' }); + expect(window.fetch).toHaveBeenCalledWith(apiUrl, { method: 'post', headers }); }); it('should send PUT request', async () => { expect.assertions(1); @@ -59,7 +58,7 @@ describe('fetcher', () => { mockFetch(); await apiFetcher.put(apiUri); - expect(window.fetch).toHaveBeenCalledWith(apiUrl, { ...opts, method: 'put' }); + expect(window.fetch).toHaveBeenCalledWith(apiUrl, { method: 'put', headers }); }); it('should send DELETE request', async () => { expect.assertions(1); @@ -67,7 +66,7 @@ describe('fetcher', () => { mockFetch(); await apiFetcher.delete(apiUri); - expect(window.fetch).toHaveBeenCalledWith(apiUrl, { ...opts, method: 'delete' }); + expect(window.fetch).toHaveBeenCalledWith(apiUrl, { method: 'delete', headers }); }); }); @@ -78,7 +77,7 @@ describe('fetcher', () => { mockFetch(); await authFetcher.post(apiUri); - expect(window.fetch).toHaveBeenCalledWith(`${BASE_URL}/auth/anything?site=remark`, { ...opts, method: 'post' }); + expect(window.fetch).toHaveBeenCalledWith(`${BASE_URL}/auth/anything?site=remark`, { method: 'post', headers }); }); }); @@ -90,8 +89,8 @@ describe('fetcher', () => { await adminFetcher.post(apiUri); expect(window.fetch).toHaveBeenCalledWith(`${BASE_URL}${API_BASE}/admin/anything?site=remark`, { - ...opts, method: 'post', + headers, }); }); }); @@ -119,7 +118,6 @@ describe('fetcher', () => { }); expect(window.fetch).toHaveBeenCalledWith(apiUrl, { - ...opts, method: 'get', headers: headersWithJwt, }); @@ -128,7 +126,7 @@ describe('fetcher', () => { mockFetch({ headers }); await apiFetcher.get(apiUri); - expect(window.fetch).toHaveBeenCalledWith(apiUrl, { ...opts, method: 'get' }); + expect(window.fetch).toHaveBeenCalledWith(apiUrl, { method: 'get', headers }); }); }); @@ -143,7 +141,6 @@ describe('fetcher', () => { await apiFetcher.post(apiUri, {}, data); expect(window.fetch).toBeCalledWith(apiUrl, { - ...opts, method: 'post', headers: headersWithContentType, body: JSON.stringify(data), @@ -159,7 +156,6 @@ describe('fetcher', () => { await apiFetcher.post(apiUri, {}, body); expect(window.fetch).toHaveBeenCalledWith(apiUrl, { - ...opts, method: 'post', body, headers: headersWithMultipartData,