Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions src/test/ReactTestUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ function findAllInRenderedTreeInternal(inst, test) {
}
var publicInst = inst.getPublicInstance();
var ret = test(publicInst) ? [publicInst] : [];
var currentElement = inst._currentElement;
if (ReactTestUtils.isDOMComponent(publicInst)) {
var renderedChildren = inst._renderedChildren;
var key;
Expand All @@ -58,7 +59,10 @@ function findAllInRenderedTreeInternal(inst, test) {
)
);
}
} else if (ReactTestUtils.isCompositeComponent(publicInst)) {
} else if (
ReactElement.isValidElement(currentElement) &&
typeof currentElement.type === 'function'
) {
ret = ret.concat(
findAllInRenderedTreeInternal(inst._renderedComponent, test)
);
Expand Down Expand Up @@ -111,7 +115,8 @@ var ReactTestUtils = {
// this returns when we have DOM nodes as refs directly
return false;
}
return typeof inst.render === 'function' &&
return inst != null &&
typeof inst.render === 'function' &&
typeof inst.setState === 'function';
},

Expand Down
18 changes: 18 additions & 0 deletions src/test/__tests__/ReactTestUtils-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -410,4 +410,22 @@ describe('ReactTestUtils', function() {
expect(handler).toHaveBeenCalledWith(jasmine.objectContaining({target: node}));
});

it('can scry with stateless components involved', function() {
var Stateless = () => <div><hr /></div>;
var SomeComponent = React.createClass({
render: function() {
return (
<div>
<Stateless />
<hr />
</div>
);
},
});

var inst = ReactTestUtils.renderIntoDocument(<SomeComponent />);
var hrs = ReactTestUtils.scryRenderedDOMComponentsWithTag(inst, 'hr');
expect(hrs.length).toBe(2);
});

});