feat: Remove node specific dependencies and code to better support te…

…sting in browser environments * feat: removed filter-console dependency and fallback if process.env is not available (#624) * fix: protect import helpers for setting env variables and comment why try/catch is being used BREAKING CHANGE: `suppressErrorOutput` will now work when explicitly called, even if the `RHTL_DISABLE_ERROR_FILTERING` env variable has been set Fixes #617
testing-library · May 24, 2021 · e4b0aa3 · e4b0aa3
1 parent e11b63a
commit e4b0aa3
Show file tree

Hide file tree

Showing 25 changed files with 559 additions and 188 deletions.
diff --git a/disable-error-filtering.js b/disable-error-filtering.js
@@ -1 +1,8 @@
-process.env.RHTL_DISABLE_ERROR_FILTERING = true
+try {
+  process.env.RHTL_DISABLE_ERROR_FILTERING = true
+} catch {
+  // falling back in the case that process.env.RHTL_DISABLE_ERROR_FILTERING cannot be accessed (e.g. browser environment)
+  console.warn(
+    'Could not disable error filtering as process.env.RHTL_DISABLE_ERROR_FILTERING could not be accessed.'
+  )
+}
diff --git a/dont-cleanup-after-each.js b/dont-cleanup-after-each.js
@@ -1 +1,8 @@
-process.env.RHTL_SKIP_AUTO_CLEANUP = true
+try {
+  process.env.RHTL_SKIP_AUTO_CLEANUP = true
+} catch {
+  // falling back in the case that process.env.RHTL_SKIP_AUTO_CLEANUP cannot be accessed (e.g. browser environment)
+  console.warn(
+    'Could not skip auto cleanup as process.env.RHTL_SKIP_AUTO_CLEANUP could not be accessed.'
+  )
+}
diff --git a/package.json b/package.json
@@ -50,7 +50,6 @@
     "@types/react": ">=16.9.0",
     "@types/react-dom": ">=16.9.0",
     "@types/react-test-renderer": ">=16.9.0",
-    "filter-console": "^0.1.1",
     "react-error-boundary": "^3.1.0"
   },
   "devDependencies": {

diff --git a/src/core/cleanup.ts b/src/core/cleanup.ts
@@ -18,9 +18,18 @@ function removeCleanup(callback: CleanupCallback) {
   cleanupCallbacks = cleanupCallbacks.filter((cb) => cb !== callback)
 }
 
+function skipAutoCleanup() {
+  try {
+    return !!process.env.RHTL_SKIP_AUTO_CLEANUP
+  } catch {
+    // falling back in the case that process.env.RHTL_SKIP_AUTO_CLEANUP cannot be accessed (e.g. browser environment)
+    return false
+  }
+}
+
 function autoRegisterCleanup() {
   // Automatically registers cleanup in supported testing frameworks
-  if (typeof afterEach === 'function' && !process.env.RHTL_SKIP_AUTO_CLEANUP) {
+  if (typeof afterEach === 'function' && !skipAutoCleanup()) {
     afterEach(async () => {
       await cleanup()
     })

diff --git a/src/core/console.ts b/src/core/console.ts
@@ -1,24 +1,41 @@
-import filterConsole from 'filter-console'
+const consoleFilters = [
+  /^The above error occurred in the <.*?> component:/, // error boundary output
+  /^Error: Uncaught .+/ // jsdom output
+]
 
 function suppressErrorOutput() {
-  if (process.env.RHTL_DISABLE_ERROR_FILTERING) {
-    return () => {}
-  }
+  const originalError = console.error
 
-  return filterConsole(
-    [
-      /^The above error occurred in the <TestComponent> component:/, // error boundary output
-      /^Error: Uncaught .+/ // jsdom output
-    ],
-    {
-      methods: ['error']
+  const error = (...args: Parameters<typeof originalError>) => {
+    const message = typeof args[0] === 'string' ? args[0] : null
+    if (!message || !consoleFilters.some((filter) => filter.test(message))) {
+      originalError(...args)
     }
-  )
+  }
+
+  console.error = error
+
+  return () => {
+    console.error = originalError
+  }
+}
+
+function errorFilteringDisabled() {
+  try {
+    return !!process.env.RHTL_DISABLE_ERROR_FILTERING
+  } catch {
+    // falling back in the case that process.env.RHTL_DISABLE_ERROR_FILTERING cannot be accessed (e.g. browser environment)
+    return false
+  }
 }
 
 function enableErrorOutputSuppression() {
   // Automatically registers console error suppression and restoration in supported testing frameworks
-  if (typeof beforeEach === 'function' && typeof afterEach === 'function') {
+  if (
+    typeof beforeEach === 'function' &&
+    typeof afterEach === 'function' &&
+    !errorFilteringDisabled()
+  ) {
     let restoreConsole!: () => void
 
     beforeEach(() => {

diff --git a/src/dom/__tests__/autoCleanup.noProcessEnv.test.ts b/src/dom/__tests__/autoCleanup.noProcessEnv.test.ts
@@ -0,0 +1,40 @@
+import { useEffect } from 'react'
+
+import { ReactHooksRenderer } from '../../types/react'
+
+// This verifies that if process.env is unavailable
+// then we still auto-wire up the afterEach for folks
+describe('skip auto cleanup (no process.env) tests', () => {
+  const originalEnv = process.env
+  let cleanupCalled = false
+  let renderHook: ReactHooksRenderer['renderHook']
+
+  beforeAll(() => {
+    process.env = {
+      ...process.env,
+      get RHTL_SKIP_AUTO_CLEANUP(): string | undefined {
+        throw new Error('expected')
+      }
+    }
+    renderHook = (require('..') as ReactHooksRenderer).renderHook
+  })
+
+  afterAll(() => {
+    process.env = originalEnv
+  })
+
+  test('first', () => {
+    const hookWithCleanup = () => {
+      useEffect(() => {
+        return () => {
+          cleanupCalled = true
+        }
+      })
+    }
+    renderHook(() => hookWithCleanup())
+  })
+
+  test('second', () => {
+    expect(cleanupCalled).toBe(true)
+  })
+})
diff --git a/src/dom/__tests__/errorHook.test.ts b/src/dom/__tests__/errorHook.test.ts
@@ -142,51 +142,4 @@ describe('error hook tests', () => {
       expect(result.error).toBe(undefined)
     })
   })
-
-  describe('error output suppression', () => {
-    test('should allow console.error to be mocked', async () => {
-      const consoleError = console.error
-      console.error = jest.fn()
-
-      try {
-        const { rerender, unmount } = renderHook(
-          (stage) => {
-            useEffect(() => {
-              console.error(`expected in effect`)
-              return () => {
-                console.error(`expected in unmount`)
-              }
-            }, [])
-            console.error(`expected in ${stage}`)
-          },
-          {
-            initialProps: 'render'
-          }
-        )
-
-        act(() => {
-          console.error('expected in act')
-        })
-
-        await act(async () => {
-          await new Promise((resolve) => setTimeout(resolve, 100))
-          console.error('expected in async act')
-        })
-
-        rerender('rerender')
-
-        unmount()
-
-        expect(console.error).toBeCalledWith('expected in render')
-        expect(console.error).toBeCalledWith('expected in effect')
-        expect(console.error).toBeCalledWith('expected in act')
-        expect(console.error).toBeCalledWith('expected in async act')
-        expect(console.error).toBeCalledWith('expected in rerender')
-        expect(console.error).toBeCalledWith('expected in unmount')
-        expect(console.error).toBeCalledTimes(6)
-      } finally {
-        console.error = consoleError
-      }
-    })
-  })
 })
diff --git a/src/dom/__tests__/errorSuppression.noProcessEnv.test.ts b/src/dom/__tests__/errorSuppression.noProcessEnv.test.ts
@@ -0,0 +1,26 @@
+// This verifies that if process.env is unavailable
+// then we still auto-wire up the afterEach for folks
+describe('error output suppression (no process.env) tests', () => {
+  const originalEnv = process.env
+  const originalConsoleError = console.error
+
+  beforeAll(() => {
+    process.env = {
+      ...process.env,
+      get RHTL_DISABLE_ERROR_FILTERING(): string | undefined {
+        throw new Error('expected')
+      }
+    }
+    require('..')
+  })
+
+  afterAll(() => {
+    process.env = originalEnv
+  })
+
+  test('should not patch console.error', () => {
+    expect(console.error).not.toBe(originalConsoleError)
+  })
+})
+
+export {}
diff --git a/src/dom/__tests__/errorSuppression.test.ts b/src/dom/__tests__/errorSuppression.test.ts
@@ -0,0 +1,75 @@
+import { useEffect } from 'react'
+
+import { ReactHooksRenderer } from '../../types/react'
+
+describe('error output suppression tests', () => {
+  test('should not suppress relevant errors', () => {
+    const consoleError = console.error
+    console.error = jest.fn()
+
+    const { suppressErrorOutput } = require('..') as ReactHooksRenderer
+
+    try {
+      const restoreConsole = suppressErrorOutput()
+
+      console.error('expected')
+      console.error(new Error('expected'))
+      console.error('expected with args', new Error('expected'))
+
+      restoreConsole()
+
+      expect(console.error).toBeCalledWith('expected')
+      expect(console.error).toBeCalledWith(new Error('expected'))
+      expect(console.error).toBeCalledWith('expected with args', new Error('expected'))
+      expect(console.error).toBeCalledTimes(3)
+    } finally {
+      console.error = consoleError
+    }
+  })
+
+  test('should allow console.error to be mocked', async () => {
+    const { renderHook, act } = require('..') as ReactHooksRenderer
+    const consoleError = console.error
+    console.error = jest.fn()
+
+    try {
+      const { rerender, unmount } = renderHook(
+        (stage) => {
+          useEffect(() => {
+            console.error(`expected in effect`)
+            return () => {
+              console.error(`expected in unmount`)
+            }
+          }, [])
+          console.error(`expected in ${stage}`)
+        },
+        {
+          initialProps: 'render'
+        }
+      )
+
+      act(() => {
+        console.error('expected in act')
+      })
+
+      await act(async () => {
+        await new Promise((resolve) => setTimeout(resolve, 100))
+        console.error('expected in async act')
+      })
+
+      rerender('rerender')
+
+      unmount()
+
+      expect(console.error).toBeCalledWith('expected in render')
+      expect(console.error).toBeCalledWith('expected in effect')
+      expect(console.error).toBeCalledWith('expected in act')
+      expect(console.error).toBeCalledWith('expected in async act')
+      expect(console.error).toBeCalledWith('expected in rerender')
+      expect(console.error).toBeCalledWith('expected in unmount')
+      expect(console.error).toBeCalledTimes(6)
+    } finally {
+      console.error = consoleError
+    }
+  })
+})
diff --git a/src/dom/pure.ts b/src/dom/pure.ts
@@ -1,4 +1,4 @@
-import ReactDOM from 'react-dom'
+import * as ReactDOM from 'react-dom'
 import { act } from 'react-dom/test-utils'
 
 import { RendererProps, RendererOptions } from '../types/react'

diff --git a/src/native/__tests__/autoCleanup.noProcessEnv.test.ts b/src/native/__tests__/autoCleanup.noProcessEnv.test.ts
@@ -0,0 +1,40 @@
+import { useEffect } from 'react'
+
+import { ReactHooksRenderer } from '../../types/react'
+
+// This verifies that if process.env is unavailable
+// then we still auto-wire up the afterEach for folks
+describe('skip auto cleanup (no process.env) tests', () => {
+  const originalEnv = process.env
+  let cleanupCalled = false
+  let renderHook: ReactHooksRenderer['renderHook']
+
+  beforeAll(() => {
+    process.env = {
+      ...process.env,
+      get RHTL_SKIP_AUTO_CLEANUP(): string | undefined {
+        throw new Error('expected')
+      }
+    }
+    renderHook = (require('..') as ReactHooksRenderer).renderHook
+  })
+
+  afterAll(() => {
+    process.env = originalEnv
+  })
+
+  test('first', () => {
+    const hookWithCleanup = () => {
+      useEffect(() => {
+        return () => {
+          cleanupCalled = true
+        }
+      })
+    }
+    renderHook(() => hookWithCleanup())
+  })
+
+  test('second', () => {
+    expect(cleanupCalled).toBe(true)
+  })
+})
diff --git a/src/native/__tests__/errorHook.test.ts b/src/native/__tests__/errorHook.test.ts
@@ -142,51 +142,4 @@ describe('error hook tests', () => {
       expect(result.error).toBe(undefined)
     })
   })
-
-  describe('error output suppression', () => {
-    test('should allow console.error to be mocked', async () => {
-      const consoleError = console.error
-      console.error = jest.fn()
-
-      try {
-        const { rerender, unmount } = renderHook(
-          (stage) => {
-            useEffect(() => {
-              console.error(`expected in effect`)
-              return () => {
-                console.error(`expected in unmount`)
-              }
-            }, [])
-            console.error(`expected in ${stage}`)
-          },
-          {
-            initialProps: 'render'
-          }
-        )
-
-        act(() => {
-          console.error('expected in act')
-        })
-
-        await act(async () => {
-          await new Promise((resolve) => setTimeout(resolve, 100))
-          console.error('expected in async act')
-        })
-
-        rerender('rerender')
-
-        unmount()
-
-        expect(console.error).toBeCalledWith('expected in render')
-        expect(console.error).toBeCalledWith('expected in effect')
-        expect(console.error).toBeCalledWith('expected in act')
-        expect(console.error).toBeCalledWith('expected in async act')
-        expect(console.error).toBeCalledWith('expected in rerender')
-        expect(console.error).toBeCalledWith('expected in unmount')
-        expect(console.error).toBeCalledTimes(6)
-      } finally {
-        console.error = consoleError
-      }
-    })
-  })
 })