Merge pull request #8 from acdlite/ide-redux-1

Update for Redux 1.0

Author: acdlite

src/__tests__/promiseMiddleware-test.js

@@ -2,6 +2,13 @@ import promiseMiddleware from '../';
 import { spy } from 'sinon';
 
 function noop() {}
+const GIVE_ME_META = 'GIVE_ME_META';
+function metaMiddleware() {
+  return next => action =>
+    action.type === GIVE_ME_META
+      ? next({ ...action, meta: 'here you go' })
+      : next(action);
+}
 
 describe('promiseMiddleware', () => {
   let baseDispatch;
@@ -11,7 +18,10 @@ describe('promiseMiddleware', () => {
 
   beforeEach(() => {
     baseDispatch = spy();
-    dispatch = promiseMiddleware(baseDispatch);
+    dispatch = function d(action) {
+      const methods = { dispatch: d, getState: noop };
+      return metaMiddleware()(promiseMiddleware(methods)(baseDispatch))(action);
+    };
     foobar = { foo: 'bar' };
     err = new Error();
   });
@@ -61,4 +71,13 @@ describe('promiseMiddleware', () => {
       payload: foobar
     });
   });
+
+  it('starts async dispatches from beginning of middleware chain', async () => {
+    await dispatch(Promise.resolve({ type: GIVE_ME_META }));
+    dispatch({ type: GIVE_ME_META });
+    expect(baseDispatch.args.map(args => args[0].meta)).to.eql([
+      'here you go',
+      'here you go'
+    ]);
+  });
 });

src/index.js

@@ -4,18 +4,18 @@ function isPromise(val) {
   return val && typeof val.then === 'function';
 }
 
-export default function promiseMiddleware(next) {
-  return action => {
+export default function promiseMiddleware({ dispatch }) {
+  return next => action => {
     if (!isFSA(action)) {
       return isPromise(action)
-        ? action.then(next)
+        ? action.then(dispatch)
         : next(action);
     }
 
     return isPromise(action.payload)
       ? action.payload.then(
-          result => next({ ...action, payload: result }),
-          error => next({ ...action, payload: error, error: true })
+          result => dispatch({ ...action, payload: result }),
+          error => dispatch({ ...action, payload: error, error: true })
         )
       : next(action);
   };