From 5a9d0c6a123764e52e4be3f428be5d967bc5a771 Mon Sep 17 00:00:00 2001 From: Cheng Lou Date: Wed, 9 Apr 2014 17:50:01 -0700 Subject: [PATCH] Update invalid render error message forgot to update the message following the previous diff on rendering null. --- src/core/ReactCompositeComponent.js | 2 +- src/core/__tests__/ReactCompositeComponent-test.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/ReactCompositeComponent.js b/src/core/ReactCompositeComponent.js index 5144319476..9b010f80b5 100644 --- a/src/core/ReactCompositeComponent.js +++ b/src/core/ReactCompositeComponent.js @@ -1181,7 +1181,7 @@ var ReactCompositeComponentMixin = { invariant( ReactDescriptor.isValidDescriptor(renderedComponent), '%s.render(): A valid ReactComponent must be returned. You may have ' + - 'returned an array or some other invalid object.', + 'returned undefined, an array or some other invalid object.', this.constructor.displayName || 'ReactCompositeComponent' ); return renderedComponent; diff --git a/src/core/__tests__/ReactCompositeComponent-test.js b/src/core/__tests__/ReactCompositeComponent-test.js index 911578e216..add279580f 100644 --- a/src/core/__tests__/ReactCompositeComponent-test.js +++ b/src/core/__tests__/ReactCompositeComponent-test.js @@ -159,8 +159,8 @@ describe('ReactCompositeComponent', function() { ReactTestUtils.renderIntoDocument(); }).toThrow( 'Invariant Violation: Component.render(): A valid ReactComponent must ' + - 'be returned. You may have returned an array or some other invalid ' + - 'object.' + 'be returned. You may have returned undefined, an array or some other ' + + 'invalid object.' ); });