Merge branch 'master' into hygiene/check-reducers

Author: yangmillstheory

.editorconfig

@@ -0,0 +1,10 @@
+root = true
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+[*.md]
+trim_trailing_whitespace = false

.gitignore

@@ -3,3 +3,4 @@ coverage
 *.log
 lib
 dist
+.idea

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
 node_js:
   - "6"
-  - "5"
   - "4"
 script:
   - npm run lint

README.md

@@ -1,7 +1,8 @@
 # redux-actions
 
 [![build status](https://img.shields.io/travis/acdlite/redux-actions/master.svg?style=flat-square)](https://travis-ci.org/acdlite/redux-actions)
-[![npm version](https://img.shields.io/npm/v/redux-actions.svg?style=flat-square)](https://www.npmjs.com/package/redux-actions)
+
+[![NPM](https://nodei.co/npm/redux-actions.png?downloads=true)](https://nodei.co/npm/redux-actions/)
 
 [Flux Standard Action](https://github.com/acdlite/flux-standard-action) utilities for Redux.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-actions",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Flux Standard Action utlities for Redux",
   "main": "lib/index.js",
   "scripts": {

src/__tests__/createAction-test.js

@@ -130,5 +130,16 @@ describe('createAction()', () => {
         meta: { foo: 'bar' }
       });
     });
+
+    it('set error to true if payloadCreator return an Error object', () => {
+      const errObj = new TypeError('this is an error');
+      const actionCreator = createAction(type, () => errObj);
+      const errAction = actionCreator('invalid arguments');
+      expect(errAction).to.deep.equal({
+        type,
+        payload: errObj,
+        error: true
+      });
+    });
   });
 });

src/createAction.js

@@ -5,7 +5,7 @@ export default function createAction(type, payloadCreator, metaCreator) {
     ? payloadCreator
     : identity;
 
-  const actionHandler = (...args) => {
+  const actionCreator = (...args) => {
     const hasError = args[0] instanceof Error;
 
     const action = {
@@ -17,7 +17,7 @@ export default function createAction(type, payloadCreator, metaCreator) {
       action.payload = payload;
     }
 
-    if (hasError) {
+    if (hasError || payload instanceof Error) {
       // Handle FSA errors where the payload is an Error object. Set error.
       action.error = true;
     }
@@ -29,7 +29,7 @@ export default function createAction(type, payloadCreator, metaCreator) {
     return action;
   };
 
-  actionHandler.toString = () => type.toString();
+  actionCreator.toString = () => type.toString();
 
-  return actionHandler;
+  return actionCreator;
 }