* Don't try to merge objects if there is no objects in response.

Kozea · Jan 4, 2018 · 520ed41 · 520ed41
1 parent 2141b8d
commit 520ed41
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.6.2](https://github.com/Kozea/redux-api-unrest/compare/v0.6.1...v0.6.2)
+
+* Don't try to merge objects if there is no objects in response.
+
 ## [0.6.1](https://github.com/Kozea/redux-api-unrest/compare/v0.6.0...v0.6.1)
 
 * Dependencies update

diff --git a/src/index.js b/src/index.js
@@ -153,13 +153,15 @@ export default class ApiUnrest {
           case this.events[endpoint].success:
             return {
               ...state,
-              objects: this.mergeObjects(
-                action.method,
-                state.objects,
-                action.objects,
-                action.metadata.primary_keys,
-                action.batch
-              ),
+              objects: action.objects
+                ? this.mergeObjects(
+                    action.method,
+                    state.objects,
+                    action.objects,
+                    action.metadata.primary_keys,
+                    action.batch
+                  )
+                : state.objects,
               metadata: action.metadata,
               loading: false,
               error: null,
@@ -353,7 +355,7 @@ export default class ApiUnrest {
       }
       throw httpError(response.status, json.message || json.description, json)
     }
-    return response.json()
+    return { ...(await response.json()), code: response.status }
   }
 
   onBeforeFetchHook({ url, opts }) {

diff --git a/test/reducers.test.js b/test/reducers.test.js
@@ -518,4 +518,37 @@ describe('Api unrest reducers', () => {
     expect(store.getState().fruit.metadata.occurences).toEqual(1)
     expect(store.getState().fruit.metadata.primary_keys).toEqual(['id'])
   })
+
+  it('does nothing on missing objects', () => {
+    // When there's is a 202 success without objects for example
+    const api = new ApiUnrest({
+      fruit: 'fruit',
+      color: 'base/color/:id?',
+      tree: 'forest/tree/:type?/:age?',
+    })
+    const reducer = combineReducers(api.reducers)
+    const store = createStore(reducer, applyMiddleware(thunk))
+
+    store.dispatch({
+      type: api.events.color.success,
+      metadata: { something: true },
+      method: 'POST',
+      parameters: {},
+      batch: true,
+    })
+    expect(Object.keys(store.getState().color)).toEqual([
+      'objects',
+      'metadata',
+      'loading',
+      'error',
+      'lastFetch',
+      'lastFetchParameters',
+    ])
+    expect(store.getState().color.objects).toEqual([])
+    expect(store.getState().color.error).toBeNull()
+    expect(store.getState().color.lastFetch).toBeNull()
+    expect(store.getState().color.lastFetchParameters).toBeNull()
+    expect(store.getState().color.loading).toEqual(false)
+    expect(store.getState().color.metadata.something).toBeTruthy()
+  })
 })
diff --git a/test/state.test.js b/test/state.test.js
@@ -46,6 +46,7 @@ describe('Api unrest update the state when fetching', () => {
     expect(store.getState().color.loading).toBeFalsy()
     expect(store.getState().color.objects).toEqual(['response'])
     expect(store.getState().color.error).toBeNull()
+    expect(store.getState().color.metadata.code).toEqual(200)
   })
   it('sets and remove loading flag during error', async () => {
     const api = new ApiUnrest(