Merge branch 'feature/forward-axios-config-in-error-object'

Author: caaatisgood

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-api-middleman",
-  "version": "3.2.2",
+  "version": "3.2.2-canary.0",
   "description": "A Redux middleware making sending request a breeze",
   "main": "lib/index.js",
   "jest": {
@@ -18,7 +18,7 @@
     }
   ],
   "scripts": {
-    "test": "jest",
+    "test": "jest --watch --verbose false",
     "test:ci": "yarn lint && jest",
     "lint": "standard --fix --verbose | snazzy",
     "size": "size-limit",

spec/createRequestPromise.test.js

@@ -1,5 +1,5 @@
 import Promise from 'es6-promise'
-import { CALL_API, CHAIN_API } from '../src'
+import { CALL_API } from '../src'
 import createRequestPromise from '../src/createRequestPromise'
 import axios from 'axios'
 import MockDate from 'mockdate'
@@ -8,16 +8,17 @@ import * as utils from '../src/utils'
 jest.mock('axios')
 jest.mock('../src/log')
 
-const getMockAxiosPromise = ({ error } = {}) => {
+const getMockAxiosPromise = ({ error, config } = {}) => {
   return new Promise((resolve, reject) => {
     if (error) {
-      process.nextTick(() => reject(new Error({
-        response: {
-          data: {
-            key_1: 'val_1'
-          }
+      const _error = new Error('Mock error')
+      _error.config = config
+      _error.response = {
+        data: {
+          key_1: 'val_1'
         }
-      })))
+      }
+      process.nextTick(() => reject(_error))
     } else {
       process.nextTick(() => resolve({
         data: {
@@ -160,14 +161,17 @@ describe('createRequestPromise', () => {
   })
 
   describe('when axios catches error', () => {
+    let config
     beforeEach(() => {
-      axios.mockReturnValue(getMockAxiosPromise({ error: true }))
+      config = { key: 'value' }
+      axios.mockReturnValue(getMockAxiosPromise({ error: true, config }))
     })
-    it('should call errorInterceptor', () => {
+
+    it('should call errorInterceptor', async () => {
       const errorInterceptor = jest.fn(({ proceedError }) => {
         proceedError()
       })
-      createRequestPromise({
+      await createRequestPromise({
         timeout,
         generateDefaultParams,
         createCallApiAction,
@@ -179,22 +183,24 @@ describe('createRequestPromise', () => {
       })(mockPrevBody)
         .catch(() => {
           expect(errorInterceptor).toHaveBeenCalledTimes(1)
-          expect(errorInterceptor.mock.calls[0][0]).toMatchObject({
+          expect(errorInterceptor.mock.calls[0][0]).toEqual({
             err: {
+              config,
               data: {
                 key1: 'val_1'
               }
             },
-            dispatch,
-            getState
+            getState,
+            proceedError: expect.any(Function),
+            replay: expect.any(Function)
           })
         })
     })
   })
 
   describe('revalidate behavior', () => {
     const currentime = 1579508700000
-    let path, testSetCount = 0
+    let path; let testSetCount = 0
 
     beforeEach(() => {
       testSetCount++
@@ -210,8 +216,8 @@ describe('createRequestPromise', () => {
       jest.clearAllMocks()
     })
 
-    function createRequest({ revalidate, revalidateDisabled } = {}){
-      extractParams = jest.fn().mockReturnValue({ ...mockParams, revalidate})
+    function createRequest ({ revalidate, revalidateDisabled } = {}) {
+      extractParams = jest.fn().mockReturnValue({ ...mockParams, revalidate })
       createRequestPromise({
         revalidateDisabled,
         timeout,

spec/index.test.js

@@ -7,10 +7,10 @@ import createApiMiddleware, {
   CHAIN_API
 } from '../src'
 
-const createRequestPromise = require('../src/createRequestPromise')
-
 import * as utils from '../src/utils'
 
+const createRequestPromise = require('../src/createRequestPromise')
+
 jest.mock('../src/log', () => ({
   error: jest.fn()
 }))
@@ -558,7 +558,7 @@ describe('Middleware::Api', () => {
     it('dispatches CHAIN_API with revalidateDisabled = true if action type is CALL_API', async () => {
       const action = { [CHAIN_API]: [
         () => ({ [CALL_API]: {} })
-      ]}
+      ] }
       await apiMiddleware({ dispatch, getState })(next)(action)
       expect(createRequestPromise.default.mock.calls[0][0].revalidateDisabled).toBe(true)
     })

src/createRequestPromise.js

@@ -117,6 +117,7 @@ export default function ({
 
       function prepareErrorPayload ({ error, camelize }) {
         const res = error.response || {}
+        res.config = error.config
         if (camelize) {
           res.data = camelizeKeys(res.data)
         }
@@ -164,19 +165,19 @@ export default function ({
   }
 }
 
-function _getRevalidationKey(actionObj) {
+function _getRevalidationKey (actionObj) {
   const {
     method,
     path,
     url,
     params,
-    data,
+    data
   } = actionObj
   return JSON.stringify({
     method,
     path,
     url,
     params,
-    data,
+    data
   })
 }

src/utils.js

@@ -70,4 +70,3 @@ export function paramsExtractor ({ baseUrl }) {
 const _window = typeof window === 'undefined' ? null : window
 
 export { _window as window }
-