fix: use StaticAxios for cancellation as AxiosInstance doesn't expose it

fix #80
simoneb · Nov 13, 2019 · 4a63b6e · 4a63b6e
1 parent cd60ec6
commit 4a63b6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import DefaultAxios from 'axios'
+import StaticAxios from 'axios'
 import LRU from 'lru-cache'
 
 const actions = {
@@ -14,7 +14,7 @@ let axiosInstance
 
 export function resetConfigure() {
   cache = new LRU()
-  axiosInstance = DefaultAxios
+  axiosInstance = StaticAxios
 }
 
 resetConfigure()
@@ -97,7 +97,7 @@ async function request(config, dispatch) {
     dispatch({ type: actions.REQUEST_END, payload: response })
     return response
   } catch (err) {
-    if (axiosInstance.isCancel(err)) {
+    if (StaticAxios.isCancel(err)) {
       return
     }
 
@@ -145,7 +145,7 @@ export default function useAxios(config, options) {
   }
 
   React.useEffect(() => {
-    cancelSourceRef.current = axiosInstance.CancelToken.source()
+    cancelSourceRef.current = StaticAxios.CancelToken.source()
 
     if (!options.manual) {
       executeRequest(

diff --git a/test/index.test.js b/test/index.test.js
@@ -459,8 +459,6 @@ describe('configure', () => {
   it('should provide a custom implementation of axios', () => {
     const mockAxios = jest.fn().mockReturnValueOnce({ data: 'whatever' })
 
-    mockCancelToken(mockAxios)
-
     configure({ axios: mockAxios })
 
     const { waitForNextUpdate } = renderHook(() => useAxios(''))