Ignore all actions begining with @@.

gajus · Aug 16, 2015 · 85852fe · 85852fe
1 parent 7480ef2
commit 85852fe
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/dist/combineReducers.js b/dist/combineReducers.js
diff --git a/dist/combineReducers.js.map b/dist/combineReducers.js.map
diff --git a/src/combineReducers.js b/src/combineReducers.js
@@ -76,8 +76,8 @@ export default (reducer) => {
     return (state, action) => {
         let tapper;
 
-        if (action.type === '@@redux/INIT') {
-            console.info('Ignoring @@redux/INIT. redux-immutable does not support state inflation. Refer to https://github.com/gajus/canonical-reducer-composition/issues/1.');
+        if (action.type && action.type.indexOf('@@') === 0) {
+            console.info('Ignoring private action "' + action.type + '". redux-immutable does not support state inflation. Refer to https://github.com/gajus/canonical-reducer-composition/issues/1.');
 
             return state;
         }

diff --git a/tests/combineReducers.js b/tests/combineReducers.js
@@ -41,7 +41,7 @@ describe('combineReducers', () => {
             expect(spy.calledWith('Unhandled action "UNKNOWN".')).to.equal(true);
         });
     });
-    describe('when an instance of reducer is called with {type: @@redux/INIT} action.', () => {
+    describe('when an instance of reducer is called with an action defining type property with a value beginning with "@@".', () => {
         let spy;
         beforeEach(() => {
             spy = sinon.stub(console, 'info');
@@ -70,7 +70,7 @@ describe('combineReducers', () => {
 
             reducer(state, action);
 
-            expect(spy.calledWithExactly('Ignoring @@redux/INIT. redux-immutable does not support state inflation. Refer to https://github.com/gajus/canonical-reducer-composition/issues/1.')).to.equal(true);
+            expect(spy.calledWithExactly('Ignoring private action "@@redux/INIT". redux-immutable does not support state inflation. Refer to https://github.com/gajus/canonical-reducer-composition/issues/1.')).to.equal(true);
         });
     });
     describe('when action handler produces a value thats not an instance of Immutable.Iterable', () => {