Colocate comparison function to where its called. Add back flow type …

…for createReducer
rgommezz · Sep 18, 2019 · c9e3ca9 · c9e3ca9
1 parent 7869dbf
commit c9e3ca9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/src/redux/createReducer.js b/src/redux/createReducer.js
@@ -84,7 +84,7 @@ function handleDismissActionsFromQueue(
 export default (comparisonFn: Function = getSimilarActionInQueue) => (
   state: NetworkState = initialState,
   action: *,
-) => {
+): NetworkState => {
   switch (action.type) {
     case actionTypes.CONNECTION_CHANGE:
       return {

diff --git a/test/reducer.test.js b/test/reducer.test.js
@@ -14,21 +14,6 @@ const getState = (isConnected = false, ...actionQueue) => ({
   actionQueue,
 });
 
-function comparisonFn(action, actionQueue) {
-  if (typeof action === 'object') {
-    return actionQueue.find(queued => isEqual(queued, action));
-  }
-  if (typeof action === 'function') {
-    return actionQueue.find(
-      queued =>
-        action.meta.name === queued.meta.name &&
-        action.meta.args.id === queued.meta.args.id,
-    );
-  }
-
-  return undefined;
-}
-
 /** Actions used from now on to test different scenarios */
 const prevActionToRetry1 = {
   type: 'FETCH_DATA_REQUEST',
@@ -133,6 +118,20 @@ describe('OFFLINE_ACTION action type', () => {
     });
 
     describe('thunks that are the same with custom comparison function', () => {
+      function comparisonFn(action, actionQueue) {
+        if (typeof action === 'object') {
+          return actionQueue.find(queued => isEqual(queued, action));
+        }
+        if (typeof action === 'function') {
+          return actionQueue.find(
+            queued =>
+              action.meta.name === queued.meta.name &&
+              action.meta.args.id === queued.meta.args.id,
+          );
+        }
+        return undefined;
+      }
+
       const thunkFactory = (id, name, age) => {
         function thunk(dispatch) {
           dispatch({ type: 'UPDATE_DATA_REQUEST', payload: { id, name, age } });