From a269e7ec3ff78fa64d1b73de2486d84563238183 Mon Sep 17 00:00:00 2001 From: Ben Alpert Date: Tue, 28 Feb 2017 09:03:08 -0800 Subject: [PATCH] Enable react/jsx-space-before-closing rule (#9077) We mostly do this but not 100%; I fixed the stragglers here with `./node_modules/.bin/eslint --fix src` and enabled the lint rule. --- .eslintrc.js | 1 + .../__tests__/ReactCSSTransitionGroup-test.js | 6 +-- .../__tests__/ReactTransitionGroup-test.js | 2 +- .../__tests__/ReactContextValidator-test.js | 8 ++-- .../element/__tests__/ReactElement-test.js | 2 +- .../__tests__/ReactComponent-test.js | 16 +++---- .../__tests__/ReactComponentLifeCycle-test.js | 6 +-- .../__tests__/ReactCompositeComponent-test.js | 8 ++-- .../__tests__/ReactMultiChild-test.js | 8 ++-- .../__tests__/refs-destruction-test.js | 6 +-- src/renderers/__tests__/refs-test.js | 2 +- .../__tests__/CSSPropertyOperations-test.js | 4 +- .../dom/shared/__tests__/ReactDOM-test.js | 2 +- .../__tests__/ReactDOMComponent-test.js | 48 +++++++++---------- .../__tests__/ReactDOMTextComponent-test.js | 4 +- .../__tests__/ReactServerRendering-test.js | 6 +-- .../dom/shared/__tests__/findDOMNode-test.js | 4 +- .../__tests__/ChangeEventPlugin-test.js | 18 +++---- .../wrappers/__tests__/ReactDOMInput-test.js | 2 +- .../wrappers/__tests__/ReactDOMSelect-test.js | 4 +- .../ReactIncrementalErrorHandling-test.js | 18 +++---- .../ReactIncrementalSideEffects-test.js | 2 +- 22 files changed, 89 insertions(+), 88 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 9cc7d1d024..fda855f401 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -43,6 +43,7 @@ module.exports = { 'react/jsx-no-undef': ERROR, // We don't care to do this 'react/jsx-sort-prop-types': OFF, + 'react/jsx-space-before-closing': ERROR, 'react/jsx-uses-react': ERROR, 'react/no-is-mounted': OFF, // This isn't useful in our test code diff --git a/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js b/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js index 6f52435d82..858fb46fdf 100644 --- a/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js +++ b/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js @@ -283,8 +283,8 @@ describe('ReactCSSTransitionGroup', () => { } } - ReactDOM.render(, container); - ReactDOM.render(, container); + ReactDOM.render(, container); + ReactDOM.render(, container); ReactDOM.unmountComponentAtNode(container); @@ -322,7 +322,7 @@ describe('ReactCSSTransitionGroup', () => { } } - ReactDOM.render(, container); + ReactDOM.render(, container); // Testing that no exception is thrown here, as the timeout has been cleared. jest.runAllTimers(); diff --git a/src/addons/transitions/__tests__/ReactTransitionGroup-test.js b/src/addons/transitions/__tests__/ReactTransitionGroup-test.js index 14d1713917..248a5e08b2 100644 --- a/src/addons/transitions/__tests__/ReactTransitionGroup-test.js +++ b/src/addons/transitions/__tests__/ReactTransitionGroup-test.js @@ -297,7 +297,7 @@ describe('ReactTransitionGroup', () => { class Component extends React.Component { render() { - var children = [
,
]; + var children = [
,
]; return {children}; } } diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js index a5a04430aa..4eab5185cb 100644 --- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js +++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js @@ -311,7 +311,7 @@ describe('ReactContextValidator', () => { } } - ReactTestUtils.renderIntoDocument(); + ReactTestUtils.renderIntoDocument(); expectDev(console.error.calls.count()).toBe(1); expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe( 'Warning: ComponentA.childContextTypes is specified but there is no ' + @@ -320,9 +320,9 @@ describe('ReactContextValidator', () => { ); // Warnings should be deduped by component type - ReactTestUtils.renderIntoDocument(); + ReactTestUtils.renderIntoDocument(); expectDev(console.error.calls.count()).toBe(1); - ReactTestUtils.renderIntoDocument(); + ReactTestUtils.renderIntoDocument(); expectDev(console.error.calls.count()).toBe(2); expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(1)[0])).toBe( 'Warning: ComponentB.childContextTypes is specified but there is no ' + @@ -371,7 +371,7 @@ describe('ReactContextValidator', () => { }, }); - ReactTestUtils.renderIntoDocument(); + ReactTestUtils.renderIntoDocument(); expect(childContext.bar).toBeUndefined(); expect(childContext.foo).toBe('FOO'); }); diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js index 13187cd3b0..db3cf3fce1 100644 --- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js +++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js @@ -553,7 +553,7 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => { ); }, }); - instance = ReactTestUtils.renderIntoDocument(); + instance = ReactTestUtils.renderIntoDocument(); }); it('should scry children but cannot', () => { diff --git a/src/renderers/__tests__/ReactComponent-test.js b/src/renderers/__tests__/ReactComponent-test.js index 024a729a39..bdc0e823a5 100644 --- a/src/renderers/__tests__/ReactComponent-test.js +++ b/src/renderers/__tests__/ReactComponent-test.js @@ -56,9 +56,9 @@ describe('ReactComponent', () => { expect(() => { ReactTestUtils.renderIntoDocument( - - - + + + ); }).toThrowError(/Cannot assign to read only property.*/); @@ -81,9 +81,9 @@ describe('ReactComponent', () => { expect(() => { ReactTestUtils.renderIntoDocument( - - - + + + ); }).toThrowError(/Cannot assign to read only property.*/); @@ -247,10 +247,10 @@ describe('ReactComponent', () => {
{ log.push(`ref 1 got ${c ? `instance ${c.props.id}` : 'null'}`); - }}/> + }} /> { log.push(`ref 2 got ${c ? `instance ${c.props.id}` : 'null'}`); - }}/> + }} />
); } diff --git a/src/renderers/__tests__/ReactComponentLifeCycle-test.js b/src/renderers/__tests__/ReactComponentLifeCycle-test.js index 7c6c06cf75..ae512f1b53 100644 --- a/src/renderers/__tests__/ReactComponentLifeCycle-test.js +++ b/src/renderers/__tests__/ReactComponentLifeCycle-test.js @@ -248,7 +248,7 @@ describe('ReactComponentLifeCycle', () => { }, render: function() { expect(this.isMounted()).toBeFalsy(); - return
; + return
; }, }); @@ -292,7 +292,7 @@ describe('ReactComponentLifeCycle', () => { it('isMounted should return false when unmounted', () => { var Component = React.createClass({ render: function() { - return
; + return
; }, }); @@ -319,7 +319,7 @@ describe('ReactComponentLifeCycle', () => { if (this.state.isMounted) { expect(ReactDOM.findDOMNode(this).tagName).toBe('DIV'); } - return
; + return
; }, }); diff --git a/src/renderers/__tests__/ReactCompositeComponent-test.js b/src/renderers/__tests__/ReactCompositeComponent-test.js index 03ad27e560..6346ff739d 100644 --- a/src/renderers/__tests__/ReactCompositeComponent-test.js +++ b/src/renderers/__tests__/ReactCompositeComponent-test.js @@ -138,19 +138,19 @@ describe('ReactCompositeComponent', () => { it('should not cache old DOM nodes when switching constructors', () => { var container = document.createElement('div'); var instance = ReactDOM.render( - , + , container ); ReactDOM.render( // Warm any cache - , + , container ); ReactDOM.render( // Clear out the anchor - , + , container ); ReactDOM.render( // rerender - , + , container ); expect(instance.getAnchor().className).toBe(''); diff --git a/src/renderers/__tests__/ReactMultiChild-test.js b/src/renderers/__tests__/ReactMultiChild-test.js index 50156fdbd3..42d7f4296f 100644 --- a/src/renderers/__tests__/ReactMultiChild-test.js +++ b/src/renderers/__tests__/ReactMultiChild-test.js @@ -178,12 +178,12 @@ describe('ReactMultiChild', () => { } ReactDOM.render( - {[
]}, + {[
]}, container ); ReactDOM.render( - {[
,
]}, + {[
,
]}, container ); @@ -241,12 +241,12 @@ describe('ReactMultiChild', () => { } ReactDOM.render( - {createIterable([
])}, + {createIterable([
])}, container ); ReactDOM.render( - {createIterable([
,
])}, + {createIterable([
,
])}, container ); diff --git a/src/renderers/__tests__/refs-destruction-test.js b/src/renderers/__tests__/refs-destruction-test.js index c0e5a81326..2ae242fa3c 100644 --- a/src/renderers/__tests__/refs-destruction-test.js +++ b/src/renderers/__tests__/refs-destruction-test.js @@ -107,20 +107,20 @@ describe('refs-destruction', () => { class AppModal extends React.Component { render() { return ( - + ); } } class App extends React.Component { render() { - return this.props.hidden ? null : ; + return this.props.hidden ? null : ; } } var container = document.createElement('div'); ReactDOM.render(, container); - ReactDOM.render(
- +
); diff --git a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js index 850e727a79..0676d9d453 100644 --- a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js +++ b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js @@ -112,7 +112,7 @@ describe('CSSPropertyOperations', () => { static displayName = 'Comp'; render() { - return
; + return
; } } @@ -216,7 +216,7 @@ describe('CSSPropertyOperations', () => { static displayName = 'Comp'; render() { - return
; + return
; } } diff --git a/src/renderers/dom/shared/__tests__/ReactDOM-test.js b/src/renderers/dom/shared/__tests__/ReactDOM-test.js index c7c574a8fb..5da34e3824 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOM-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOM-test.js @@ -287,7 +287,7 @@ describe('ReactDOM', () => { ReactDOM.render(

Auto-focus Test

- +

The above input should be focused after mount.

, container, diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js index dc9c8cecea..24232bd782 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js @@ -360,8 +360,8 @@ describe('ReactDOMComponent', () => { it('should properly update custom attributes on custom elements', () => { var container = document.createElement('div'); - ReactDOM.render(, container); - ReactDOM.render(, container); + ReactDOM.render(, container); + ReactDOM.render(, container); var node = container.firstChild; expect(node.hasAttribute('foo')).toBe(false); expect(node.getAttribute('bar')).toBe('buzz'); @@ -637,7 +637,7 @@ describe('ReactDOMComponent', () => { it('should ignore attribute whitelist for elements with the "is: attribute', () => { var container = document.createElement('div'); - ReactDOM.render(