Merge remote-tracking branch 'upstream/master' into fix-test-linting

Author: skevy

test/bindActionCreators.spec.js

@@ -1,55 +1,37 @@
 import expect from 'expect';
 import { bindActionCreators, createRedux } from '../../src';
+import * as helpers from '../_helpers';
 
-const fakeState = { foo: 'bar' };
-
-function fakeStore(state = 0, action) {
-  if (action.type) {
-    return fakeState;
-  }
-  return state;
-}
-
-const fakeActionCreators = {
-  foo() {
-    return { type: 'FOO' };
-  },
-  fooAsync() {
-    return dispatch => {
-      setImmediate(() => {
-        dispatch({ type: 'FOO_ASYNC' });
-      });
-    };
-  }
-};
+const { todoActions, todoStore } = helpers;
 
 describe('Utils', () => {
   describe('bindActionCreators', () => {
 
     let redux;
 
     beforeEach(() => {
-      redux = createRedux({ fakeStore });
+      redux = createRedux({ todoStore });
     });
 
     it('should bind given actions to the dispatcher', done => {
       let expectedCallCount = 2;
-      // Let us subscribe to monitor the dispatched actions
+      // just for monitoring the dispatched actions
       redux.subscribe(() => {
         expectedCallCount--;
-        const state = redux.getState();
-
-        expect(state.fakeStore).toEqual(fakeState);
         if (expectedCallCount === 0) {
+          const state = redux.getState();
+          expect(state.todoStore).toEqual([
+            { id: 2, text: 'World' },
+            { id: 1, text: 'Hello' }
+          ]);
           done();
         }
       });
-      const actions = bindActionCreators(fakeActionCreators, redux.dispatch);
-      expect(Object.keys(actions))
-        .toEqual(Object.keys(fakeActionCreators));
+      const actions = bindActionCreators(todoActions, redux.dispatch);
+      expect(Object.keys(actions)).toEqual(Object.keys(todoActions));
 
-      actions.foo();
-      actions.fooAsync();
+      actions.addTodo('Hello');
+      actions.addTodoAsync('World');
     });
   });
 });