maxjhandsome
/
react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3205 from sebmarkbage/warningfixes 

More warnings to ReactFragment.create
This commit is contained in:
Sebastian Markbåge 2015-02-19 15:43:18 -08:00
parent 02d225f26e 5a2c80382c
commit 977204991b
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/addons/ReactFragment.js
View File

@ -96,14 +96,22 @@ var ReactFragment = {
// of its properties.
create: function(object) {
if (__DEV__) {
if (typeof object !== 'object' || !object) {
if (typeof object !== 'object' || !object || Array.isArray(object)) {
warning(
false,
'React.addons.createFragment only accepts a single object. Not %s',
'React.addons.createFragment only accepts a single object.',
object
);
return object;
}
if (ReactElement.isValidElement(object)) {
warning(
false,
'React.addons.createFragment does not accept a ReactElement ' +
'without a wrapper object.'
);
return object;
}
if (canWarnForReactFragment) {
var proxy = {};
Object.defineProperty(proxy, fragmentKey, {

23
src/addons/__tests__/ReactFragment-test.js
View File

@ -73,12 +73,31 @@ describe('ReactFragment', function() {
);
});
it('should warn if accessing any property on a fragment', function() {
it('should warn if passing null to createFragment', function() {
spyOn(console, 'warn');
ReactFragment.create(null);
expect(console.warn.calls.length).toBe(1);
expect(console.warn.calls[0].args[0]).toContain(
'React.addons.createFragment only accepts a single object. Not null'
'React.addons.createFragment only accepts a single object.'
);
});
it('should warn if passing an array to createFragment', function() {
spyOn(console, 'warn');
ReactFragment.create([]);
expect(console.warn.calls.length).toBe(1);
expect(console.warn.calls[0].args[0]).toContain(
'React.addons.createFragment only accepts a single object.'
);
});
it('should warn if passing a ReactElement to createFragment', function() {
spyOn(console, 'warn');
ReactFragment.create(<div />);
expect(console.warn.calls.length).toBe(1);
expect(console.warn.calls[0].args[0]).toContain(
'React.addons.createFragment does not accept a ReactElement without a ' +
'wrapper object.'
);
});