@samitouri / QOS-React / commits / 2a1b1f3094

react-test-renderer: convert vars into let/const (#11731)

Raphael Amorim committed Nov 30, 2017 at 22:01 UTC 2a1b1f3094e524338b3eb3de51b23921576f02f5

6 files changed +68 -68

packages/react-test-renderer/index.js

+1 -1

@@ -9,7 +9,7 @@

10 'use strict';

12 -var ReactTestRenderer = require('./src/ReactTestRenderer');

12 +const ReactTestRenderer = require('./src/ReactTestRenderer');

14 // TODO: decide on the top-level export form.

15 // This is hacky but makes it work with both Rollup and Jest.

packages/react-test-renderer/shallow.js

+1 -1

@@ -9,7 +9,7 @@

10 'use strict';

12 -var ReactShallowRenderer = require('./src/ReactShallowRenderer');

12 +const ReactShallowRenderer = require('./src/ReactShallowRenderer');

14 // TODO: decide on the top-level export form.

15 // This is hacky but makes it work with both Rollup and Jest.

packages/react-test-renderer/src/ReactShallowRenderer.js

+5 -5

@@ -247,7 +247,7 @@ class Updater {

247 }

248 }

249

250 -var currentlyValidatingElement = null;

250 +let currentlyValidatingElement = null;

251

252 function getDisplayName(element) {

253 if (element == null) {

@@ -262,10 +262,10 @@ function getDisplayName(element) {

262 }

263

264 function getStackAddendum() {

265 - var stack = '';

265 + let stack = '';

266 if (currentlyValidatingElement) {

267 - var name = getDisplayName(currentlyValidatingElement);

268 - var owner = currentlyValidatingElement._owner;

267 + const name = getDisplayName(currentlyValidatingElement);

268 + const owner = currentlyValidatingElement._owner;

269 stack += describeComponentFrame(

270 name,

271 currentlyValidatingElement._source,

@@ -276,7 +276,7 @@ function getStackAddendum() {

276 }

277

278 function getName(type, instance) {

279 - var constructor = instance && instance.constructor;

279 + const constructor = instance && instance.constructor;

280 return (

281 type.displayName ||

282 (constructor && constructor.displayName) ||

packages/react-test-renderer/src/ReactTestRenderer.js

+9 -9

@@ -111,7 +111,7 @@ function removeChild(

111 parentInstance.children.splice(index, 1);

112 }

113

114 -var TestRenderer = ReactFiberReconciler({

114 +const TestRenderer = ReactFiberReconciler({

115 getRootHostContext() {

116 return emptyObject;

117 },

@@ -254,7 +254,7 @@ var TestRenderer = ReactFiberReconciler({

254 },

255 });

256

257 -var defaultTestOptions = {

257 +const defaultTestOptions = {

258 createNodeMock: function() {

259 return null;

260 },

@@ -289,8 +289,8 @@ function toJSON(inst: Instance | TextInstance): ReactTestRendererNode {

289 }

290

291 function nodeAndSiblingsTrees(nodeWithSibling: ?Fiber) {

292 - var array = [];

293 - var node = nodeWithSibling;

292 + const array = [];

293 + let node = nodeWithSibling;

294 while (node != null) {

295 array.push(node);

296 node = node.sibling;

@@ -561,22 +561,22 @@ function propsMatch(props: Object, filter: Object): boolean {

561 return true;

562 }

563

564 -var ReactTestRendererFiber = {

564 +const ReactTestRendererFiber = {

565 create(element: React$Element<any>, options: TestRendererOptions) {

566 - var createNodeMock = defaultTestOptions.createNodeMock;

566 + let createNodeMock = defaultTestOptions.createNodeMock;

567 if (options && typeof options.createNodeMock === 'function') {

568 createNodeMock = options.createNodeMock;

569 }

570 - var container = {

570 + let container = {

571 children: [],

572 createNodeMock,

573 tag: 'CONTAINER',

574 };

575 - var root: FiberRoot | null = TestRenderer.createContainer(container, false);

575 + let root: FiberRoot | null = TestRenderer.createContainer(container, false);

576 invariant(root != null, 'something went wrong');

577 TestRenderer.updateContainer(element, root, null, null);

578

579 - var entry = {

579 + const entry = {

580 root: undefined, // makes flow happy

581 // we define a 'getter' for 'root' below using 'Object.defineProperty'

582 toJSON() {

packages/react-test-renderer/src/__tests__/ReactShallowRenderer-test.js

+4 -4

@@ -944,25 +944,25 @@ describe('ReactShallowRenderer', () => {

944 spyOnDev(console, 'error');

945 const shallowRenderer = createRenderer();

946

947 - var Undef = undefined;

947 + const Undef = undefined;

948 expect(() => shallowRenderer.render(<Undef />)).toThrowError(

949 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +

950 'components, but the provided element type was `undefined`.',

951 );

952

953 - var Null = null;

953 + const Null = null;

954 expect(() => shallowRenderer.render(<Null />)).toThrowError(

955 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +

956 'components, but the provided element type was `null`.',

957 );

958

959 - var Arr = [];

959 + const Arr = [];

960 expect(() => shallowRenderer.render(<Arr />)).toThrowError(

961 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +

962 'components, but the provided element type was `array`.',

963 );

964

965 - var Obj = {};

965 + const Obj = {};

966 expect(() => shallowRenderer.render(<Obj />)).toThrowError(

967 'ReactShallowRenderer render(): Shallow rendering works only with custom ' +

968 'components, but the provided element type was `object`.',

packages/react-test-renderer/src/__tests__/ReactTestRenderer-test.js

+48 -48

@@ -9,9 +9,9 @@

10 'use strict';

12 -var React = require('react');

13 -var ReactTestRenderer = require('react-test-renderer');

14 -var prettyFormat = require('pretty-format');

12 +const React = require('react');

13 +const ReactTestRenderer = require('react-test-renderer');

14 +const prettyFormat = require('pretty-format');

16 // Kind of hacky, but we nullify all the instances to test the tree structure

17 // with jasmine's deep equality function, and test the instances separate. We

@@ -30,7 +30,7 @@ function cleanNodeOrArray(node) {

30 }

31 if (node && node.props && node.props.children) {

32 // eslint-disable-next-line no-unused-vars

33 - var {children, ...props} = node.props;

33 + const {children, ...props} = node.props;

34 node.props = props;

35 }

36 if (Array.isArray(node.rendered)) {

@@ -49,7 +49,7 @@ describe('ReactTestRenderer', () => {

49 function Link() {

50 return <a role="link" />;

51 }

52 - var renderer = ReactTestRenderer.create(<Link />);

52 + const renderer = ReactTestRenderer.create(<Link />);

53 expect(renderer.toJSON()).toEqual({

54 type: 'a',

55 props: {role: 'link'},

@@ -61,7 +61,7 @@ describe('ReactTestRenderer', () => {

61 function Empty() {

62 return null;

63 }

64 - var renderer = ReactTestRenderer.create(<Empty />);

64 + const renderer = ReactTestRenderer.create(<Empty />);

65 expect(renderer.toJSON()).toEqual(null);

66 });

@@ -69,12 +69,12 @@ describe('ReactTestRenderer', () => {

69 function Link() {

70 return <a role="link" />;

71 }

72 - var renderer = ReactTestRenderer.create(<Link />);

73 - var object = renderer.toJSON();

72 + const renderer = ReactTestRenderer.create(<Link />);

73 + const object = renderer.toJSON();

74 expect(object.$$typeof).toBe(Symbol.for('react.test.json'));

76 // $$typeof should not be enumerable.

77 - for (var key in object) {

77 + for (const key in object) {

78 if (object.hasOwnProperty(key)) {

79 expect(key).not.toBe('$$typeof');

80 }

@@ -92,11 +92,11 @@ describe('ReactTestRenderer', () => {

92 }

93 }

95 - var Child = () => {

95 + const Child = () => {

96 return <moo />;

97 };

99 - var renderer = ReactTestRenderer.create(<Component />);

99 + const renderer = ReactTestRenderer.create(<Component />);

100 expect(renderer.toJSON()).toEqual({

101 type: 'div',

102 props: {className: 'purple'},

@@ -105,7 +105,7 @@ describe('ReactTestRenderer', () => {

105 });

106

107 it('renders some basics with an update', () => {

108 - var renders = 0;

108 + let renders = 0;

109

110 class Component extends React.Component {

111 state = {x: 3};

@@ -126,17 +126,17 @@ describe('ReactTestRenderer', () => {

126 }

127 }

128

129 - var Child = () => {

129 + const Child = () => {

130 renders++;

131 return <moo />;

132 };

133

134 - var Null = () => {

134 + const Null = () => {

135 renders++;

136 return null;

137 };

138

139 - var renderer = ReactTestRenderer.create(<Component />);

139 + const renderer = ReactTestRenderer.create(<Component />);

140 expect(renderer.toJSON()).toEqual({

141 type: 'div',

142 props: {className: 'purple'},

@@ -158,7 +158,7 @@ describe('ReactTestRenderer', () => {

158 return <div>{this.state.mouse}</div>;

159 }

160 }

161 - var renderer = ReactTestRenderer.create(<Mouse />);

161 + const renderer = ReactTestRenderer.create(<Mouse />);

162

163 expect(renderer.toJSON()).toEqual({

164 type: 'div',

@@ -166,7 +166,7 @@ describe('ReactTestRenderer', () => {

166 children: ['mouse'],

167 });

168

169 - var mouse = renderer.getInstance();

169 + const mouse = renderer.getInstance();

170 mouse.handleMoose();

171 expect(renderer.toJSON()).toEqual({

172 type: 'div',

@@ -176,7 +176,7 @@ describe('ReactTestRenderer', () => {

176 });

177

178 it('updates types', () => {

179 - var renderer = ReactTestRenderer.create(<div>mouse</div>);

179 + const renderer = ReactTestRenderer.create(<div>mouse</div>);

180 expect(renderer.toJSON()).toEqual({

181 type: 'div',

182 props: {},

@@ -192,7 +192,7 @@ describe('ReactTestRenderer', () => {

192 });

193

194 it('updates children', () => {

195 - var renderer = ReactTestRenderer.create(

195 + const renderer = ReactTestRenderer.create(

196 <div>

197 <span key="a">A</span>

198 <span key="b">B</span>

@@ -228,7 +228,7 @@ describe('ReactTestRenderer', () => {

228 });

229

230 it('does the full lifecycle', () => {

231 - var log = [];

231 + const log = [];

232 class Log extends React.Component {

233 render() {

234 log.push('render ' + this.props.name);

@@ -242,7 +242,7 @@ describe('ReactTestRenderer', () => {

242 }

243 }

244

245 - var renderer = ReactTestRenderer.create(<Log key="foo" name="Foo" />);

245 + const renderer = ReactTestRenderer.create(<Log key="foo" name="Foo" />);

246 renderer.update(<Log key="bar" name="Bar" />);

247 renderer.unmount();

248

@@ -257,7 +257,7 @@ describe('ReactTestRenderer', () => {

257 });

258

259 it('gives a ref to native components', () => {

260 - var log = [];

260 + const log = [];

261 ReactTestRenderer.create(<div ref={r => log.push(r)} />);

262 expect(log).toEqual([null]);

263 });

@@ -291,11 +291,11 @@ describe('ReactTestRenderer', () => {

291 });

292

293 it('allows an optional createNodeMock function', () => {

294 - var mockDivInstance = {appendChild: () => {}};

295 - var mockInputInstance = {focus: () => {}};

296 - var mockListItemInstance = {click: () => {}};

297 - var mockAnchorInstance = {hover: () => {}};

298 - var log = [];

294 + const mockDivInstance = {appendChild: () => {}};

295 + const mockInputInstance = {focus: () => {}};

296 + const mockListItemInstance = {click: () => {}};

297 + const mockAnchorInstance = {hover: () => {}};

298 + const log = [];

299 class Foo extends React.Component {

300 componentDidMount() {

301 log.push(this.refs.bar);

@@ -404,7 +404,7 @@ describe('ReactTestRenderer', () => {

404 });

405

406 it('supports error boundaries', () => {

407 - var log = [];

407 + const log = [];

408 class Angry extends React.Component {

409 render() {

410 log.push('Angry render');

@@ -450,7 +450,7 @@ describe('ReactTestRenderer', () => {

450 }

451 }

452

453 - var renderer = ReactTestRenderer.create(<Boundary />);

453 + const renderer = ReactTestRenderer.create(<Boundary />);

454 expect(renderer.toJSON()).toEqual({

455 type: 'div',

456 props: {},

@@ -471,7 +471,7 @@ describe('ReactTestRenderer', () => {

471 }

472 }

473

474 - var renderer = ReactTestRenderer.create(<Component>Hi</Component>);

474 + const renderer = ReactTestRenderer.create(<Component>Hi</Component>);

475 expect(renderer.toJSON()).toEqual({

476 type: 'div',

477 children: ['Hi'],

@@ -514,10 +514,10 @@ describe('ReactTestRenderer', () => {

514 });

515

516 it('toTree() renders simple components returning host components', () => {

517 - var Qoo = () => <span className="Qoo">Hello World!</span>;

517 + const Qoo = () => <span className="Qoo">Hello World!</span>;

518

519 - var renderer = ReactTestRenderer.create(<Qoo />);

520 - var tree = renderer.toTree();

519 + const renderer = ReactTestRenderer.create(<Qoo />);

520 + const tree = renderer.toTree();

521

522 cleanNodeOrArray(tree);

523

@@ -545,8 +545,8 @@ describe('ReactTestRenderer', () => {

545 }

546 }

547

548 - var renderer = ReactTestRenderer.create(<Foo />);

549 - var tree = renderer.toTree();

548 + const renderer = ReactTestRenderer.create(<Foo />);

549 + const tree = renderer.toTree();

550

551 expect(tree.instance).toBeInstanceOf(Foo);

552

@@ -571,7 +571,7 @@ describe('ReactTestRenderer', () => {

571 </Foo>,

572 );

573

574 - var tree = renderer.toTree();

574 + const tree = renderer.toTree();

575

576 cleanNodeOrArray(tree);

577

@@ -621,7 +621,7 @@ describe('ReactTestRenderer', () => {

621 </div>,

622 );

623

624 - var tree = renderer.toTree();

624 + const tree = renderer.toTree();

625

626 cleanNodeOrArray(tree);

627

@@ -680,22 +680,22 @@ describe('ReactTestRenderer', () => {

680 });

681

682 it('root instance and createNodeMock ref return the same value', () => {

683 - var createNodeMock = ref => ({node: ref});

684 - var refInst = null;

685 - var renderer = ReactTestRenderer.create(

683 + const createNodeMock = ref => ({node: ref});

684 + let refInst = null;

685 + const renderer = ReactTestRenderer.create(

686 <div ref={ref => (refInst = ref)} />,

687 {createNodeMock},

688 );

689 - var root = renderer.getInstance();

689 + const root = renderer.getInstance();

690 expect(root).toEqual(refInst);

691 });

692

693 it('toTree() renders complicated trees of composites and hosts', () => {

694 // SFC returning host. no children props.

695 - var Qoo = () => <span className="Qoo">Hello World!</span>;

695 + const Qoo = () => <span className="Qoo">Hello World!</span>;

696

697 // SFC returning host. passes through children.

698 - var Foo = ({className, children}) => (

698 + const Foo = ({className, children}) => (

699 <div className={'Foo ' + className}>

700 <span className="Foo2">Literal</span>

701 {children}

@@ -721,8 +721,8 @@ describe('ReactTestRenderer', () => {

721 }

722 }

723

724 - var renderer = ReactTestRenderer.create(<Bam />);

725 - var tree = renderer.toTree();

724 + const renderer = ReactTestRenderer.create(<Bam />);

725 + const tree = renderer.toTree();

726

727 // we test for the presence of instances before nulling them out

728 expect(tree.instance).toBeInstanceOf(Bam);

@@ -781,7 +781,7 @@ describe('ReactTestRenderer', () => {

781 });

782

783 it('can update text nodes when rendered as root', () => {

784 - var renderer = ReactTestRenderer.create(['Hello', 'world']);

784 + const renderer = ReactTestRenderer.create(['Hello', 'world']);

785 expect(renderer.toJSON()).toEqual(['Hello', 'world']);

786 renderer.update(42);

787 expect(renderer.toJSON()).toEqual('42');

@@ -790,9 +790,9 @@ describe('ReactTestRenderer', () => {

790 });

791

792 it('can render and update root fragments', () => {

793 - var Component = props => props.children;

793 + const Component = props => props.children;

794

795 - var renderer = ReactTestRenderer.create([

795 + const renderer = ReactTestRenderer.create([

796 <Component key="a">Hi</Component>,

797 <Component key="b">Bye</Component>,

798 ]);