Merge pull request facebook#5185 from yungsters/invariant

Remove "Invariant Violation: " from Invariant Error Messages

Author: zpao

package.json

@@ -15,7 +15,7 @@
     "eslint": "^1.5.1",
     "eslint-plugin-react": "^3.4.2",
     "eslint-plugin-react-internal": "file:eslint-rules",
-    "fbjs": "^0.3.1",
+    "fbjs": "^0.4.0",
     "fbjs-scripts": "^0.2.0",
     "grunt": "^0.4.5",
     "grunt-cli": "^0.1.13",

src/addons/__tests__/ReactFragment-test.js

@@ -32,10 +32,10 @@ describe('ReactFragment', function() {
     var element = <div>{[children]}</div>;
     var container = document.createElement('div');
     expect(() => ReactDOM.render(element, container)).toThrow(
-      'Invariant Violation: Objects are not valid as a React child (found: ' +
-      'object with keys {x, y, z}). If you meant to render a collection of ' +
-      'children, use an array instead or wrap the object using ' +
-      'createFragment(object) from the React add-ons.'
+      'Objects are not valid as a React child (found: object with keys ' +
+      '{x, y, z}). If you meant to render a collection of children, use an ' +
+      'array instead or wrap the object using createFragment(object) from ' +
+      'the React add-ons.'
     );
   });
 
@@ -52,22 +52,21 @@ describe('ReactFragment', function() {
     }
     var container = document.createElement('div');
     expect(() => ReactDOM.render(<Foo />, container)).toThrow(
-      'Invariant Violation: Objects are not valid as a React child (found: ' +
-      'object with keys {a, b, c}). If you meant to render a collection of ' +
-      'children, use an array instead or wrap the object using ' +
-      'createFragment(object) from the React add-ons. Check the render ' +
-      'method of `Foo`.'
+      'Objects are not valid as a React child (found: object with keys ' +
+      '{a, b, c}). If you meant to render a collection of children, use an ' +
+      'array instead or wrap the object using createFragment(object) from ' +
+      'the React add-ons. Check the render method of `Foo`.'
     );
   });
 
   it('should throw if a plain object looks like an old element', function() {
     var oldEl = {_isReactElement: true, type: 'span', props: {}};
     var container = document.createElement('div');
     expect(() => ReactDOM.render(<div>{oldEl}</div>, container)).toThrow(
-      'Invariant Violation: Objects are not valid as a React child (found: ' +
-      'object with keys {_isReactElement, type, props}). It looks like ' +
-      'you\'re using an element created by a different version of React. ' +
-      'Make sure to use only one copy of React.'
+      'Objects are not valid as a React child (found: object with keys ' +
+      '{_isReactElement, type, props}). It looks like you\'re using an ' +
+      'element created by a different version of React. Make sure to use ' +
+      'only one copy of React.'
     );
   });
 

src/addons/__tests__/renderSubtreeIntoContainer-test.js

@@ -88,8 +88,7 @@ describe('renderSubtreeIntoContainer', function() {
       componentDidMount: function() {
         expect(function() {
           renderSubtreeIntoContainer(<Parent />, <Component />, portal);
-        }).toThrow('Invariant Violation: parentComponent' +
-          'must be a valid React Component');
+        }).toThrow('parentComponentmust be a valid React Component');
       },
     });
   });

src/addons/__tests__/update-test.js

@@ -17,53 +17,47 @@ describe('update', function() {
   it('should support push', function() {
     expect(update([1], {$push: [7]})).toEqual([1, 7]);
     expect(update.bind(null, [], {$push: 7})).toThrow(
-      'Invariant Violation: update(): expected spec of $push to be an ' +
-      'array; got 7. Did you forget to wrap your parameter in an array?'
+      'update(): expected spec of $push to be an array; got 7. Did you ' +
+      'forget to wrap your parameter in an array?'
     );
     expect(update.bind(null, 1, {$push: 7})).toThrow(
-      'Invariant Violation: update(): expected target of $push to be an ' +
-      'array; got 1.'
+      'update(): expected target of $push to be an array; got 1.'
     );
   });
 
   it('should support unshift', function() {
     expect(update([1], {$unshift: [7]})).toEqual([7, 1]);
     expect(update.bind(null, [], {$unshift: 7})).toThrow(
-      'Invariant Violation: update(): expected spec of $unshift to be an ' +
-      'array; got 7. Did you forget to wrap your parameter in an array?'
+      'update(): expected spec of $unshift to be an array; got 7. Did you ' +
+      'forget to wrap your parameter in an array?'
     );
     expect(update.bind(null, 1, {$unshift: 7})).toThrow(
-      'Invariant Violation: update(): expected target of $unshift to be an ' +
-      'array; got 1.'
+      'update(): expected target of $unshift to be an array; got 1.'
     );
   });
 
   it('should support splice', function() {
     expect(update([1, 4, 3], {$splice: [[1, 1, 2]]})).toEqual([1, 2, 3]);
     expect(update.bind(null, [], {$splice: 1})).toThrow(
-      'Invariant Violation: update(): expected spec of $splice to be an ' +
-      'array of arrays; got 1. Did you forget to wrap your parameters in an ' +
-      'array?'
+      'update(): expected spec of $splice to be an array of arrays; got 1. ' +
+      'Did you forget to wrap your parameters in an array?'
     );
     expect(update.bind(null, [], {$splice: [1]})).toThrow(
-      'Invariant Violation: update(): expected spec of $splice to be an ' +
-      'array of arrays; got 1. Did you forget to wrap your parameters in an ' +
-      'array?'
+      'update(): expected spec of $splice to be an array of arrays; got 1. ' +
+      'Did you forget to wrap your parameters in an array?'
     );
     expect(update.bind(null, 1, {$splice: 7})).toThrow(
-      'Invariant Violation: Expected $splice target to be an array; got 1'
+      'Expected $splice target to be an array; got 1'
     );
   });
 
   it('should support merge', function() {
     expect(update({a: 'b'}, {$merge: {c: 'd'}})).toEqual({a: 'b', c: 'd'});
     expect(update.bind(null, {}, {$merge: 7})).toThrow(
-      'Invariant Violation: update(): $merge expects a spec of type ' +
-      '\'object\'; got 7'
+      'update(): $merge expects a spec of type \'object\'; got 7'
     );
     expect(update.bind(null, 7, {$merge: {a: 'b'}})).toThrow(
-      'Invariant Violation: update(): $merge expects a target of type ' +
-      '\'object\'; got 7'
+      'update(): $merge expects a target of type \'object\'; got 7'
     );
   });
 
@@ -74,8 +68,7 @@ describe('update', function() {
   it('should support apply', function() {
     expect(update(2, {$apply: (x) => x * 2})).toEqual(4);
     expect(update.bind(null, 2, {$apply: 123})).toThrow(
-      'Invariant Violation: update(): expected spec of $apply to be a ' +
-      'function; got 123.'
+      'update(): expected spec of $apply to be a function; got 123.'
     );
   });
 
@@ -88,9 +81,9 @@ describe('update', function() {
 
   it('should require a command', function() {
     expect(update.bind(null, {a: 'b'}, {a: 'c'})).toThrow(
-      'Invariant Violation: update(): You provided a key path to update() ' +
-      'that did not contain one of $push, $unshift, $splice, $set, $merge, ' +
-      '$apply. Did you forget to include {$set: ...}?'
+      'update(): You provided a key path to update() that did not contain ' +
+      'one of $push, $unshift, $splice, $set, $merge, $apply. Did you ' +
+      'forget to include {$set: ...}?'
     );
   });
 

src/isomorphic/classic/class/__tests__/ReactClass-test.js

@@ -30,8 +30,7 @@ describe('ReactClass-spec', function() {
     expect(function() {
       React.createClass({});
     }).toThrow(
-      'Invariant Violation: createClass(...): Class specification must ' +
-      'implement a `render` method.'
+      'createClass(...): Class specification must implement a `render` method.'
     );
   });
 
@@ -197,10 +196,10 @@ describe('ReactClass-spec', function() {
         },
       });
     }).toThrow(
-      'Invariant Violation: ReactClass: You are attempting to ' +
-      'define a reserved property, `getDefaultProps`, that shouldn\'t be on ' +
-      'the "statics" key. Define it as an instance property instead; it ' +
-      'will still be accessible on the constructor.'
+      'ReactClass: You are attempting to define a reserved property, ' +
+      '`getDefaultProps`, that shouldn\'t be on the "statics" key. Define ' +
+      'it as an instance property instead; it will still be accessible on ' +
+      'the constructor.'
     );
   });
 
@@ -331,8 +330,7 @@ describe('ReactClass-spec', function() {
       expect(function() {
         instance = ReactTestUtils.renderIntoDocument(instance);
       }).toThrow(
-        'Invariant Violation: Component.getInitialState(): ' +
-        'must return an object or null'
+        'Component.getInitialState(): must return an object or null'
       );
     });
   });

src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js

@@ -208,11 +208,10 @@ describe('ReactClass-mixin', function() {
     expect(function() {
       instance = ReactTestUtils.renderIntoDocument(instance);
     }).toThrow(
-      'Invariant Violation: mergeIntoWithNoDuplicateKeys(): ' +
-      'Tried to merge two objects with the same key: `x`. This conflict ' +
-      'may be due to a mixin; in particular, this may be caused by two ' +
-      'getInitialState() or getDefaultProps() methods returning objects ' +
-      'with clashing keys.'
+      'mergeIntoWithNoDuplicateKeys(): Tried to merge two objects with the ' +
+      'same key: `x`. This conflict may be due to a mixin; in particular, ' +
+      'this may be caused by two getInitialState() or getDefaultProps() ' +
+      'methods returning objects with clashing keys.'
     );
   });
 
@@ -280,9 +279,8 @@ describe('ReactClass-mixin', function() {
         },
       });
     }).toThrow(
-      'Invariant Violation: ReactClass: You are attempting to ' +
-      'define `abc` on your component more than once. This conflict may be ' +
-      'due to a mixin.'
+      'ReactClass: You are attempting to define `abc` on your component more ' +
+      'than once. This conflict may be due to a mixin.'
     );
   });
 
@@ -309,9 +307,8 @@ describe('ReactClass-mixin', function() {
         },
       });
     }).toThrow(
-      'Invariant Violation: ReactClass: You are attempting to ' +
-      'define `abc` on your component more than once. This conflict may be ' +
-      'due to a mixin.'
+      'ReactClass: You are attempting to define `abc` on your component ' +
+      'more than once. This conflict may be due to a mixin.'
     );
   });
 
@@ -325,8 +322,8 @@ describe('ReactClass-mixin', function() {
         },
       });
     }).toThrow(
-      'Invariant Violation: ReactClass: You\'re attempting to ' +
-      'use a component as a mixin. Instead, just use a regular object.'
+      'ReactClass: You\'re attempting to use a component as a mixin. ' +
+      'Instead, just use a regular object.'
     );
   });
 
@@ -346,9 +343,8 @@ describe('ReactClass-mixin', function() {
         },
       });
     }).toThrow(
-      'Invariant Violation: ReactClass: You\'re attempting to ' +
-      'use a component class or function as a mixin. Instead, just use a ' +
-      'regular object.'
+      'ReactClass: You\'re attempting to use a component class or function ' +
+      'as a mixin. Instead, just use a regular object.'
     );
   });
 

src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js

@@ -287,9 +287,9 @@ describe('ReactElementValidator', function() {
     expect(function() {
       ReactTestUtils.renderIntoDocument(React.createElement(ParentComp));
     }).toThrow(
-      'Invariant Violation: Element type is invalid: expected a string (for ' +
-      'built-in components) or a class/function (for composite components) ' +
-      'but got: null. Check the render method of `ParentComp`.'
+      'Element type is invalid: expected a string (for built-in components) ' +
+      'or a class/function (for composite components) but got: null. Check ' +
+      'the render method of `ParentComp`.'
     );
     expect(console.error.calls.length).toBe(1);
     expect(console.error.argsForCall[0][0]).toBe(

src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee

@@ -154,7 +154,7 @@ describe 'ReactCoffeeScriptClass', ->
       expect(->
         test React.createElement(Foo), 'span', ''
       ).toThrow(
-        'Invariant Violation: Foo.state: must be set to an object or null'
+        'Foo.state: must be set to an object or null'
       )
 
   it 'should render with null in the initial state property', ->

src/isomorphic/modern/class/__tests__/ReactES6Class-test.js

@@ -176,8 +176,7 @@ describe('ReactES6Class', function() {
         }
       }
       expect(() => test(<Foo />, 'span', '')).toThrow(
-        'Invariant Violation: Foo.state: ' +
-        'must be set to an object or null'
+        'Foo.state: must be set to an object or null'
       );
     });
   });

src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts

@@ -361,18 +361,15 @@ describe('ReactTypeScriptClass', function() {
   it('should throw with non-object in the initial state property', function() {
     expect(() => test(React.createElement(ArrayState), 'span', ''))
     .toThrow(
-      'Invariant Violation: ArrayState.state: ' +
-      'must be set to an object or null'
+      'ArrayState.state: must be set to an object or null'
     );
     expect(() => test(React.createElement(StringState), 'span', ''))
     .toThrow(
-      'Invariant Violation: StringState.state: ' +
-      'must be set to an object or null'
+      'StringState.state: must be set to an object or null'
     );
     expect(() => test(React.createElement(NumberState), 'span', ''))
     .toThrow(
-      'Invariant Violation: NumberState.state: ' +
-      'must be set to an object or null'
+      'NumberState.state: must be set to an object or null'
     );
   });