Revert mocha setup. Only run browser entry point if in browser.

react-dates · Apr 9, 2018 · 0a07a3e · 0a07a3e
1 parent 89986db
commit 0a07a3e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -8,7 +8,7 @@ module.exports = (config) => {
 
     frameworks: ['mocha', 'sinon', 'chai'],
 
-    files: ['test/tests.webpack.js'],
+    files: ['test/browser-main.js'],
 
     webpack: {
       externals: {

diff --git a/package.json b/package.json
@@ -12,13 +12,14 @@
     "build:css": "node scripts/buildCSS.js",
     "clean": "rimraf lib esm",
     "precover": "rimraf coverage && npm run react",
-    "cover": "cross-env NODE_ENV=test node --max-old-space-size=2048 $(which nyc) mocha",
+    "cover": "cross-env NODE_ENV=test node --max-old-space-size=2048 $(which nyc) npm run mocha test",
     "lint": "eslint --ext .js,.jsx src test",
+    "mocha": "mocha ./test/_helpers",
     "storybook:uninstall": "npm uninstall --no-save @storybook/react && rimraf node_modules/@storybook node_modules/react-modal node_modules/react-dom-factories",
     "react": "enzyme-adapter-react-install 16",
     "pretest": "npm run --silent lint",
     "pretests-only": "npm run react",
-    "tests-only": "mocha",
+    "tests-only": "npm run mocha --silent test",
     "pretests-karma": "npm run react",
     "tests-karma": "karma start",
     "test": "npm run tests-only",

diff --git a/test/_helpers/ignoreSVGStrings.jsx b/test/_helpers/ignoreSVGStrings.jsx
diff --git a/test/browser-main.js b/test/browser-main.js
@@ -0,0 +1,6 @@
+const requireAll = requireContext => requireContext.keys().forEach(requireContext);
+
+if (typeof window !== 'undefined') {
+  requireAll(require.context('./_helpers', true, /.jsx?$/));
+  requireAll(require.context('.', true, /.jsx?$/));
+}
diff --git a/test/mocha.opts b/test/mocha.opts
@@ -2,4 +2,3 @@
 --compilers js:babel-register,jsx:babel-register
 --require airbnb-js-shims
 --recursive
-test/_helpers test/**/*_spec*
diff --git a/test/tests.webpack.js b/test/tests.webpack.js
diff --git a/test/utils/getActiveElement_spec.jsx → test/utils/getActiveElement_spec.js b/test/utils/getActiveElement_spec.jsx → test/utils/getActiveElement_spec.js
diff --git a/test/utils/getPhrase_spec.jsx → test/utils/getPhrase_spec.js b/test/utils/getPhrase_spec.jsx → test/utils/getPhrase_spec.js