From 4dde417214fa48185246cddade518c57f6de32af Mon Sep 17 00:00:00 2001 From: Ben Alpert Date: Tue, 24 Mar 2015 13:37:39 -0700 Subject: [PATCH] Fix tests after merge Test Plan: jest --- .../ui/__tests__/ReactDOMComponent-test.js | 18 +++++++++--------- src/classic/class/__tests__/ReactClass-test.js | 4 ++-- src/core/__tests__/ReactComponent-test.js | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/browser/ui/__tests__/ReactDOMComponent-test.js b/src/browser/ui/__tests__/ReactDOMComponent-test.js index bbe843a48b..b436ee4a93 100644 --- a/src/browser/ui/__tests__/ReactDOMComponent-test.js +++ b/src/browser/ui/__tests__/ReactDOMComponent-test.js @@ -663,28 +663,28 @@ describe('ReactDOMComponent', function() { }); it('warns on invalid nesting', () => { - spyOn(console, 'warn'); + spyOn(console, 'error'); ReactTestUtils.renderIntoDocument(
); - expect(console.warn.calls.length).toBe(1); - expect(console.warn.calls[0].args[0]).toBe( + expect(console.error.calls.length).toBe(1); + expect(console.error.calls[0].args[0]).toBe( 'Warning: validateDOMNesting(...):
cannot contain a node.' ); }); it('warns on invalid nesting at root', () => { - spyOn(console, 'warn'); + spyOn(console, 'error'); var p = document.createElement('p'); React.render(, p); - expect(console.warn.calls.length).toBe(1); - expect(console.warn.calls[0].args[0]).toBe( + expect(console.error.calls.length).toBe(1); + expect(console.error.calls[0].args[0]).toBe( 'Warning: validateDOMNesting(...):

cannot contain a node.' ); }); it('warns nicely for table rows', () => { - spyOn(console, 'warn'); + spyOn(console, 'error'); var Foo = React.createClass({ render: function() { return
; @@ -692,8 +692,8 @@ describe('ReactDOMComponent', function() { }); ReactTestUtils.renderIntoDocument(); - expect(console.warn.calls.length).toBe(1); - expect(console.warn.calls[0].args[0]).toBe( + expect(console.error.calls.length).toBe(1); + expect(console.error.calls[0].args[0]).toBe( 'Warning: validateDOMNesting(...): cannot contain a ' + 'node. Add a to your code to match the DOM tree generated by ' + 'the browser. Check the render method of `Foo`.' diff --git a/src/classic/class/__tests__/ReactClass-test.js b/src/classic/class/__tests__/ReactClass-test.js index af525acedc..8986eb1ad4 100644 --- a/src/classic/class/__tests__/ReactClass-test.js +++ b/src/classic/class/__tests__/ReactClass-test.js @@ -390,8 +390,8 @@ describe('ReactClass-spec', function() { instance.getDOMNode(); - expect(console.warn.calls.length).toBe(1); - expect(console.warn.calls[0].args[0]).toContain( + expect(console.error.calls.length).toBe(1); + expect(console.error.calls[0].args[0]).toContain( 'MyComponent.getDOMNode(...) is deprecated. Please use ' + 'React.findDOMNode(instance) instead.' ); diff --git a/src/core/__tests__/ReactComponent-test.js b/src/core/__tests__/ReactComponent-test.js index 05893fc304..675672acb5 100644 --- a/src/core/__tests__/ReactComponent-test.js +++ b/src/core/__tests__/ReactComponent-test.js @@ -266,15 +266,15 @@ describe('ReactComponent', function() { }); it('warns when calling getDOMNode', function() { - spyOn(console, 'warn'); + spyOn(console, 'error'); var container = document.createElement('div'); var instance = React.render(
, container); instance.getDOMNode(); - expect(console.warn.calls.length).toBe(1); - expect(console.warn.calls[0].args[0]).toContain( + expect(console.error.calls.length).toBe(1); + expect(console.error.calls[0].args[0]).toContain( 'DIV.getDOMNode(...) is deprecated. Please use ' + 'React.findDOMNode(instance) instead.' );