Skip to content

Commit

Permalink
Support error boundaries on ReactTestRenderer (#7558)
Browse files Browse the repository at this point in the history
(cherry picked from commit 38f74bc)
  • Loading branch information
millermedeiros authored and zpao committed Sep 15, 2016
1 parent 832c503 commit b445b26
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 0 deletions.
13 changes: 13 additions & 0 deletions src/renderers/testing/ReactTestReconcileTransaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,19 @@ var Mixin = {
return ReactUpdateQueue;
},

/**
* Save current transaction state -- if the return value from this method is
* passed to `rollback`, the transaction will be reset to that state.
*/
checkpoint: function() {
// reactMountReady is the our only stateful wrapper
return this.reactMountReady.checkpoint();
},

rollback: function(checkpoint) {
this.reactMountReady.rollback(checkpoint);
},

/**
* `PooledClass` looks for this, and will invoke this before allowing this
* instance to be reused.
Expand Down
38 changes: 38 additions & 0 deletions src/renderers/testing/__tests__/ReactTestRenderer-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,4 +206,42 @@ describe('ReactTestRenderer', function() {
expect(log).toEqual([null]);
});

it('supports error boundaries', function() {
class Angry extends React.Component {
render() {
throw new Error('Please, do not render me.');
}
}

class Boundary extends React.Component {
constructor(props) {
super(props);
this.state = {error: false};
}
render() {
if (!this.state.error) {
return (<div><button onClick={this.onClick}>ClickMe</button><Angry /></div>);
} else {
return (<div>Happy Birthday!</div>);
}
}
onClick() {
/* do nothing */
}
unstable_handleError() {
this.setState({error: true});
}
}

var EventPluginHub = require('EventPluginHub');
EventPluginHub.putListener = jest.fn();
var renderer = ReactTestRenderer.create(<Boundary />);
expect(renderer.toJSON()).toEqual({
type: 'div',
props: {},
children: ['Happy Birthday!'],
});
expect(EventPluginHub.putListener).not.toBeCalled();
});

});

0 comments on commit b445b26

Please sign in to comment.