[Tests] fix tests so they pass with eslint 2.

Author: ljharb

.travis.yml

@@ -7,7 +7,7 @@ node_js:
   - '0.12'
   - '0.10'
 before_script:
-  - 'if [ "${TRAVIS_NODE_VERSION}" = "iojs" ] || [ "${TRAVIS_NODE_VERSION}" = "0.12" ] || [ "${TRAVIS_NODE_VERSION}" = "0.10" ]; then npm install eslint@2; fi'
+  - 'if [ "${TRAVIS_NODE_VERSION}" = "iojs" ] || [ "${TRAVIS_NODE_VERSION}" = "0.12" ] || [ "${TRAVIS_NODE_VERSION}" = "0.10" ]; then npm install eslint@2 babel-eslint@6; fi'
 after_success:
   - npm run coveralls
 matrix:

tests/eslint-compat.js

@@ -0,0 +1,12 @@
+'use strict';
+
+var isEslint2 = require('eslint/package.json').version.slice(0, 2) === '2.';
+
+module.exports = {
+  isEslint2: function () {
+    return isEslint2;
+  },
+  dot: function dot(msg) {
+    return isEslint2 ? msg : msg + '.';
+  }
+};

tests/lib/rules/jsx-uses-react.js

@@ -12,6 +12,7 @@
 var eslint = require('eslint').linter;
 var rule = require('eslint/lib/rules/no-unused-vars');
 var RuleTester = require('eslint').RuleTester;
+var dot = require('../../eslint-compat').dot;
 
 var parserOptions = {
   ecmaVersion: 6,
@@ -41,12 +42,12 @@ ruleTester.run('no-unused-vars', rule, {
   ],
   invalid: [{
     code: '/*eslint jsx-uses-react:1*/ var React;',
-    errors: [{message: '\'React\' is defined but never used.'}], parserOptions: parserOptions
+    errors: [{message: dot('\'React\' is defined but never used')}], parserOptions: parserOptions
   }, {
     code: '/*eslint jsx-uses-react:1*/ /** @jsx Foo */ var React; <div />;',
-    errors: [{message: '\'React\' is defined but never used.'}], parserOptions: parserOptions
+    errors: [{message: dot('\'React\' is defined but never used')}], parserOptions: parserOptions
   }, {
     code: '/*eslint jsx-uses-react:1*/ var React; <div />;',
-    errors: [{message: '\'React\' is defined but never used.'}], settings: settings, parserOptions: parserOptions
+    errors: [{message: dot('\'React\' is defined but never used')}], settings: settings, parserOptions: parserOptions
   }]
 });

tests/lib/rules/jsx-uses-vars.js

@@ -13,6 +13,8 @@ var eslint = require('eslint').linter;
 var ruleNoUnusedVars = require('eslint/lib/rules/no-unused-vars');
 var rulePreferConst = require('eslint/lib/rules/prefer-const');
 var RuleTester = require('eslint').RuleTester;
+var dot = require('../../eslint-compat').dot;
+var isEslint2 = require('../../eslint-compat').isEslint2;
 
 var parserOptions = {
   ecmaVersion: 6,
@@ -123,37 +125,37 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
   invalid: [
     {
       code: '/*eslint jsx-uses-vars:1*/ var App;',
-      errors: [{message: '\'App\' is defined but never used.'}],
+      errors: [{message: dot('\'App\' is defined but never used')}],
       parserOptions: parserOptions
     }, {
       code: '\
         /*eslint jsx-uses-vars:1*/\
         var App;\
         var unused;\
         React.render(<App unused=""/>);',
-      errors: [{message: '\'unused\' is defined but never used.'}],
+      errors: [{message: dot('\'unused\' is defined but never used')}],
       parserOptions: parserOptions
     }, {
       code: '\
         /*eslint jsx-uses-vars:1*/\
         var App;\
         var Hello;\
         React.render(<App:Hello/>);',
-      errors: [{message: '\'Hello\' is defined but never used.'}],
+      errors: [{message: dot('\'Hello\' is defined but never used')}],
       parserOptions: parserOptions
     }, {
       code: '\
         /*eslint jsx-uses-vars:1*/\
         var Button;\
         var Input;\
         React.render(<Button.Input unused=""/>);',
-      errors: [{message: '\'Input\' is defined but never used.'}],
+      errors: [{message: dot('\'Input\' is defined but never used')}],
       parserOptions: parserOptions
     }, {
       code: '\
         /*eslint jsx-uses-vars:1*/\
         class unused {}',
-      errors: [{message: '\'unused\' is defined but never used.'}],
+      errors: [{message: dot('\'unused\' is defined but never used')}],
       parserOptions: parserOptions
     }, {
       code: '\
@@ -165,7 +167,7 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
           }\
         }',
       errors: [{
-        message: '\'HelloMessage\' is defined but never used.',
+        message: dot('\'HelloMessage\' is defined but never used'),
         line: 1
       }],
       parserOptions: parserOptions
@@ -179,7 +181,7 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
           }\
         }',
       errors: [{
-        message: '\'HelloMessage\' is defined but never used.',
+        message: dot('\'HelloMessage\' is defined but never used'),
         line: 1
       }],
       parser: 'babel-eslint',
@@ -194,7 +196,7 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         }\
         Greetings();',
       errors: [{
-        message: '\'Hello\' is defined but never used.',
+        message: dot('\'Hello\' is defined but never used'),
         line: 1
       }],
       parser: 'babel-eslint',
@@ -206,21 +208,21 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
 // Check compatibility with eslint prefer-const rule (#716)
 ruleTester.run('prefer-const', rulePreferConst, {
   valid: [],
-  invalid: [{
+  invalid: (isEslint2() ? [] : [{
     code: [
       '/* eslint jsx-uses-vars:1 */',
       'let App = <div />;',
       '<App />;'
     ].join('\n'),
-    errors: [{message: '\'App\' is never reassigned. Use \'const\' instead.'}],
+    errors: [{message: dot('\'App\' is never reassigned. Use \'const\' instead')}],
     parserOptions: parserOptions
-  }, {
+  }]).concat([{
     code: [
       '/* eslint jsx-uses-vars:1 */',
       'let filters = \'foo\';',
       '<div>{filters}</div>;'
     ].join('\n'),
-    errors: [{message: '\'filters\' is never reassigned. Use \'const\' instead.'}],
+    errors: [{message: '\'filters\' is never reassigned' + (isEslint2() ? ', use' : '. Use') + ' \'const\' instead.'}],
     parserOptions: parserOptions
-  }]
+  }])
 });