diff --git a/packages/react-test-renderer/index.js b/packages/react-test-renderer/index.js index 18f41f063e..6835eb5196 100644 --- a/packages/react-test-renderer/index.js +++ b/packages/react-test-renderer/index.js @@ -9,7 +9,7 @@ 'use strict'; -var ReactTestRenderer = require('./src/ReactTestRenderer'); +const ReactTestRenderer = require('./src/ReactTestRenderer'); // TODO: decide on the top-level export form. // This is hacky but makes it work with both Rollup and Jest. diff --git a/packages/react-test-renderer/shallow.js b/packages/react-test-renderer/shallow.js index ae96feb630..3144aa74f9 100644 --- a/packages/react-test-renderer/shallow.js +++ b/packages/react-test-renderer/shallow.js @@ -9,7 +9,7 @@ 'use strict'; -var ReactShallowRenderer = require('./src/ReactShallowRenderer'); +const ReactShallowRenderer = require('./src/ReactShallowRenderer'); // TODO: decide on the top-level export form. // This is hacky but makes it work with both Rollup and Jest. diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js index 5cf10e7bb9..ef50aafa28 100644 --- a/packages/react-test-renderer/src/ReactShallowRenderer.js +++ b/packages/react-test-renderer/src/ReactShallowRenderer.js @@ -247,7 +247,7 @@ class Updater { } } -var currentlyValidatingElement = null; +let currentlyValidatingElement = null; function getDisplayName(element) { if (element == null) { @@ -262,10 +262,10 @@ function getDisplayName(element) { } function getStackAddendum() { - var stack = ''; + let stack = ''; if (currentlyValidatingElement) { - var name = getDisplayName(currentlyValidatingElement); - var owner = currentlyValidatingElement._owner; + const name = getDisplayName(currentlyValidatingElement); + const owner = currentlyValidatingElement._owner; stack += describeComponentFrame( name, currentlyValidatingElement._source, @@ -276,7 +276,7 @@ function getStackAddendum() { } function getName(type, instance) { - var constructor = instance && instance.constructor; + const constructor = instance && instance.constructor; return ( type.displayName || (constructor && constructor.displayName) || diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js index a96dfbc368..24cd1f4bc5 100644 --- a/packages/react-test-renderer/src/ReactTestRenderer.js +++ b/packages/react-test-renderer/src/ReactTestRenderer.js @@ -111,7 +111,7 @@ function removeChild( parentInstance.children.splice(index, 1); } -var TestRenderer = ReactFiberReconciler({ +const TestRenderer = ReactFiberReconciler({ getRootHostContext() { return emptyObject; }, @@ -254,7 +254,7 @@ var TestRenderer = ReactFiberReconciler({ }, }); -var defaultTestOptions = { +const defaultTestOptions = { createNodeMock: function() { return null; }, @@ -289,8 +289,8 @@ function toJSON(inst: Instance | TextInstance): ReactTestRendererNode { } function nodeAndSiblingsTrees(nodeWithSibling: ?Fiber) { - var array = []; - var node = nodeWithSibling; + const array = []; + let node = nodeWithSibling; while (node != null) { array.push(node); node = node.sibling; @@ -561,22 +561,22 @@ function propsMatch(props: Object, filter: Object): boolean { return true; } -var ReactTestRendererFiber = { +const ReactTestRendererFiber = { create(element: React$Element, options: TestRendererOptions) { - var createNodeMock = defaultTestOptions.createNodeMock; + let createNodeMock = defaultTestOptions.createNodeMock; if (options && typeof options.createNodeMock === 'function') { createNodeMock = options.createNodeMock; } - var container = { + let container = { children: [], createNodeMock, tag: 'CONTAINER', }; - var root: FiberRoot | null = TestRenderer.createContainer(container, false); + let root: FiberRoot | null = TestRenderer.createContainer(container, false); invariant(root != null, 'something went wrong'); TestRenderer.updateContainer(element, root, null, null); - var entry = { + const entry = { root: undefined, // makes flow happy // we define a 'getter' for 'root' below using 'Object.defineProperty' toJSON() { diff --git a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js index 6d22d868ec..a551bc35ab 100644 --- a/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js +++ b/packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js @@ -944,25 +944,25 @@ describe('ReactShallowRenderer', () => { spyOnDev(console, 'error'); const shallowRenderer = createRenderer(); - var Undef = undefined; + const Undef = undefined; expect(() => shallowRenderer.render()).toThrowError( 'ReactShallowRenderer render(): Shallow rendering works only with custom ' + 'components, but the provided element type was `undefined`.', ); - var Null = null; + const Null = null; expect(() => shallowRenderer.render()).toThrowError( 'ReactShallowRenderer render(): Shallow rendering works only with custom ' + 'components, but the provided element type was `null`.', ); - var Arr = []; + const Arr = []; expect(() => shallowRenderer.render()).toThrowError( 'ReactShallowRenderer render(): Shallow rendering works only with custom ' + 'components, but the provided element type was `array`.', ); - var Obj = {}; + const Obj = {}; expect(() => shallowRenderer.render()).toThrowError( 'ReactShallowRenderer render(): Shallow rendering works only with custom ' + 'components, but the provided element type was `object`.', diff --git a/packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.js b/packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.js index a5278f55f2..a1dae0c79e 100644 --- a/packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.js +++ b/packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.js @@ -9,9 +9,9 @@ 'use strict'; -var React = require('react'); -var ReactTestRenderer = require('react-test-renderer'); -var prettyFormat = require('pretty-format'); +const React = require('react'); +const ReactTestRenderer = require('react-test-renderer'); +const prettyFormat = require('pretty-format'); // Kind of hacky, but we nullify all the instances to test the tree structure // with jasmine's deep equality function, and test the instances separate. We @@ -30,7 +30,7 @@ function cleanNodeOrArray(node) { } if (node && node.props && node.props.children) { // eslint-disable-next-line no-unused-vars - var {children, ...props} = node.props; + const {children, ...props} = node.props; node.props = props; } if (Array.isArray(node.rendered)) { @@ -49,7 +49,7 @@ describe('ReactTestRenderer', () => { function Link() { return ; } - var renderer = ReactTestRenderer.create(); + const renderer = ReactTestRenderer.create(); expect(renderer.toJSON()).toEqual({ type: 'a', props: {role: 'link'}, @@ -61,7 +61,7 @@ describe('ReactTestRenderer', () => { function Empty() { return null; } - var renderer = ReactTestRenderer.create(); + const renderer = ReactTestRenderer.create(); expect(renderer.toJSON()).toEqual(null); }); @@ -69,12 +69,12 @@ describe('ReactTestRenderer', () => { function Link() { return ; } - var renderer = ReactTestRenderer.create(); - var object = renderer.toJSON(); + const renderer = ReactTestRenderer.create(); + const object = renderer.toJSON(); expect(object.$$typeof).toBe(Symbol.for('react.test.json')); // $$typeof should not be enumerable. - for (var key in object) { + for (const key in object) { if (object.hasOwnProperty(key)) { expect(key).not.toBe('$$typeof'); } @@ -92,11 +92,11 @@ describe('ReactTestRenderer', () => { } } - var Child = () => { + const Child = () => { return ; }; - var renderer = ReactTestRenderer.create(); + const renderer = ReactTestRenderer.create(); expect(renderer.toJSON()).toEqual({ type: 'div', props: {className: 'purple'}, @@ -105,7 +105,7 @@ describe('ReactTestRenderer', () => { }); it('renders some basics with an update', () => { - var renders = 0; + let renders = 0; class Component extends React.Component { state = {x: 3}; @@ -126,17 +126,17 @@ describe('ReactTestRenderer', () => { } } - var Child = () => { + const Child = () => { renders++; return ; }; - var Null = () => { + const Null = () => { renders++; return null; }; - var renderer = ReactTestRenderer.create(); + const renderer = ReactTestRenderer.create(); expect(renderer.toJSON()).toEqual({ type: 'div', props: {className: 'purple'}, @@ -158,7 +158,7 @@ describe('ReactTestRenderer', () => { return
{this.state.mouse}
; } } - var renderer = ReactTestRenderer.create(); + const renderer = ReactTestRenderer.create(); expect(renderer.toJSON()).toEqual({ type: 'div', @@ -166,7 +166,7 @@ describe('ReactTestRenderer', () => { children: ['mouse'], }); - var mouse = renderer.getInstance(); + const mouse = renderer.getInstance(); mouse.handleMoose(); expect(renderer.toJSON()).toEqual({ type: 'div', @@ -176,7 +176,7 @@ describe('ReactTestRenderer', () => { }); it('updates types', () => { - var renderer = ReactTestRenderer.create(
mouse
); + const renderer = ReactTestRenderer.create(
mouse
); expect(renderer.toJSON()).toEqual({ type: 'div', props: {}, @@ -192,7 +192,7 @@ describe('ReactTestRenderer', () => { }); it('updates children', () => { - var renderer = ReactTestRenderer.create( + const renderer = ReactTestRenderer.create(
A B @@ -228,7 +228,7 @@ describe('ReactTestRenderer', () => { }); it('does the full lifecycle', () => { - var log = []; + const log = []; class Log extends React.Component { render() { log.push('render ' + this.props.name); @@ -242,7 +242,7 @@ describe('ReactTestRenderer', () => { } } - var renderer = ReactTestRenderer.create(); + const renderer = ReactTestRenderer.create(); renderer.update(); renderer.unmount(); @@ -257,7 +257,7 @@ describe('ReactTestRenderer', () => { }); it('gives a ref to native components', () => { - var log = []; + const log = []; ReactTestRenderer.create(
log.push(r)} />); expect(log).toEqual([null]); }); @@ -291,11 +291,11 @@ describe('ReactTestRenderer', () => { }); it('allows an optional createNodeMock function', () => { - var mockDivInstance = {appendChild: () => {}}; - var mockInputInstance = {focus: () => {}}; - var mockListItemInstance = {click: () => {}}; - var mockAnchorInstance = {hover: () => {}}; - var log = []; + const mockDivInstance = {appendChild: () => {}}; + const mockInputInstance = {focus: () => {}}; + const mockListItemInstance = {click: () => {}}; + const mockAnchorInstance = {hover: () => {}}; + const log = []; class Foo extends React.Component { componentDidMount() { log.push(this.refs.bar); @@ -404,7 +404,7 @@ describe('ReactTestRenderer', () => { }); it('supports error boundaries', () => { - var log = []; + const log = []; class Angry extends React.Component { render() { log.push('Angry render'); @@ -450,7 +450,7 @@ describe('ReactTestRenderer', () => { } } - var renderer = ReactTestRenderer.create(); + const renderer = ReactTestRenderer.create(); expect(renderer.toJSON()).toEqual({ type: 'div', props: {}, @@ -471,7 +471,7 @@ describe('ReactTestRenderer', () => { } } - var renderer = ReactTestRenderer.create(Hi); + const renderer = ReactTestRenderer.create(Hi); expect(renderer.toJSON()).toEqual({ type: 'div', children: ['Hi'], @@ -514,10 +514,10 @@ describe('ReactTestRenderer', () => { }); it('toTree() renders simple components returning host components', () => { - var Qoo = () => Hello World!; + const Qoo = () => Hello World!; - var renderer = ReactTestRenderer.create(); - var tree = renderer.toTree(); + const renderer = ReactTestRenderer.create(); + const tree = renderer.toTree(); cleanNodeOrArray(tree); @@ -545,8 +545,8 @@ describe('ReactTestRenderer', () => { } } - var renderer = ReactTestRenderer.create(); - var tree = renderer.toTree(); + const renderer = ReactTestRenderer.create(); + const tree = renderer.toTree(); expect(tree.instance).toBeInstanceOf(Foo); @@ -571,7 +571,7 @@ describe('ReactTestRenderer', () => { , ); - var tree = renderer.toTree(); + const tree = renderer.toTree(); cleanNodeOrArray(tree); @@ -621,7 +621,7 @@ describe('ReactTestRenderer', () => {
, ); - var tree = renderer.toTree(); + const tree = renderer.toTree(); cleanNodeOrArray(tree); @@ -680,22 +680,22 @@ describe('ReactTestRenderer', () => { }); it('root instance and createNodeMock ref return the same value', () => { - var createNodeMock = ref => ({node: ref}); - var refInst = null; - var renderer = ReactTestRenderer.create( + const createNodeMock = ref => ({node: ref}); + let refInst = null; + const renderer = ReactTestRenderer.create(
(refInst = ref)} />, {createNodeMock}, ); - var root = renderer.getInstance(); + const root = renderer.getInstance(); expect(root).toEqual(refInst); }); it('toTree() renders complicated trees of composites and hosts', () => { // SFC returning host. no children props. - var Qoo = () => Hello World!; + const Qoo = () => Hello World!; // SFC returning host. passes through children. - var Foo = ({className, children}) => ( + const Foo = ({className, children}) => (
Literal {children} @@ -721,8 +721,8 @@ describe('ReactTestRenderer', () => { } } - var renderer = ReactTestRenderer.create(); - var tree = renderer.toTree(); + const renderer = ReactTestRenderer.create(); + const tree = renderer.toTree(); // we test for the presence of instances before nulling them out expect(tree.instance).toBeInstanceOf(Bam); @@ -781,7 +781,7 @@ describe('ReactTestRenderer', () => { }); it('can update text nodes when rendered as root', () => { - var renderer = ReactTestRenderer.create(['Hello', 'world']); + const renderer = ReactTestRenderer.create(['Hello', 'world']); expect(renderer.toJSON()).toEqual(['Hello', 'world']); renderer.update(42); expect(renderer.toJSON()).toEqual('42'); @@ -790,9 +790,9 @@ describe('ReactTestRenderer', () => { }); it('can render and update root fragments', () => { - var Component = props => props.children; + const Component = props => props.children; - var renderer = ReactTestRenderer.create([ + const renderer = ReactTestRenderer.create([ Hi, Bye, ]);