Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite some tests relying on internal APIs #8148

Merged
merged 1 commit into from
Oct 29, 2016
Merged

Rewrite some tests relying on internal APIs #8148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/isomorphic/classic/__tests__/ReactContextValidator-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ var React;
var ReactDOM;
var ReactTestUtils;

var reactComponentExpect;

describe('ReactContextValidator', () => {
function normalizeCodeLocInfo(str) {
return str.replace(/\(at .+?:\d+\)/g, '(at **)');
Expand All @@ -34,7 +32,6 @@ describe('ReactContextValidator', () => {
React = require('React');
ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');
reactComponentExpect = require('reactComponentExpect');
});

// TODO: This behavior creates a runtime dependency on propTypes. We should
Expand Down Expand Up @@ -65,12 +62,12 @@ describe('ReactContextValidator', () => {
},

render: function() {
return <Component />;
return <Component ref="child" />;
},
});

var instance = ReactTestUtils.renderIntoDocument(<ComponentInFooBarContext />);
reactComponentExpect(instance).expectRenderedChild().scalarContextEqual({foo: 'abc'});
expect(instance.refs.child.context).toEqual({foo: 'abc'});
});

it('should filter context properly in callbacks', () => {
Expand Down
41 changes: 16 additions & 25 deletions src/isomorphic/classic/class/__tests__/ReactBind-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

var React = require('React');
var ReactTestUtils = require('ReactTestUtils');
var reactComponentExpect = require('reactComponentExpect');

// TODO: Test render and all stock methods.
describe('autobinding', () => {
Expand Down Expand Up @@ -42,6 +41,7 @@ describe('autobinding', () => {
render: function() {
return (
<div
ref="child"
onMouseOver={this.onMouseEnter}
onMouseOut={this.onMouseLeave}
onClick={this.onClick}
Expand All @@ -50,48 +50,42 @@ describe('autobinding', () => {
},
});

var instance1 = <TestBindComponent />;
var mountedInstance1 = ReactTestUtils.renderIntoDocument(instance1);
var rendered1 = reactComponentExpect(mountedInstance1)
.expectRenderedChild()
.instance();
var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
var rendered1 = instance1.refs.child;

var instance2 = <TestBindComponent />;
var mountedInstance2 = ReactTestUtils.renderIntoDocument(instance2);
var rendered2 = reactComponentExpect(mountedInstance2)
.expectRenderedChild()
.instance();
var instance2 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
var rendered2 = instance2.refs.child;

expect(function() {
var badIdea = instance1.badIdeas.badBind;
badIdea();
}).toThrow();

expect(mountedInstance1.onClick).not.toBe(mountedInstance2.onClick);
expect(instance1.onClick).not.toBe(instance2.onClick);

ReactTestUtils.Simulate.click(rendered1);
expect(mouseDidClick.mock.instances.length).toBe(1);
expect(mouseDidClick.mock.instances[0]).toBe(mountedInstance1);
expect(mouseDidClick.mock.instances[0]).toBe(instance1);

ReactTestUtils.Simulate.click(rendered2);
expect(mouseDidClick.mock.instances.length).toBe(2);
expect(mouseDidClick.mock.instances[1]).toBe(mountedInstance2);
expect(mouseDidClick.mock.instances[1]).toBe(instance2);

ReactTestUtils.Simulate.mouseOver(rendered1);
expect(mouseDidEnter.mock.instances.length).toBe(1);
expect(mouseDidEnter.mock.instances[0]).toBe(mountedInstance1);
expect(mouseDidEnter.mock.instances[0]).toBe(instance1);

ReactTestUtils.Simulate.mouseOver(rendered2);
expect(mouseDidEnter.mock.instances.length).toBe(2);
expect(mouseDidEnter.mock.instances[1]).toBe(mountedInstance2);
expect(mouseDidEnter.mock.instances[1]).toBe(instance2);

ReactTestUtils.Simulate.mouseOut(rendered1);
expect(mouseDidLeave.mock.instances.length).toBe(1);
expect(mouseDidLeave.mock.instances[0]).toBe(mountedInstance1);
expect(mouseDidLeave.mock.instances[0]).toBe(instance1);

ReactTestUtils.Simulate.mouseOut(rendered2);
expect(mouseDidLeave.mock.instances.length).toBe(2);
expect(mouseDidLeave.mock.instances[1]).toBe(mountedInstance2);
expect(mouseDidLeave.mock.instances[1]).toBe(instance2);
});

it('works with mixins', () => {
Expand All @@ -105,19 +99,16 @@ describe('autobinding', () => {
mixins: [TestMixin],

render: function() {
return <div onClick={this.onClick} />;
return <div ref="child" onClick={this.onClick} />;
},
});

var instance1 = <TestBindComponent />;
var mountedInstance1 = ReactTestUtils.renderIntoDocument(instance1);
var rendered1 = reactComponentExpect(mountedInstance1)
.expectRenderedChild()
.instance();
var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
var rendered1 = instance1.refs.child;

ReactTestUtils.Simulate.click(rendered1);
expect(mouseDidClick.mock.instances.length).toBe(1);
expect(mouseDidClick.mock.instances[0]).toBe(mountedInstance1);
expect(mouseDidClick.mock.instances[0]).toBe(instance1);
});

it('warns if you try to bind to this', () => {
Expand Down
67 changes: 25 additions & 42 deletions src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

var React = require('React');
var ReactTestUtils = require('ReactTestUtils');
var reactComponentExpect = require('reactComponentExpect');

// TODO: Test render and all stock methods.
describe('autobind optout', () => {
Expand All @@ -36,6 +35,7 @@ describe('autobind optout', () => {
render: function() {
return (
<div
ref="child"
onMouseOver={this.onMouseEnter.bind(this)}
onMouseOut={this.onMouseLeave.bind(this)}
onClick={this.onClick.bind(this)}
Expand All @@ -44,41 +44,35 @@ describe('autobind optout', () => {
},
});

var instance1 = <TestBindComponent />;
var mountedInstance1 = ReactTestUtils.renderIntoDocument(instance1);
var rendered1 = reactComponentExpect(mountedInstance1)
.expectRenderedChild()
.instance();
var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
var rendered1 = instance1.refs.child;

var instance2 = <TestBindComponent />;
var mountedInstance2 = ReactTestUtils.renderIntoDocument(instance2);
var rendered2 = reactComponentExpect(mountedInstance2)
.expectRenderedChild()
.instance();
var instance2 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
var rendered2 = instance2.refs.child;

ReactTestUtils.Simulate.click(rendered1);
expect(mouseDidClick.mock.instances.length).toBe(1);
expect(mouseDidClick.mock.instances[0]).toBe(mountedInstance1);
expect(mouseDidClick.mock.instances[0]).toBe(instance1);

ReactTestUtils.Simulate.click(rendered2);
expect(mouseDidClick.mock.instances.length).toBe(2);
expect(mouseDidClick.mock.instances[1]).toBe(mountedInstance2);
expect(mouseDidClick.mock.instances[1]).toBe(instance2);

ReactTestUtils.Simulate.mouseOver(rendered1);
expect(mouseDidEnter.mock.instances.length).toBe(1);
expect(mouseDidEnter.mock.instances[0]).toBe(mountedInstance1);
expect(mouseDidEnter.mock.instances[0]).toBe(instance1);

ReactTestUtils.Simulate.mouseOver(rendered2);
expect(mouseDidEnter.mock.instances.length).toBe(2);
expect(mouseDidEnter.mock.instances[1]).toBe(mountedInstance2);
expect(mouseDidEnter.mock.instances[1]).toBe(instance2);

ReactTestUtils.Simulate.mouseOut(rendered1);
expect(mouseDidLeave.mock.instances.length).toBe(1);
expect(mouseDidLeave.mock.instances[0]).toBe(mountedInstance1);
expect(mouseDidLeave.mock.instances[0]).toBe(instance1);

ReactTestUtils.Simulate.mouseOut(rendered2);
expect(mouseDidLeave.mock.instances.length).toBe(2);
expect(mouseDidLeave.mock.instances[1]).toBe(mountedInstance2);
expect(mouseDidLeave.mock.instances[1]).toBe(instance2);
});

it('should not hold reference to instance', () => {
Expand All @@ -103,30 +97,25 @@ describe('autobind optout', () => {
render: function() {
return (
<div
ref="child"
onClick={this.onClick}
/>
);
},
});

var instance1 = <TestBindComponent />;
var mountedInstance1 = ReactTestUtils.renderIntoDocument(instance1);
var rendered1 = reactComponentExpect(mountedInstance1)
.expectRenderedChild()
.instance();
var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
var rendered1 = instance1.refs.child;

var instance2 = <TestBindComponent />;
var mountedInstance2 = ReactTestUtils.renderIntoDocument(instance2);
var rendered2 = reactComponentExpect(mountedInstance2)
.expectRenderedChild()
.instance();
var instance2 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
var rendered2 = instance2.refs.child;

expect(function() {
var badIdea = instance1.badIdeas.badBind;
badIdea();
}).toThrow();

expect(mountedInstance1.onClick).toBe(mountedInstance2.onClick);
expect(instance1.onClick).toBe(instance2.onClick);

expect(function() {
ReactTestUtils.Simulate.click(rendered1);
Expand All @@ -148,19 +137,16 @@ describe('autobind optout', () => {
mixins: [TestMixin],

render: function() {
return <div onClick={this.onClick} />;
return <div ref="child" onClick={this.onClick} />;
},
});

var instance1 = <TestBindComponent />;
var mountedInstance1 = ReactTestUtils.renderIntoDocument(instance1);
var rendered1 = reactComponentExpect(mountedInstance1)
.expectRenderedChild()
.instance();
var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
var rendered1 = instance1.refs.child;

ReactTestUtils.Simulate.click(rendered1);
expect(mouseDidClick.mock.instances.length).toBe(1);
expect(mouseDidClick.mock.instances[0]).toBe(mountedInstance1);
expect(mouseDidClick.mock.instances[0]).toBe(instance1);
});

it('works with mixins that have opted out of autobinding', () => {
Expand All @@ -175,19 +161,16 @@ describe('autobind optout', () => {
mixins: [TestMixin],

render: function() {
return <div onClick={this.onClick.bind(this)} />;
return <div ref="child" onClick={this.onClick.bind(this)} />;
},
});

var instance1 = <TestBindComponent />;
var mountedInstance1 = ReactTestUtils.renderIntoDocument(instance1);
var rendered1 = reactComponentExpect(mountedInstance1)
.expectRenderedChild()
.instance();
var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
var rendered1 = instance1.refs.child;

ReactTestUtils.Simulate.click(rendered1);
expect(mouseDidClick.mock.instances.length).toBe(1);
expect(mouseDidClick.mock.instances[0]).toBe(mountedInstance1);
expect(mouseDidClick.mock.instances[0]).toBe(instance1);
});

it('does not warn if you try to bind to this', () => {
Expand Down
Loading