{"parents":["d48dbb824985166ecb7b2959db03090a8593dce0"],"commit":{"authorEmail":"sema@fb.com","authoredAt":"2020-04-09T11:13:01-07:00","shortRevision":"11ac10b44e","revision":"11ac10b44e9371b258bbf13faffd0dde5a7c0d0e","authorName":"Sebastian Markbåge","subject":"Port error boundaries test to yieldValue (#18558)"},"body":"","files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactErrorBoundaries-test.internal.js"}],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactErrorBoundaries-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactErrorBoundaries-test.internal.js\nindex 64191115b0..777db55267 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactErrorBoundaries-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactErrorBoundaries-test.internal.js\n@@ -14,10 +14,9 @@ let React;\n let ReactDOM;\n let act;\n let ReactFeatureFlags;\n+let Scheduler;\n \n describe('ReactErrorBoundaries', () => {\n- let log;\n-\n let BrokenConstructor;\n let BrokenComponentWillMount;\n let BrokenComponentDidMount;\n@@ -46,158 +45,207 @@ describe('ReactErrorBoundaries', () => {\n ReactDOM = require('react-dom');\n React = require('react');\n act = require('react-dom\/test-utils').act;\n-\n- log = [];\n+ Scheduler = require('scheduler');\n \n BrokenConstructor = class extends React.Component {\n constructor(props) {\n super(props);\n- log.push('BrokenConstructor constructor [!]');\n+ Scheduler.unstable_yieldValue('BrokenConstructor constructor [!]');\n throw new Error('Hello');\n }\n render() {\n- log.push('BrokenConstructor render');\n+ Scheduler.unstable_yieldValue('BrokenConstructor render');\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push('BrokenConstructor componentWillMount');\n+ Scheduler.unstable_yieldValue('BrokenConstructor componentWillMount');\n }\n componentDidMount() {\n- log.push('BrokenConstructor componentDidMount');\n+ Scheduler.unstable_yieldValue('BrokenConstructor componentDidMount');\n }\n UNSAFE_componentWillReceiveProps() {\n- log.push('BrokenConstructor componentWillReceiveProps');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenConstructor componentWillReceiveProps',\n+ );\n }\n UNSAFE_componentWillUpdate() {\n- log.push('BrokenConstructor componentWillUpdate');\n+ Scheduler.unstable_yieldValue('BrokenConstructor componentWillUpdate');\n }\n componentDidUpdate() {\n- log.push('BrokenConstructor componentDidUpdate');\n+ Scheduler.unstable_yieldValue('BrokenConstructor componentDidUpdate');\n }\n componentWillUnmount() {\n- log.push('BrokenConstructor componentWillUnmount');\n+ Scheduler.unstable_yieldValue('BrokenConstructor componentWillUnmount');\n }\n };\n \n BrokenComponentWillMount = class extends React.Component {\n constructor(props) {\n super(props);\n- log.push('BrokenComponentWillMount constructor');\n+ Scheduler.unstable_yieldValue('BrokenComponentWillMount constructor');\n }\n render() {\n- log.push('BrokenComponentWillMount render');\n+ Scheduler.unstable_yieldValue('BrokenComponentWillMount render');\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push('BrokenComponentWillMount componentWillMount [!]');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMount componentWillMount [!]',\n+ );\n throw new Error('Hello');\n }\n componentDidMount() {\n- log.push('BrokenComponentWillMount componentDidMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMount componentDidMount',\n+ );\n }\n UNSAFE_componentWillReceiveProps() {\n- log.push('BrokenComponentWillMount componentWillReceiveProps');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMount componentWillReceiveProps',\n+ );\n }\n UNSAFE_componentWillUpdate() {\n- log.push('BrokenComponentWillMount componentWillUpdate');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMount componentWillUpdate',\n+ );\n }\n componentDidUpdate() {\n- log.push('BrokenComponentWillMount componentDidUpdate');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMount componentDidUpdate',\n+ );\n }\n componentWillUnmount() {\n- log.push('BrokenComponentWillMount componentWillUnmount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMount componentWillUnmount',\n+ );\n }\n };\n \n BrokenComponentDidMount = class extends React.Component {\n constructor(props) {\n super(props);\n- log.push('BrokenComponentDidMount constructor');\n+ Scheduler.unstable_yieldValue('BrokenComponentDidMount constructor');\n }\n render() {\n- log.push('BrokenComponentDidMount render');\n+ Scheduler.unstable_yieldValue('BrokenComponentDidMount render');\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push('BrokenComponentDidMount componentWillMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMount componentWillMount',\n+ );\n }\n componentDidMount() {\n- log.push('BrokenComponentDidMount componentDidMount [!]');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMount componentDidMount [!]',\n+ );\n throw new Error('Hello');\n }\n UNSAFE_componentWillReceiveProps() {\n- log.push('BrokenComponentDidMount componentWillReceiveProps');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMount componentWillReceiveProps',\n+ );\n }\n UNSAFE_componentWillUpdate() {\n- log.push('BrokenComponentDidMount componentWillUpdate');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMount componentWillUpdate',\n+ );\n }\n componentDidUpdate() {\n- log.push('BrokenComponentDidMount componentDidUpdate');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMount componentDidUpdate',\n+ );\n }\n componentWillUnmount() {\n- log.push('BrokenComponentDidMount componentWillUnmount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMount componentWillUnmount',\n+ );\n }\n };\n \n BrokenComponentWillReceiveProps = class extends React.Component {\n constructor(props) {\n super(props);\n- log.push('BrokenComponentWillReceiveProps constructor');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillReceiveProps constructor',\n+ );\n }\n render() {\n- log.push('BrokenComponentWillReceiveProps render');\n+ Scheduler.unstable_yieldValue('BrokenComponentWillReceiveProps render');\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push('BrokenComponentWillReceiveProps componentWillMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillReceiveProps componentWillMount',\n+ );\n }\n componentDidMount() {\n- log.push('BrokenComponentWillReceiveProps componentDidMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillReceiveProps componentDidMount',\n+ );\n }\n UNSAFE_componentWillReceiveProps() {\n- log.push(\n+ Scheduler.unstable_yieldValue(\n 'BrokenComponentWillReceiveProps componentWillReceiveProps [!]',\n );\n throw new Error('Hello');\n }\n UNSAFE_componentWillUpdate() {\n- log.push('BrokenComponentWillReceiveProps componentWillUpdate');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillReceiveProps componentWillUpdate',\n+ );\n }\n componentDidUpdate() {\n- log.push('BrokenComponentWillReceiveProps componentDidUpdate');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillReceiveProps componentDidUpdate',\n+ );\n }\n componentWillUnmount() {\n- log.push('BrokenComponentWillReceiveProps componentWillUnmount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillReceiveProps componentWillUnmount',\n+ );\n }\n };\n \n BrokenComponentWillUpdate = class extends React.Component {\n constructor(props) {\n super(props);\n- log.push('BrokenComponentWillUpdate constructor');\n+ Scheduler.unstable_yieldValue('BrokenComponentWillUpdate constructor');\n }\n render() {\n- log.push('BrokenComponentWillUpdate render');\n+ Scheduler.unstable_yieldValue('BrokenComponentWillUpdate render');\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push('BrokenComponentWillUpdate componentWillMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUpdate componentWillMount',\n+ );\n }\n componentDidMount() {\n- log.push('BrokenComponentWillUpdate componentDidMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUpdate componentDidMount',\n+ );\n }\n UNSAFE_componentWillReceiveProps() {\n- log.push('BrokenComponentWillUpdate componentWillReceiveProps');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUpdate componentWillReceiveProps',\n+ );\n }\n UNSAFE_componentWillUpdate() {\n- log.push('BrokenComponentWillUpdate componentWillUpdate [!]');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUpdate componentWillUpdate [!]',\n+ );\n throw new Error('Hello');\n }\n componentDidUpdate() {\n- log.push('BrokenComponentWillUpdate componentDidUpdate');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUpdate componentDidUpdate',\n+ );\n }\n componentWillUnmount() {\n- log.push('BrokenComponentWillUpdate componentWillUnmount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUpdate componentWillUnmount',\n+ );\n }\n };\n \n@@ -207,30 +255,42 @@ describe('ReactErrorBoundaries', () => {\n };\n constructor(props) {\n super(props);\n- log.push('BrokenComponentDidUpdate constructor');\n+ Scheduler.unstable_yieldValue('BrokenComponentDidUpdate constructor');\n }\n render() {\n- log.push('BrokenComponentDidUpdate render');\n+ Scheduler.unstable_yieldValue('BrokenComponentDidUpdate render');\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push('BrokenComponentDidUpdate componentWillMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidUpdate componentWillMount',\n+ );\n }\n componentDidMount() {\n- log.push('BrokenComponentDidUpdate componentDidMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidUpdate componentDidMount',\n+ );\n }\n UNSAFE_componentWillReceiveProps() {\n- log.push('BrokenComponentDidUpdate componentWillReceiveProps');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidUpdate componentWillReceiveProps',\n+ );\n }\n UNSAFE_componentWillUpdate() {\n- log.push('BrokenComponentDidUpdate componentWillUpdate');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidUpdate componentWillUpdate',\n+ );\n }\n componentDidUpdate() {\n- log.push('BrokenComponentDidUpdate componentDidUpdate [!]');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidUpdate componentDidUpdate [!]',\n+ );\n throw new Error(this.props.errorText);\n }\n componentWillUnmount() {\n- log.push('BrokenComponentDidUpdate componentWillUnmount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidUpdate componentWillUnmount',\n+ );\n }\n };\n \n@@ -240,29 +300,41 @@ describe('ReactErrorBoundaries', () => {\n };\n constructor(props) {\n super(props);\n- log.push('BrokenComponentWillUnmount constructor');\n+ Scheduler.unstable_yieldValue('BrokenComponentWillUnmount constructor');\n }\n render() {\n- log.push('BrokenComponentWillUnmount render');\n+ Scheduler.unstable_yieldValue('BrokenComponentWillUnmount render');\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push('BrokenComponentWillUnmount componentWillMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUnmount componentWillMount',\n+ );\n }\n componentDidMount() {\n- log.push('BrokenComponentWillUnmount componentDidMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUnmount componentDidMount',\n+ );\n }\n UNSAFE_componentWillReceiveProps() {\n- log.push('BrokenComponentWillUnmount componentWillReceiveProps');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUnmount componentWillReceiveProps',\n+ );\n }\n UNSAFE_componentWillUpdate() {\n- log.push('BrokenComponentWillUnmount componentWillUpdate');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUnmount componentWillUpdate',\n+ );\n }\n componentDidUpdate() {\n- log.push('BrokenComponentWillUnmount componentDidUpdate');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUnmount componentDidUpdate',\n+ );\n }\n componentWillUnmount() {\n- log.push('BrokenComponentWillUnmount componentWillUnmount [!]');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillUnmount componentWillUnmount [!]',\n+ );\n throw new Error(this.props.errorText);\n }\n };\n@@ -271,30 +343,40 @@ describe('ReactErrorBoundaries', () => {\n constructor(props) {\n super(props);\n this.state = {error: null};\n- log.push('BrokenComponentWillMountErrorBoundary constructor');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMountErrorBoundary constructor',\n+ );\n }\n render() {\n if (this.state.error) {\n- log.push('BrokenComponentWillMountErrorBoundary render error');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMountErrorBoundary render error',\n+ );\n return

Caught an error: {this.state.error.message}.<\/div>;\n }\n- log.push('BrokenComponentWillMountErrorBoundary render success');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMountErrorBoundary render success',\n+ );\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push(\n+ Scheduler.unstable_yieldValue(\n 'BrokenComponentWillMountErrorBoundary componentWillMount [!]',\n );\n throw new Error('Hello');\n }\n componentDidMount() {\n- log.push('BrokenComponentWillMountErrorBoundary componentDidMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMountErrorBoundary componentDidMount',\n+ );\n }\n componentWillUnmount() {\n- log.push('BrokenComponentWillMountErrorBoundary componentWillUnmount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentWillMountErrorBoundary componentWillUnmount',\n+ );\n }\n static getDerivedStateFromError(error) {\n- log.push(\n+ Scheduler.unstable_yieldValue(\n 'BrokenComponentWillMountErrorBoundary static getDerivedStateFromError',\n );\n return {error};\n@@ -305,28 +387,40 @@ describe('ReactErrorBoundaries', () => {\n constructor(props) {\n super(props);\n this.state = {error: null};\n- log.push('BrokenComponentDidMountErrorBoundary constructor');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMountErrorBoundary constructor',\n+ );\n }\n render() {\n if (this.state.error) {\n- log.push('BrokenComponentDidMountErrorBoundary render error');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMountErrorBoundary render error',\n+ );\n return

Caught an error: {this.state.error.message}.<\/div>;\n }\n- log.push('BrokenComponentDidMountErrorBoundary render success');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMountErrorBoundary render success',\n+ );\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push('BrokenComponentDidMountErrorBoundary componentWillMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMountErrorBoundary componentWillMount',\n+ );\n }\n componentDidMount() {\n- log.push('BrokenComponentDidMountErrorBoundary componentDidMount [!]');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMountErrorBoundary componentDidMount [!]',\n+ );\n throw new Error('Hello');\n }\n componentWillUnmount() {\n- log.push('BrokenComponentDidMountErrorBoundary componentWillUnmount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenComponentDidMountErrorBoundary componentWillUnmount',\n+ );\n }\n static getDerivedStateFromError(error) {\n- log.push(\n+ Scheduler.unstable_yieldValue(\n 'BrokenComponentDidMountErrorBoundary static getDerivedStateFromError',\n );\n return {error};\n@@ -337,27 +431,39 @@ describe('ReactErrorBoundaries', () => {\n constructor(props) {\n super(props);\n this.state = {error: null};\n- log.push('BrokenRenderErrorBoundary constructor');\n+ Scheduler.unstable_yieldValue('BrokenRenderErrorBoundary constructor');\n }\n render() {\n if (this.state.error) {\n- log.push('BrokenRenderErrorBoundary render error [!]');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenRenderErrorBoundary render error [!]',\n+ );\n throw new Error('Hello');\n }\n- log.push('BrokenRenderErrorBoundary render success');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenRenderErrorBoundary render success',\n+ );\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push('BrokenRenderErrorBoundary componentWillMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenRenderErrorBoundary componentWillMount',\n+ );\n }\n componentDidMount() {\n- log.push('BrokenRenderErrorBoundary componentDidMount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenRenderErrorBoundary componentDidMount',\n+ );\n }\n componentWillUnmount() {\n- log.push('BrokenRenderErrorBoundary componentWillUnmount');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenRenderErrorBoundary componentWillUnmount',\n+ );\n }\n static getDerivedStateFromError(error) {\n- log.push('BrokenRenderErrorBoundary static getDerivedStateFromError');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenRenderErrorBoundary static getDerivedStateFromError',\n+ );\n return {error};\n }\n };\n@@ -365,37 +471,37 @@ describe('ReactErrorBoundaries', () => {\n BrokenRender = class extends React.Component {\n constructor(props) {\n super(props);\n- log.push('BrokenRender constructor');\n+ Scheduler.unstable_yieldValue('BrokenRender constructor');\n }\n render() {\n- log.push('BrokenRender render [!]');\n+ Scheduler.unstable_yieldValue('BrokenRender render [!]');\n throw new Error('Hello');\n }\n UNSAFE_componentWillMount() {\n- log.push('BrokenRender componentWillMount');\n+ Scheduler.unstable_yieldValue('BrokenRender componentWillMount');\n }\n componentDidMount() {\n- log.push('BrokenRender componentDidMount');\n+ Scheduler.unstable_yieldValue('BrokenRender componentDidMount');\n }\n UNSAFE_componentWillReceiveProps() {\n- log.push('BrokenRender componentWillReceiveProps');\n+ Scheduler.unstable_yieldValue('BrokenRender componentWillReceiveProps');\n }\n UNSAFE_componentWillUpdate() {\n- log.push('BrokenRender componentWillUpdate');\n+ Scheduler.unstable_yieldValue('BrokenRender componentWillUpdate');\n }\n componentDidUpdate() {\n- log.push('BrokenRender componentDidUpdate');\n+ Scheduler.unstable_yieldValue('BrokenRender componentDidUpdate');\n }\n componentWillUnmount() {\n- log.push('BrokenRender componentWillUnmount');\n+ Scheduler.unstable_yieldValue('BrokenRender componentWillUnmount');\n }\n };\n \n BrokenUseEffect = props => {\n- log.push('BrokenUseEffect render');\n+ Scheduler.unstable_yieldValue('BrokenUseEffect render');\n \n React.useEffect(() => {\n- log.push('BrokenUseEffect useEffect [!]');\n+ Scheduler.unstable_yieldValue('BrokenUseEffect useEffect [!]');\n throw new Error('Hello');\n });\n \n@@ -403,10 +509,12 @@ describe('ReactErrorBoundaries', () => {\n };\n \n BrokenUseLayoutEffect = props => {\n- log.push('BrokenUseLayoutEffect render');\n+ Scheduler.unstable_yieldValue('BrokenUseLayoutEffect render');\n \n React.useLayoutEffect(() => {\n- log.push('BrokenUseLayoutEffect useLayoutEffect [!]');\n+ Scheduler.unstable_yieldValue(\n+ 'BrokenUseLayoutEffect useLayoutEffect [!]',\n+ );\n throw new Error('Hello');\n });\n \n@@ -416,23 +524,25 @@ describe('ReactErrorBoundaries', () => {\n NoopErrorBoundary = class extends React.Component {\n constructor(props) {\n super(props);\n- log.push('NoopErrorBoundary constructor');\n+ Scheduler.unstable_yieldValue('NoopErrorBoundary constructor');\n }\n render() {\n- log.push('NoopErrorBoundary render');\n+ Scheduler.unstable_yieldValue('NoopErrorBoundary render');\n return ;\n }\n UNSAFE_componentWillMount() {\n- log.push('NoopErrorBoundary componentWillMount');\n+ Scheduler.unstable_yieldValue('NoopErrorBoundary componentWillMount');\n }\n componentDidMount() {\n- log.push('NoopErrorBoundary componentDidMount');\n+ Scheduler.unstable_yieldValue('NoopErrorBoundary componentDidMount');\n }\n componentWillUnmount() {\n- log.push('NoopErrorBoundary componentWillUnmount');\n+ Scheduler.unstable_yieldValue('NoopErrorBoundary componentWillUnmount');\n }\n static getDerivedStateFromError() {\n- log.push('NoopErrorBoundary static getDerivedStateFromError');\n+ Scheduler.unstable_yieldValue(\n+ 'NoopErrorBoundary static getDerivedStateFromError',\n+ );\n }\n };\n \n@@ -442,29 +552,41 @@ describe('ReactErrorBoundaries', () => {\n };\n constructor(props) {\n super(props);\n- log.push(`${this.props.logName} constructor`);\n+ Scheduler.unstable_yieldValue(`${this.props.logName} constructor`);\n }\n render() {\n- log.push(`${this.props.logName} render`);\n+ Scheduler.unstable_yieldValue(`${this.props.logName} render`);\n return

{this.props.children}<\/div>;\n }\n UNSAFE_componentWillMount() {\n- log.push(`${this.props.logName} componentWillMount`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentWillMount`,\n+ );\n }\n componentDidMount() {\n- log.push(`${this.props.logName} componentDidMount`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentDidMount`,\n+ );\n }\n UNSAFE_componentWillReceiveProps() {\n- log.push(`${this.props.logName} componentWillReceiveProps`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentWillReceiveProps`,\n+ );\n }\n UNSAFE_componentWillUpdate() {\n- log.push(`${this.props.logName} componentWillUpdate`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentWillUpdate`,\n+ );\n }\n componentDidUpdate() {\n- log.push(`${this.props.logName} componentDidUpdate`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentDidUpdate`,\n+ );\n }\n componentWillUnmount() {\n- log.push(`${this.props.logName} componentWillUnmount`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentWillUnmount`,\n+ );\n }\n };\n \n@@ -472,37 +594,51 @@ describe('ReactErrorBoundaries', () => {\n constructor(props) {\n super(props);\n this.state = {error: null};\n- log.push(`${this.props.logName} constructor`);\n+ Scheduler.unstable_yieldValue(`${this.props.logName} constructor`);\n }\n render() {\n if (this.state.error && !this.props.forceRetry) {\n- log.push(`${this.props.logName} render error`);\n+ Scheduler.unstable_yieldValue(`${this.props.logName} render error`);\n return this.props.renderError(this.state.error, this.props);\n }\n- log.push(`${this.props.logName} render success`);\n+ Scheduler.unstable_yieldValue(`${this.props.logName} render success`);\n return

{this.props.children}<\/div>;\n }\n static getDerivedStateFromError(error) {\n- log.push('ErrorBoundary static getDerivedStateFromError');\n+ Scheduler.unstable_yieldValue(\n+ 'ErrorBoundary static getDerivedStateFromError',\n+ );\n return {error};\n }\n UNSAFE_componentWillMount() {\n- log.push(`${this.props.logName} componentWillMount`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentWillMount`,\n+ );\n }\n componentDidMount() {\n- log.push(`${this.props.logName} componentDidMount`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentDidMount`,\n+ );\n }\n UNSAFE_componentWillReceiveProps() {\n- log.push(`${this.props.logName} componentWillReceiveProps`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentWillReceiveProps`,\n+ );\n }\n UNSAFE_componentWillUpdate() {\n- log.push(`${this.props.logName} componentWillUpdate`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentWillUpdate`,\n+ );\n }\n componentDidUpdate() {\n- log.push(`${this.props.logName} componentDidUpdate`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentDidUpdate`,\n+ );\n }\n componentWillUnmount() {\n- log.push(`${this.props.logName} componentWillUnmount`);\n+ Scheduler.unstable_yieldValue(\n+ `${this.props.logName} componentWillUnmount`,\n+ );\n }\n };\n ErrorBoundary.defaultProps = {\n@@ -519,23 +655,27 @@ describe('ReactErrorBoundaries', () => {\n RetryErrorBoundary = class extends React.Component {\n constructor(props) {\n super(props);\n- log.push('RetryErrorBoundary constructor');\n+ Scheduler.unstable_yieldValue('RetryErrorBoundary constructor');\n }\n render() {\n- log.push('RetryErrorBoundary render');\n+ Scheduler.unstable_yieldValue('RetryErrorBoundary render');\n return ;\n }\n UNSAFE_componentWillMount() {\n- log.push('RetryErrorBoundary componentWillMount');\n+ Scheduler.unstable_yieldValue('RetryErrorBoundary componentWillMount');\n }\n componentDidMount() {\n- log.push('RetryErrorBoundary componentDidMount');\n+ Scheduler.unstable_yieldValue('RetryErrorBoundary componentDidMount');\n }\n componentWillUnmount() {\n- log.push('RetryErrorBoundary componentWillUnmount');\n+ Scheduler.unstable_yieldValue(\n+ 'RetryErrorBoundary componentWillUnmount',\n+ );\n }\n static getDerivedStateFromError(error) {\n- log.push('RetryErrorBoundary static getDerivedStateFromError [!]');\n+ Scheduler.unstable_yieldValue(\n+ 'RetryErrorBoundary static getDerivedStateFromError [!]',\n+ );\n \/\/ In Fiber, calling setState() (and failing) is treated as a rethrow.\n return {};\n }\n@@ -544,19 +684,19 @@ describe('ReactErrorBoundaries', () => {\n ErrorMessage = class extends React.Component {\n constructor(props) {\n super(props);\n- log.push('ErrorMessage constructor');\n+ Scheduler.unstable_yieldValue('ErrorMessage constructor');\n }\n UNSAFE_componentWillMount() {\n- log.push('ErrorMessage componentWillMount');\n+ Scheduler.unstable_yieldValue('ErrorMessage componentWillMount');\n }\n componentDidMount() {\n- log.push('ErrorMessage componentDidMount');\n+ Scheduler.unstable_yieldValue('ErrorMessage componentDidMount');\n }\n componentWillUnmount() {\n- log.push('ErrorMessage componentWillUnmount');\n+ Scheduler.unstable_yieldValue('ErrorMessage componentWillUnmount');\n }\n render() {\n- log.push('ErrorMessage render');\n+ Scheduler.unstable_yieldValue('ErrorMessage render');\n return

Caught an error: {this.props.message}.<\/div>;\n }\n };\n@@ -658,7 +798,7 @@ describe('ReactErrorBoundaries', () => {\n });\n \n expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -672,9 +812,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('renders an error state if child throws in render', () => {\n@@ -686,7 +825,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -700,9 +839,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('renders an error state if child throws in constructor', () => {\n@@ -714,7 +852,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -726,9 +864,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('renders an error state if child throws in componentWillMount', () => {\n@@ -740,7 +877,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -753,9 +890,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('renders an error state if context provider throws in componentWillMount', () => {\n@@ -834,7 +970,7 @@ describe('ReactErrorBoundaries', () => {\n <\/ErrorBoundary>,\n container,\n );\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -851,9 +987,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillUnmount',\n 'ErrorMessage componentWillUnmount',\n ]);\n@@ -870,7 +1005,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -894,9 +1029,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('propagates errors inside boundary during componentWillMount', () => {\n@@ -908,7 +1042,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -921,9 +1055,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('propagates errors inside boundary while rendering error state', () => {\n@@ -937,7 +1070,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -958,9 +1091,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('does not call componentWillUnmount when aborting initial mount', () => {\n@@ -974,7 +1106,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -997,17 +1129,16 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('resets callback refs if mounting aborts', () => {\n function childRef(x) {\n- log.push('Child ref is set to ' + x);\n+ Scheduler.unstable_yieldValue('Child ref is set to ' + x);\n }\n function errorMessageRef(x) {\n- log.push('Error message ref is set to ' + x);\n+ Scheduler.unstable_yieldValue('Error message ref is set to ' + x);\n }\n \n const container = document.createElement('div');\n@@ -1019,7 +1150,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -1034,9 +1165,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillUnmount',\n 'Error message ref is set to null',\n ]);\n@@ -1055,7 +1185,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -1072,9 +1202,8 @@ describe('ReactErrorBoundaries', () => {\n '[object HTMLDivElement]',\n );\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n expect(errorMessageRef.current).toEqual(null);\n });\n \n@@ -1087,16 +1216,15 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.firstChild.textContent).toBe('Mounted successfully.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('catches if child throws in constructor during update', () => {\n@@ -1107,7 +1235,7 @@ describe('ReactErrorBoundaries', () => {\n <\/ErrorBoundary>,\n container,\n );\n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n \n \n@@ -1117,7 +1245,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillReceiveProps',\n 'ErrorBoundary componentWillUpdate',\n 'ErrorBoundary render success',\n@@ -1139,9 +1267,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('catches if child throws in componentWillMount during update', () => {\n@@ -1153,7 +1280,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n \n \n@@ -1163,7 +1290,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillReceiveProps',\n 'ErrorBoundary componentWillUpdate',\n 'ErrorBoundary render success',\n@@ -1186,9 +1313,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('catches if child throws in componentWillReceiveProps during update', () => {\n@@ -1201,7 +1327,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n \n \n@@ -1210,7 +1336,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillReceiveProps',\n 'ErrorBoundary componentWillUpdate',\n 'ErrorBoundary render success',\n@@ -1229,9 +1355,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('catches if child throws in componentWillUpdate during update', () => {\n@@ -1244,7 +1369,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n \n \n@@ -1253,7 +1378,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillReceiveProps',\n 'ErrorBoundary componentWillUpdate',\n 'ErrorBoundary render success',\n@@ -1272,9 +1397,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('catches if child throws in render during update', () => {\n@@ -1286,7 +1410,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n \n \n@@ -1296,7 +1420,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillReceiveProps',\n 'ErrorBoundary componentWillUpdate',\n 'ErrorBoundary render success',\n@@ -1319,20 +1443,19 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('keeps refs up-to-date during updates', () => {\n function child1Ref(x) {\n- log.push('Child1 ref is set to ' + x);\n+ Scheduler.unstable_yieldValue('Child1 ref is set to ' + x);\n }\n function child2Ref(x) {\n- log.push('Child2 ref is set to ' + x);\n+ Scheduler.unstable_yieldValue('Child2 ref is set to ' + x);\n }\n function errorMessageRef(x) {\n- log.push('Error message ref is set to ' + x);\n+ Scheduler.unstable_yieldValue('Error message ref is set to ' + x);\n }\n \n const container = document.createElement('div');\n@@ -1342,7 +1465,7 @@ describe('ReactErrorBoundaries', () => {\n <\/ErrorBoundary>,\n container,\n );\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -1350,7 +1473,6 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidMount',\n ]);\n \n- log.length = 0;\n ReactDOM.render(\n \n

\n@@ -1360,7 +1482,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillReceiveProps',\n 'ErrorBoundary componentWillUpdate',\n 'ErrorBoundary render success',\n@@ -1379,9 +1501,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillUnmount',\n 'Error message ref is set to null',\n ]);\n@@ -1398,7 +1519,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n \n \n@@ -1406,7 +1527,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillReceiveProps',\n 'ErrorBoundary componentWillUpdate',\n 'ErrorBoundary render success',\n@@ -1438,9 +1559,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('recovers from nested componentWillUnmount errors on update', () => {\n@@ -1455,7 +1575,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n \n \n@@ -1465,7 +1585,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillReceiveProps',\n 'ErrorBoundary componentWillUpdate',\n 'ErrorBoundary render success',\n@@ -1498,9 +1618,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('picks the right boundary when handling unmounting errors', () => {\n@@ -1525,7 +1644,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n {\n container,\n );\n expect(container.textContent).toBe('Caught an inner error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n \/\/ Update outer boundary\n 'OuterErrorBoundary componentWillReceiveProps',\n 'OuterErrorBoundary componentWillUpdate',\n@@ -1562,9 +1681,8 @@ describe('ReactErrorBoundaries', () => {\n 'InnerErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'OuterErrorBoundary componentWillUnmount',\n 'InnerErrorBoundary componentWillUnmount',\n ]);\n@@ -1589,7 +1707,7 @@ describe('ReactErrorBoundaries', () => {\n expect(container.textContent).toBe('Caught an error: Hello.');\n \n \/\/ Force the success path:\n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n \n \n@@ -1597,7 +1715,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.textContent).not.toContain('Caught an error');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillReceiveProps',\n 'ErrorBoundary componentWillUpdate',\n 'ErrorBoundary render success',\n@@ -1610,9 +1728,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillUnmount',\n 'Normal componentWillUnmount',\n ]);\n@@ -1656,9 +1773,9 @@ describe('ReactErrorBoundaries', () => {\n ReactDOM.render(, container);\n expect(container.textContent).toBe('Caught an error: Hello.');\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it(\"doesn't get into inconsistent state during additions\", () => {\n@@ -1674,9 +1791,9 @@ describe('ReactErrorBoundaries', () => {\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it(\"doesn't get into inconsistent state during reorders\", () => {\n@@ -1722,9 +1839,9 @@ describe('ReactErrorBoundaries', () => {\n );\n expect(container.textContent).toBe('Caught an error: Hello.');\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('catches errors originating downstream', () => {\n@@ -1734,7 +1851,7 @@ describe('ReactErrorBoundaries', () => {\n \n render() {\n if (fail) {\n- log.push('Stateful render [!]');\n+ Scheduler.unstable_yieldValue('Stateful render [!]');\n throw new Error('Hello');\n }\n return

{this.props.children}<\/div>;\n@@ -1750,13 +1867,13 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n expect(() => {\n fail = true;\n statefulInst.forceUpdate();\n }).not.toThrow();\n \n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'Stateful render [!]',\n 'ErrorBoundary static getDerivedStateFromError',\n 'ErrorBoundary componentWillUpdate',\n@@ -1764,9 +1881,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('catches errors in componentDidMount', () => {\n@@ -1781,7 +1897,7 @@ describe('ReactErrorBoundaries', () => {\n <\/ErrorBoundary>,\n container,\n );\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -1823,9 +1939,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('catches errors in componentDidUpdate', () => {\n@@ -1837,14 +1952,14 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n \n \n <\/ErrorBoundary>,\n container,\n );\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary componentWillReceiveProps',\n 'ErrorBoundary componentWillUpdate',\n 'ErrorBoundary render success',\n@@ -1862,9 +1977,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('catches errors in useEffect', () => {\n@@ -1876,7 +1990,7 @@ describe('ReactErrorBoundaries', () => {\n <\/ErrorBoundary>,\n container,\n );\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -1885,11 +1999,11 @@ describe('ReactErrorBoundaries', () => {\n ]);\n \n expect(container.firstChild.textContent).toBe('Initial value');\n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n });\n \n \/\/ verify flushed passive effects and handle the error\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'BrokenUseEffect useEffect [!]',\n \/\/ Handle the error\n 'ErrorBoundary static getDerivedStateFromError',\n@@ -1909,7 +2023,7 @@ describe('ReactErrorBoundaries', () => {\n <\/ErrorBoundary>,\n container,\n );\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -1941,7 +2055,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n expect(container.firstChild.textContent).toBe('Caught an error: Hello.');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'ErrorBoundary constructor',\n 'ErrorBoundary componentWillMount',\n 'ErrorBoundary render success',\n@@ -1960,9 +2074,8 @@ describe('ReactErrorBoundaries', () => {\n 'ErrorBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual(['ErrorBoundary componentWillUnmount']);\n+ expect(Scheduler).toHaveYielded(['ErrorBoundary componentWillUnmount']);\n });\n \n it('calls static getDerivedStateFromError for each error that is captured', () => {\n@@ -1992,7 +2105,7 @@ describe('ReactErrorBoundaries', () => {\n container,\n );\n \n- log.length = 0;\n+ Scheduler.unstable_clearYields();\n ReactDOM.render(\n \n {\n expect(container.firstChild.textContent).toBe(\n 'Caught an unmounting error: E2.' + 'Caught an updating error: E4.',\n );\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n \/\/ Begin update phase\n 'OuterErrorBoundary componentWillReceiveProps',\n 'OuterErrorBoundary componentWillUpdate',\n@@ -2057,9 +2170,8 @@ describe('ReactErrorBoundaries', () => {\n 'InnerUpdateBoundary componentDidUpdate',\n ]);\n \n- log.length = 0;\n ReactDOM.unmountComponentAtNode(container);\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'OuterErrorBoundary componentWillUnmount',\n 'InnerUnmountBoundary componentWillUnmount',\n 'InnerUpdateBoundary componentWillUnmount',\n@@ -2111,7 +2223,7 @@ describe('ReactErrorBoundaries', () => {\n ),\n ).toThrow('Hello');\n expect(container.innerHTML).toBe('');\n- expect(log).toEqual([\n+ expect(Scheduler).toHaveYielded([\n 'NoopErrorBoundary constructor',\n 'NoopErrorBoundary componentWillMount',\n 'NoopErrorBoundary render',\n"}

dillon1000/react

Files changed