Merge pull request #3 from markusguenther/fix_testing_issues

markusguenther · web-flow · commit 8adc420894b9 · 2018-08-02T10:39:55.000+02:00
TASK: Use suppressReactErrorLogging to suppress errors in mocha tests
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/src/components/themr.js b/src/components/themr.js
@@ -92,8 +92,11 @@ export default (componentName, localTheme, options = {}) => (ThemedComponent) =>
     getNamespacedTheme(props) {
       const { themeNamespace, theme } = props
       if (!themeNamespace) return theme
-      if (themeNamespace && !theme) throw new Error('Invalid themeNamespace use in for-react-css-themr. ' +
+
+      if (themeNamespace && !theme) {
+        throw new Error('Invalid themeNamespace use in for-react-css-themr. ' +
         'themeNamespace prop should be used only with theme prop.')
+      }
 
       return Object.keys(theme)
         .filter(key => key.startsWith(themeNamespace))
@@ -223,6 +226,7 @@ function merge(original = {}, mixin = {}) {
           case 'object': {
             //can't merge a non-object with an object
             throw new Error(`You are merging non-object ${mixinValue} with an object ${key}`)
+            break
           }
 
           case 'undefined': {
diff --git a/test/components/ThemeProvider.spec.js b/test/components/ThemeProvider.spec.js
@@ -4,6 +4,16 @@ import PropTypes from 'prop-types'
 import TestUtils from 'react-dom/test-utils'
 import { ThemeProvider } from '../../src/index'
 
+
+before(function () {
+  /* eslint-disable no-console */
+  console.error = function () {}
+})
+
+after(function () {
+  delete console.error
+})
+
 describe('ThemeProvider', () => {
   class Child extends Component {
     render() {
diff --git a/test/setup.js b/test/setup.js
@@ -1,3 +1,4 @@
+import raf from './tempPolyfills'
 import { jsdom } from 'jsdom'
 
 global.document = jsdom('<!doctype html><html><body></body></html>')
diff --git a/test/tempPolyfills.js b/test/tempPolyfills.js
@@ -0,0 +1,5 @@
+const raf = global.requestAnimationFrame = (cb) => {
+  setTimeout(cb, 0)
+}
+
+export default raf

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import raf from './tempPolyfills'`
`1`	`2`	`import { jsdom } from 'jsdom'`
`2`	`3`
`3`	`4`	`global.document = jsdom('<!doctype html><html><body></body></html>')`