concrete in tests proper error behavior

gaearon · Feb 20, 2019 · 262a9ba · 262a9ba
1 parent 9f6ab6e
commit 262a9ba
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/src/AppContainer.dev.js b/src/AppContainer.dev.js
@@ -48,7 +48,6 @@ class AppContainer extends React.Component {
       // trigger update to kick error
       this.setState({})
       throw error
-      return
     }
     const { errorReporter = configuration.errorReporter } = this.props
     if (!errorReporter) {

diff --git a/test/AppContainer.dev.test.js b/test/AppContainer.dev.test.js
@@ -10,6 +10,7 @@ import { AppContainer } from '../src/index.dev'
 import RHL from '../src/reactHotLoader'
 import {
   closeGeneration,
+  configureGeneration,
   increment as incrementGeneration,
 } from '../src/global/generation'
 import { configureComponent } from '../src/utils.dev'
@@ -18,6 +19,7 @@ import configuration from '../src/configuration'
 describe(`AppContainer (dev)`, () => {
   beforeEach(() => {
     RHL.reset()
+    configureGeneration(1, 1)
   })
 
   describe('with class root', () => {

diff --git a/test/proxy/consistency.test.js b/test/proxy/consistency.test.js
@@ -5,6 +5,7 @@ import { createMounter, ensureNoWarnings } from './helper'
 import createProxy from '../../src/proxy'
 import configuration from '../../src/configuration'
 import '../../src/index.dev'
+import { configureGeneration } from '../../src/global/generation'
 
 const createFixtures = () => ({
   modern: {
@@ -68,6 +69,9 @@ const createFixtures = () => ({
 })
 
 describe('consistency', () => {
+  beforeEach(() => {
+    configureGeneration(1, 1)
+  })
   ensureNoWarnings()
   const { mount } = createMounter()
 

diff --git a/test/proxy/lifecycle-method.test.js b/test/proxy/lifecycle-method.test.js
@@ -3,8 +3,13 @@ import React, { Component } from 'react'
 import { createMounter } from './helper'
 import createProxy from '../../src/proxy'
 import '../../src/index.dev'
+import { configureGeneration } from '../../src/global/generation'
 
 describe('lifecycle method', () => {
+  beforeEach(() => {
+    configureGeneration(1, 1)
+  })
+
   const { mount } = createMounter()
 
   class Controller extends Component {

diff --git a/test/reconciler.test.js b/test/reconciler.test.js
@@ -62,6 +62,10 @@ const spyComponent = (render, displayName, key) => {
 
 describe('reconciler', () => {
   describe('Application', () => {
+    beforeEach(() => {
+      configureGeneration(1, 1)
+    })
+
     it('should regenerate internal component', () => {
       const root = spyComponent(
         ({ children }) => <div>{children}</div>,