From b98b6ea2acf09119f45c9722e1650b8086503884 Mon Sep 17 00:00:00 2001 From: Ben Alpert Date: Mon, 10 Aug 2015 15:07:58 -0700 Subject: [PATCH] Clean up files before automated codemod --- .../wrappers/__tests__/ReactDOMInput-test.js | 18 ++++++------ .../__tests__/ReactDOMComponent-test.js | 28 ++++--------------- 2 files changed, 15 insertions(+), 31 deletions(-) diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js index 582834c270..fa52d43065 100644 --- a/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js +++ b/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js @@ -279,7 +279,7 @@ describe('ReactDOMInput', function() { var link = new ReactLink('yolo', mocks.getMockFunction()); var instance = ; - expect(React.render.bind(React, instance, node)).not.toThrow(); + expect(() => React.render(instance, node)).not.toThrow(); instance = ; - expect(React.render.bind(React, instance, node)).toThrow(); + expect(() => React.render(instance, node)).toThrow(); instance = ; - expect(React.render.bind(React, instance, node)).toThrow(); + expect(() => React.render(instance, node)).toThrow(); }); @@ -353,7 +353,7 @@ describe('ReactDOMInput', function() { var link = new ReactLink(true, mocks.getMockFunction()); var instance = ; - expect(React.render.bind(React, instance, node)).not.toThrow(); + expect(() => React.render(instance, node)).not.toThrow(); instance = ; - expect(React.render.bind(React, instance, node)).toThrow(); + expect(() => React.render(instance, node)).toThrow(); instance = ; - expect(React.render.bind(React, instance, node)).toThrow(); + expect(() => React.render(instance, node)).toThrow(); }); @@ -375,13 +375,13 @@ describe('ReactDOMInput', function() { var link = new ReactLink(true, mocks.getMockFunction()); var instance = ; - expect(React.render.bind(React, instance, node)).not.toThrow(); + expect(() => React.render(instance, node)).not.toThrow(); instance = ; - expect(React.render.bind(React, instance, node)).not.toThrow(); + expect(() => React.render(instance, node)).not.toThrow(); instance = ; - expect(React.render.bind(React, instance, node)).toThrow(); + expect(() => React.render(instance, node)).toThrow(); }); }); diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js index 445fd2f04b..1bf37fcdee 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js @@ -15,14 +15,17 @@ var assign = require('Object.assign'); var mocks = require('mocks'); describe('ReactDOMComponent', function() { + var React; + + beforeEach(function() { + require('mock-modules').dumpCache(); + React = require('React'); + }); describe('updateDOM', function() { - var React; var ReactTestUtils; beforeEach(function() { - require('mock-modules').dumpCache(); - React = require('React'); ReactTestUtils = require('ReactTestUtils'); }); @@ -371,8 +374,6 @@ describe('ReactDOMComponent', function() { } beforeEach(function() { - require('mock-modules').dumpCache(); - var ReactDefaultInjection = require('ReactDefaultInjection'); ReactDefaultInjection.inject(); @@ -425,8 +426,6 @@ describe('ReactDOMComponent', function() { } beforeEach(function() { - require('mock-modules').dumpCache(); - var ReactDOMComponent = require('ReactDOMComponent'); var ReactReconcileTransaction = require('ReactReconcileTransaction'); @@ -462,14 +461,9 @@ describe('ReactDOMComponent', function() { }); describe('mountComponent', function() { - var React; var mountComponent; beforeEach(function() { - require('mock-modules').dumpCache(); - - React = require('React'); - mountComponent = function(props) { var container = document.createElement('div'); React.render(
, container); @@ -657,11 +651,9 @@ describe('ReactDOMComponent', function() { }); describe('updateComponent', function() { - var React; var container; beforeEach(function() { - React = require('React'); container = document.createElement('div'); }); @@ -744,7 +736,6 @@ describe('ReactDOMComponent', function() { describe('unmountComponent', function() { it('should clean up listeners', function() { - var React = require('React'); var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter'); var ReactMount = require('ReactMount'); @@ -780,7 +771,6 @@ describe('ReactDOMComponent', function() { var isEventSupported = require('isEventSupported'); isEventSupported.mockReturnValueOnce(false); - var React = require('React'); var ReactTestUtils = require('ReactTestUtils'); spyOn(console, 'error'); @@ -794,7 +784,6 @@ describe('ReactDOMComponent', function() { describe('tag sanitization', function() { it('should throw when an invalid tag name is used', () => { - var React = require('React'); var ReactTestUtils = require('ReactTestUtils'); var hackzor = React.createElement('script tag'); expect( @@ -805,7 +794,6 @@ describe('ReactDOMComponent', function() { }); it('should throw when an attack vector is used', () => { - var React = require('React'); var ReactTestUtils = require('ReactTestUtils'); var hackzor = React.createElement('div>