Update deps and node test to accommodate React Redux >=6

Author: Choong Kim

package.json

@@ -41,24 +41,24 @@
     "eslint": "^5.16.0",
     "eslint-config-fusion": "^5.0.0",
     "eslint-plugin-cup": "^2.0.1",
-    "eslint-plugin-flowtype": "^3.6.1",
+    "eslint-plugin-flowtype": "^3.7.0",
     "eslint-plugin-import": "^2.17.2",
-    "eslint-plugin-jest": "^22.4.1",
+    "eslint-plugin-jest": "^22.5.1",
     "eslint-plugin-prettier": "^3.0.1",
-    "eslint-plugin-react": "^7.12.4",
+    "eslint-plugin-react": "^7.13.0",
     "eslint-plugin-react-hooks": "^1.6.0",
-    "flow-bin": "^0.97.0",
+    "flow-bin": "^0.98.0",
     "fusion-core": "^1.10.6",
     "fusion-plugin-universal-events": "^1.3.4",
     "fusion-react": "^2.0.0",
     "fusion-test-utils": "^1.4.1",
     "fusion-tokens": "^1.1.1",
-    "nyc": "^14.0.0",
+    "nyc": "^14.1.0",
     "prettier": "^1.17.0",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "react-redux": "^7.0.2",
+    "react-redux": "^7.0.3",
     "react-test-renderer": "^16.8.6",
     "redux": "^4.0.1",
     "redux-reactors": "^1.0.3",

src/__tests__/index.node.js

@@ -84,6 +84,13 @@ test('withRPCRedux hoc', t => {
   const renderer = new ShallowRenderer();
   const expectedActions = ['TEST_START', 'TEST_SUCCESS'];
   const expectedPayloads = ['test-args', 'test-resolve'];
+  const store = {
+    dispatch(action) {
+      t.equal(action.type, expectedActions.shift());
+      t.equal(action.payload, expectedPayloads.shift());
+    },
+    getState() {},
+  };
   renderer.render(React.createElement(Connected), {
     rpc: {
       request(method, args) {
@@ -92,21 +99,22 @@ test('withRPCRedux hoc', t => {
         return Promise.resolve('test-resolve');
       },
     },
-    store: {
-      dispatch(action) {
-        t.equal(action.type, expectedActions.shift());
-        t.equal(action.payload, expectedPayloads.shift());
-      },
-      getState() {},
-    },
+    store,
   });
   const rendered = renderer.getRenderOutput();
-  t.equal(
-    typeof rendered.props.test,
-    'function',
-    'passes the handler through to props'
-  );
-  rendered.props.test('test-args');
+
+  if (rendered.props.test) {
+    t.equal(
+      typeof rendered.props.test,
+      'function',
+      'passes the handler through to props'
+    );
+    rendered.props.test('test-args');
+  } else {
+    const {test: handler} = rendered.props.children({store}).props;
+    t.equal(typeof test, 'function', 'passes the handler through to props');
+    handler('test-args');
+  }
   t.end();
 });
 
@@ -124,6 +132,13 @@ test('withRPCReactor hoc', t => {
   const renderer = new ShallowRenderer();
   const expectedActions = ['TEST_START', 'TEST_SUCCESS'];
   const expectedPayloads = ['test-args', 'test-resolve'];
+  const store = {
+    dispatch(action) {
+      t.equal(action.type, expectedActions.shift());
+      t.equal(action.payload, expectedPayloads.shift());
+    },
+    getState() {},
+  };
   renderer.render(React.createElement(Connected), {
     rpc: {
       request(method, args) {
@@ -132,21 +147,21 @@ test('withRPCReactor hoc', t => {
         return Promise.resolve('test-resolve');
       },
     },
-    store: {
-      dispatch(action) {
-        t.equal(action.type, expectedActions.shift());
-        t.equal(action.payload, expectedPayloads.shift());
-      },
-      getState() {},
-    },
+    store,
   });
   const rendered = renderer.getRenderOutput();
-  t.equal(
-    typeof rendered.props.test,
-    'function',
-    'passes the handler through to props'
-  );
-  rendered.props.test('test-args');
+  if (rendered.props.test) {
+    t.equal(
+      typeof rendered.props.test,
+      'function',
+      'passes the handler through to props'
+    );
+    rendered.props.test('test-args');
+  } else {
+    const {test: handler} = rendered.props.children({store}).props;
+    t.equal(typeof test, 'function', 'passes the handler through to props');
+    handler('test-args');
+  }
   t.end();
 });
 

yarn.lock

@@ -718,9 +718,9 @@
     "@babel/plugin-transform-react-jsx-source" "^7.0.0"
 
 "@babel/runtime@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
-  integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.4.tgz#dc2e34982eb236803aa27a07fea6857af1b9171d"
+  integrity sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==
   dependencies:
     regenerator-runtime "^0.13.2"
 
@@ -4878,10 +4878,10 @@ react-is@^16.8.1, react-is@^16.8.6:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
   integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
 
-react-redux@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.0.2.tgz#34b280a3482aaf60e7d4a504b1295165cbe6b86a"
-  integrity sha512-uKRuMgQt8dWbcz0U75oFK5tDo3boyAKrqvf/j94vpqRFFZfyDDy4kofUgloFIGyuKTq2Zz51zgK9RzOTFXk5ew==
+react-redux@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.0.3.tgz#983c5a6de81cb1e696bd1c090ba826545f9170f1"
+  integrity sha512-vYZA7ftOYlDk3NetitsI7fLjryt/widNl1SLXYvFenIpm7vjb4ryK0EeFrgn62usg5fYkyIAWNUPKnwWPevKLg==
   dependencies:
     "@babel/runtime" "^7.4.3"
     hoist-non-react-statics "^3.3.0"