Merge #1916

1916: Fix msw r=ZauberNerd a=ZauberNerd <details> <summary>Bors merge bot cheat sheet</summary> We are using [bors-ng](https://github.com/bors-ng/bors-ng) to automate merging of our pull requests. The following table provides a summary of commands that are available to reviewers (members of this repository with push access) and delegates (in case of `bors delegate+` or `bors delegate=[list]`). | Syntax | Description | | --- | --- | | bors merge | Run the test suite and push to master if it passes. Short for "reviewed: looks good." | | bors merge- | Cancel an r+, r=, merge, or merge= | | bors try | Run the test suite without pushing to master. | | bors try- | Cancel a try | | bors delegate+ | Allow the pull request author to merge their changes. | | bors delegate=[list] | Allow the listed users to r+ this pull request's changes. | | bors retry | Run the previous command a second time. | This is a short collection of opinionated commands. For a full list of the commands read the [bors reference](https://bors.tech/documentation/). </details> Co-authored-by: ZauberNerd <[email protected]>
xing · Jul 13, 2021 · 7bb0628 · 7bb0628
2 parents 2ef4244 + 7b6b9c4
commit 7bb0628
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/packages/msw/handlers.js b/packages/msw/handlers.js
@@ -0,0 +1 @@
+module.exports.handlers = [];
diff --git a/packages/msw/mixin.browser.js b/packages/msw/mixin.browser.js
@@ -41,13 +41,9 @@ class MswMixin extends Mixin {
     const { setupWorker, graphql, rest } = await import('msw');
     const worker = setupWorker();
 
-    try {
-      // eslint-disable-next-line node/no-unsupported-features/es-syntax, import/no-unresolved, node/no-missing-import
-      const { handlers } = await import('hops-msw/handlers');
-      handlers.forEach((handler) => worker.use(handler));
-    } catch {
-      // ignore if no handlers file has been provided
-    }
+    // eslint-disable-next-line node/no-unsupported-features/es-syntax, node/no-extraneous-import
+    const { handlers } = await import('hops-msw/handlers');
+    handlers.forEach((handler) => worker.use(handler));
 
     const registerBrowserMock = (mock) => {
       worker.use(createBrowserMock({ graphql, rest }, mock));

diff --git a/packages/spec/integration/redux/__tests__/develop.js b/packages/spec/integration/redux/__tests__/develop.js
@@ -5,7 +5,12 @@ describe('redux development server', () => {
   let url;
 
   beforeAll(async () => {
-    const { getUrl } = HopsCLI.start('--fast-dev');
+    const { getUrl } = HopsCLI.start(
+      {
+        PORT: '8950',
+      },
+      '--fast-dev'
+    );
     url = await getUrl();
   });
 

diff --git a/packages/spec/integration/redux/__tests__/mocked.js b/packages/spec/integration/redux/__tests__/mocked.js
@@ -13,6 +13,7 @@ describe('development server with msw mocks', () => {
     const { getUrl } = HopsCLI.start(
       {
         ENABLE_MSW: 'true',
+        PORT: '8949',
       },
       '--fast-dev'
     );

diff --git a/packages/spec/integration/redux/index.js b/packages/spec/integration/redux/index.js
@@ -26,13 +26,15 @@ const reducers = {
 
 const increment = () => ({ type: 'INCREMENT', payload: 1 });
 
-const incrementFetch = () => (dispatch) => {
-  return fetch('http://localhost:8901/api')
-    .then((r) => r.json())
-    .then(({ value }) => {
-      dispatch({ type: 'INCREMENT', payload: value });
-    });
-};
+const incrementFetch =
+  () =>
+  (dispatch, _, { config }) => {
+    return fetch(`http://localhost:${config.port}/api`)
+      .then((r) => r.json())
+      .then(({ value }) => {
+        dispatch({ type: 'INCREMENT', payload: value });
+      });
+  };
 
 const setParam = ({ param }) => ({ type: 'SET_VALUE', payload: param });
 

diff --git a/packages/spec/integration/redux/package.json b/packages/spec/integration/redux/package.json
@@ -18,10 +18,13 @@
   },
   "hops": {
     "gracePeriod": 0,
-    "port": "8901",
+    "port": "[PORT]",
     "mixins": [
       "./"
-    ]
+    ],
+    "browserWhitelist": {
+      "port": true
+    }
   },
   "dependencies": {
     "cross-fetch": "*",