From 1e272a416c91f67e8eda4e4c151db65a47bd2b6b Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Sun, 29 Jan 2017 10:19:39 -0800
Subject: [PATCH] [eslint] use template literals instead of multiline strings.

---
 .eslintrc                              |   2 +-
 tests/lib/rules/jsx-uses-vars.js       | 274 +++++++++++++------------
 tests/lib/rules/jsx-wrap-multilines.js | 153 +++++++-------
 tests/lib/rules/no-children-prop.js    |   6 +-
 tests/lib/rules/self-closing-comp.js   |  27 +--
 tests/lib/rules/wrap-multilines.js     |  93 +++++----
 6 files changed, 296 insertions(+), 259 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index b6f0d450fb..80071df298 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -61,7 +61,7 @@
         "no-lone-blocks": 2,
         "no-loop-func": 2,
         "no-multi-spaces": 2,
-        "no-multi-str": 0,
+        "no-multi-str": 2,
         "no-native-reassign": 2,
         "no-new": 2,
         "no-new-func": 2,
diff --git a/tests/lib/rules/jsx-uses-vars.js b/tests/lib/rules/jsx-uses-vars.js
index dd3dd225cc..57e1bee67c 100644
--- a/tests/lib/rules/jsx-uses-vars.js
+++ b/tests/lib/rules/jsx-uses-vars.js
@@ -32,170 +32,188 @@ eslint.defineRule('jsx-uses-vars', require('../../../lib/rules/jsx-uses-vars'));
 ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
   valid: [
     {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        function foo() {\
-          var App;\
-          var bar = React.render(<App/>);\
-          return bar;\
-        };\
-        foo()',
-      parserOptions: parserOptions
-    }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        var App;\
-        React.render(<App/>);',
-      parserOptions: parserOptions
-    }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        var App;\
-        React.render(<App/>);',
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        function foo() {
+          var App;
+          var bar = React.render(<App/>);
+          return bar;
+        };
+        foo()
+      `,
+      parserOptions: parserOptions
+    }, {
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        var App;
+        React.render(<App/>);
+      `,
+      parserOptions: parserOptions
+    }, {
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        var App;
+        React.render(<App/>);
+      `,
       parser: 'babel-eslint',
       parserOptions: parserOptions
     }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-          var a=1;\
-          React.render(<img src={a} />);',
-      parserOptions: parserOptions
-    }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        var App;\
-        function f() {\
-          return <App />;\
-        }\
-        f();',
-      parserOptions: parserOptions
-    }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        var App;\
-        <App.Hello />',
-      parserOptions: parserOptions
-    }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        var App;\
-        <App:Hello />',
-      parserOptions: parserOptions
-    }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        class HelloMessage {}\
-        <HelloMessage />',
-      parserOptions: parserOptions
-    }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        class HelloMessage {\
-          render() {\
-            var HelloMessage = <div>Hello</div>;\
-            return HelloMessage;\
-          }\
-        }\
-        <HelloMessage />',
-      parserOptions: parserOptions
-    }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        function foo() {\
-          var App = { Foo: { Bar: {}}};\
-          var bar = React.render(<App.Foo.Bar/>);\
-          return bar;\
-        };\
-        foo()',
-      parserOptions: parserOptions
-    }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        function foo() {\
-          var App = { Foo: { Bar: { Baz: {}}}};\
-          var bar = React.render(<App.Foo.Bar.Baz/>);\
-          return bar;\
-        };\
-        foo()',
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        var a = 1;
+        React.render(<img src={a} />);
+      `,
+      parserOptions: parserOptions
+    }, {
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        var App;
+        function f() {
+          return <App />;
+        }
+        f();
+      `,
+      parserOptions: parserOptions
+    }, {
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        var App;
+        <App.Hello />
+      `,
+      parserOptions: parserOptions
+    }, {
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        var App;
+        <App:Hello />
+      `,
+      parserOptions: parserOptions
+    }, {
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        class HelloMessage {}
+        <HelloMessage />
+      `,
+      parserOptions: parserOptions
+    }, {
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        class HelloMessage {
+          render() {
+            var HelloMessage = <div>Hello</div>;
+            return HelloMessage;
+          }
+        }
+        <HelloMessage />
+      `,
+      parserOptions: parserOptions
+    }, {
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        function foo() {
+          var App = { Foo: { Bar: {} } };
+          var bar = React.render(<App.Foo.Bar/>);
+          return bar;
+        };
+        foo()
+      `,
+      parserOptions: parserOptions
+    }, {
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        function foo() {
+          var App = { Foo: { Bar: { Baz: {} } } };
+          var bar = React.render(<App.Foo.Bar.Baz/>);
+          return bar;
+        };
+        foo()
+      `,
       parserOptions: parserOptions
     }
   ],
   invalid: [
     {
-      code: '/*eslint jsx-uses-vars:1*/ var App;',
+      code: '/* eslint jsx-uses-vars: 1 */ var App;',
       errors: [{message: '\'App\' is defined but never used.'}],
       parserOptions: parserOptions
     }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        var App;\
-        var unused;\
-        React.render(<App unused=""/>);',
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        var App;
+        var unused;
+        React.render(<App unused=""/>);
+      `,
       errors: [{message: '\'unused\' is defined but never used.'}],
       parserOptions: parserOptions
     }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        var App;\
-        var Hello;\
-        React.render(<App:Hello/>);',
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        var App;
+        var Hello;
+        React.render(<App:Hello/>);
+      `,
       errors: [{message: '\'Hello\' is defined but never used.'}],
       parserOptions: parserOptions
     }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        var Button;\
-        var Input;\
-        React.render(<Button.Input unused=""/>);',
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        var Button;
+        var Input;
+        React.render(<Button.Input unused=""/>);
+      `,
       errors: [{message: '\'Input\' is defined but never used.'}],
       parserOptions: parserOptions
     }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        class unused {}',
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        class unused {}
+      `,
       errors: [{message: '\'unused\' is defined but never used.'}],
       parserOptions: parserOptions
     }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        class HelloMessage {\
-          render() {\
-            var HelloMessage = <div>Hello</div>;\
-            return HelloMessage;\
-          }\
-        }',
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        class HelloMessage {
+          render() {
+            var HelloMessage = <div>Hello</div>;
+            return HelloMessage;
+          }
+        }
+      `,
       errors: [{
         message: '\'HelloMessage\' is defined but never used.',
-        line: 1
+        line: 3
       }],
       parserOptions: parserOptions
     }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        class HelloMessage {\
-          render() {\
-            var HelloMessage = <div>Hello</div>;\
-            return HelloMessage;\
-          }\
-        }',
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        class HelloMessage {
+          render() {
+            var HelloMessage = <div>Hello</div>;
+            return HelloMessage;
+          }
+        }
+      `,
       errors: [{
         message: '\'HelloMessage\' is defined but never used.',
-        line: 1
+        line: 3
       }],
       parser: 'babel-eslint',
       parserOptions: parserOptions
     }, {
-      code: '\
-        /*eslint jsx-uses-vars:1*/\
-        import {Hello} from \'Hello\';\
-        function Greetings() {\
-          const Hello = require(\'Hello\').default;\
-          return <Hello />;\
-        }\
-        Greetings();',
+      code: `
+        /* eslint jsx-uses-vars: 1 */
+        import {Hello} from 'Hello';
+        function Greetings() {
+          const Hello = require('Hello').default;
+          return <Hello />;
+        }
+        Greetings();
+      `,
       errors: [{
         message: '\'Hello\' is defined but never used.',
-        line: 1
+        line: 3
       }],
       parser: 'babel-eslint',
       parserOptions: parserOptions
diff --git a/tests/lib/rules/jsx-wrap-multilines.js b/tests/lib/rules/jsx-wrap-multilines.js
index f6d50454d9..54ae243f10 100644
--- a/tests/lib/rules/jsx-wrap-multilines.js
+++ b/tests/lib/rules/jsx-wrap-multilines.js
@@ -22,90 +22,101 @@ var parserOptions = {
 // Code Snippets
 // ------------------------------------------------------------------------------
 
-var RETURN_SINGLE_LINE = '\
-  var Hello = React.createClass({\
-    render: function() {\
-      return <p>Hello {this.props.name}</p>;\
-    }\
-  });';
-
-var RETURN_PAREN = '\
-  var Hello = React.createClass({\
-    render: function() {\
-      return (<div>\n\
-        <p>Hello {this.props.name}</p>\n\
-      </div>);\
-    }\
-  });';
-
-var RETURN_NO_PAREN = '\
-  var Hello = React.createClass({\
-    render: function() {\
-      return <div>\n\
-        <p>Hello {this.props.name}</p>\n\
-      </div>;\
-    }\
-  });';
+var RETURN_SINGLE_LINE = `
+  var Hello = React.createClass({
+    render: function() {
+      return <p>Hello {this.props.name}</p>;
+    }
+  });
+`;
+
+var RETURN_PAREN = `
+  var Hello = React.createClass({
+    render: function() {
+      return (<div>
+        <p>Hello {this.props.name}</p>
+      </div>);
+    }
+  });
+`;
+
+var RETURN_NO_PAREN = `
+  var Hello = React.createClass({
+    render: function() {
+      return <div>
+        <p>Hello {this.props.name}</p>
+      </div>;
+    }
+  });
+`;
 
 var DECLARATION_TERNARY_SINGLE_LINE = 'var hello = foo ? <p>Hello</p> : <p>Hi</p>;';
 
-var DECLARATION_TERNARY_PAREN = '\
-  var hello = foo ? (<div>\n\
-    <p>Hello</p>\n\
-  </div>) : (<div>\n\
-    <p>Hi</p>\n\
-  </div>);';
-
-var DECLARATION_TERNARY_NO_PAREN = '\
-  var hello = foo ? <div>\n\
-    <p>Hello</p>\n\
-  </div> : <div>\n\
-    <p>Hi</p>\n\
-  </div>;';
+var DECLARATION_TERNARY_PAREN = `
+  var hello = foo ? (<div>
+    <p>Hello</p>
+  </div>) : (<div>
+    <p>Hi</p>
+  </div>);
+`;
+
+var DECLARATION_TERNARY_NO_PAREN = `
+  var hello = foo ? <div>
+    <p>Hello</p>
+  </div> : <div>
+    <p>Hi</p>
+  </div>;
+`;
 
 var ASSIGNMENT_TERNARY_SINGLE_LINE = 'var hello; hello = foo ? <p>Hello</p> : <p>Hi</p>;';
 
-var ASSIGNMENT_TERNARY_PAREN = '\
-  var hello;\n\
-  hello = foo ? (<div>\n\
-    <p>Hello</p>\n\
-  </div>) : (<div>\n\
-    <p>Hi</p>\n\
-  </div>);';
-
-var ASSIGNMENT_TERNARY_NO_PAREN = '\
-  var hello;\n\
-  hello = foo ? <div>\n\
-    <p>Hello</p>\n\
-  </div> : <div>\n\
-    <p>Hi</p>\n\
-  </div>;';
+var ASSIGNMENT_TERNARY_PAREN = `
+  var hello;
+  hello = foo ? (<div>
+    <p>Hello</p>
+  </div>) : (<div>
+    <p>Hi</p>
+  </div>);
+`;
+
+var ASSIGNMENT_TERNARY_NO_PAREN = `
+  var hello;
+  hello = foo ? <div>
+    <p>Hello</p>
+  </div> : <div>
+    <p>Hi</p>
+  </div>;
+`;
 
 var DECLARATION_SINGLE_LINE = 'var hello = <p>Hello</p>;';
 
-var DECLARATION_PAREN = '\
-  var hello = (<div>\n\
-    <p>Hello</p>\n\
-  </div>);';
+var DECLARATION_PAREN = `
+  var hello = (<div>
+    <p>Hello</p>
+  </div>);
+`;
 
-var DECLARATION_NO_PAREN = '\
-  var hello = <div>\n\
-    <p>Hello</p>\n\
-  </div>;';
+var DECLARATION_NO_PAREN = `
+  var hello = <div>
+    <p>Hello</p>
+  </div>;
+`;
 
 var ASSIGNMENT_SINGLE_LINE = 'var hello; hello = <p>Hello</p>;';
 
-var ASSIGNMENT_PAREN = '\
-  var hello;\
-  hello = (<div>\n\
-    <p>Hello</p>\n\
-  </div>);';
-
-var ASSIGNMENT_NO_PAREN = '\
-  var hello;\
-  hello = <div>\n\
-    <p>Hello</p>\n\
-  </div>;';
+var ASSIGNMENT_PAREN = `
+  var hello;
+  hello = (<div>
+    <p>Hello</p>
+  </div>);
+`;
+
+var ASSIGNMENT_NO_PAREN = `
+  var hello;
+  hello = <div>
+    <p>Hello</p>
+  </div>;
+`;
 
 // ------------------------------------------------------------------------------
 // Tests
diff --git a/tests/lib/rules/no-children-prop.js b/tests/lib/rules/no-children-prop.js
index dbcb684d34..8232452a4d 100644
--- a/tests/lib/rules/no-children-prop.js
+++ b/tests/lib/rules/no-children-prop.js
@@ -20,10 +20,8 @@ var parserOptions = {
   }
 };
 
-var JSX_ERROR = 'Do not pass children as props. Instead, nest children between \
-the opening and closing tags.';
-var CREATE_ELEMENT_ERROR = 'Do not pass children as props. Instead, pass them \
-as additional arguments to React.createElement.';
+var JSX_ERROR = 'Do not pass children as props. Instead, nest children between the opening and closing tags.';
+var CREATE_ELEMENT_ERROR = 'Do not pass children as props. Instead, pass them as additional arguments to React.createElement.';
 
 // -----------------------------------------------------------------------------
 // Tests
diff --git a/tests/lib/rules/self-closing-comp.js b/tests/lib/rules/self-closing-comp.js
index 5cb9202e58..13a091ce85 100644
--- a/tests/lib/rules/self-closing-comp.js
+++ b/tests/lib/rules/self-closing-comp.js
@@ -33,10 +33,11 @@ ruleTester.run('self-closing-comp', rule, {
       code: 'var Profile = <Hello name="John"><img src="picture.png" /></Hello>;',
       parserOptions: parserOptions
     }, {
-      code: '\
-      <Hello>\
-        <Hello name="John" />\
-      </Hello>',
+      code: `
+        <Hello>
+          <Hello name="John" />
+        </Hello>
+      `,
       parserOptions: parserOptions
     }, {
       code: 'var HelloJohn = <div>&nbsp;</div>;',
@@ -56,10 +57,11 @@ ruleTester.run('self-closing-comp', rule, {
       options: [],
       parserOptions: parserOptions
     }, {
-      code: '\
-      <Hello>\
-        <Hello name="John" />\
-      </Hello>',
+      code: `
+        <Hello>
+          <Hello name="John" />
+        </Hello>
+      `,
       options: [],
       parserOptions: parserOptions
     }, {
@@ -95,10 +97,11 @@ ruleTester.run('self-closing-comp', rule, {
       options: [{html: true}],
       parserOptions: parserOptions
     }, {
-      code: '\
-      <div>\
-        <div className="content" />\
-      </div>',
+      code: `
+        <div>
+          <div className="content" />
+        </div>
+      `,
       options: [{html: true}],
       parserOptions: parserOptions
     }
diff --git a/tests/lib/rules/wrap-multilines.js b/tests/lib/rules/wrap-multilines.js
index e169ff736d..155db92433 100644
--- a/tests/lib/rules/wrap-multilines.js
+++ b/tests/lib/rules/wrap-multilines.js
@@ -22,56 +22,63 @@ var parserOptions = {
 // Code Snippets
 // ------------------------------------------------------------------------------
 
-var RETURN_SINGLE_LINE = '\
-  var Hello = React.createClass({\
-    render: function() {\
-      return <p>Hello {this.props.name}</p>;\
-    }\
-  });';
-
-var RETURN_PAREN = '\
-  var Hello = React.createClass({\
-    render: function() {\
-      return (<div>\n\
-        <p>Hello {this.props.name}</p>\n\
-      </div>);\
-    }\
-  });';
-
-var RETURN_NO_PAREN = '\
-  var Hello = React.createClass({\
-    render: function() {\
-      return <div>\n\
-        <p>Hello {this.props.name}</p>\n\
-      </div>;\
-    }\
-  });';
+var RETURN_SINGLE_LINE = `
+  var Hello = React.createClass({
+    render: function() {
+      return <p>Hello {this.props.name}</p>;
+    }
+  });
+`;
+
+var RETURN_PAREN = `
+  var Hello = React.createClass({
+    render: function() {
+      return (<div>
+        <p>Hello {this.props.name}</p>
+      </div>);
+    }
+  });
+`;
+
+var RETURN_NO_PAREN = `
+  var Hello = React.createClass({
+    render: function() {
+      return <div>
+        <p>Hello {this.props.name}</p>
+      </div>;
+    }
+  });
+`;
 
 var DECLARATION_SINGLE_LINE = 'var hello = <p>Hello</p>;';
 
-var DECLARATION_PAREN = '\
-  var hello = (<div>\n\
-    <p>Hello</p>\n\
-  </div>);';
+var DECLARATION_PAREN = `
+  var hello = (<div>
+    <p>Hello</p>
+  </div>);
+`;
 
-var DECLARATION_NO_PAREN = '\
-  var hello = <div>\n\
-    <p>Hello</p>\n\
-  </div>;';
+var DECLARATION_NO_PAREN = `
+  var hello = <div>
+    <p>Hello</p>
+  </div>;
+`;
 
 var ASSIGNMENT_SINGLE_LINE = 'var hello; hello = <p>Hello</p>;';
 
-var ASSIGNMENT_PAREN = '\
-  var hello;\
-  hello = (<div>\n\
-    <p>Hello</p>\n\
-  </div>);';
-
-var ASSIGNMENT_NO_PAREN = '\
-  var hello;\
-  hello = <div>\n\
-    <p>Hello</p>\n\
-  </div>;';
+var ASSIGNMENT_PAREN = `
+  var hello;
+  hello = (<div>
+    <p>Hello</p>
+  </div>);
+`;
+
+var ASSIGNMENT_NO_PAREN = `
+  var hello;
+  hello = <div>
+    <p>Hello</p>
+  </div>;
+`;
 
 // ------------------------------------------------------------------------------
 // Tests