Skip to content

Commit a8d4c9b

Browse files
committed
Fix tests for ESLint 4.0.0 new Linter API
1 parent 0083670 commit a8d4c9b

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

tests/lib/rules/jsx-no-undef.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
// Requirements
1010
// -----------------------------------------------------------------------------
1111

12-
var eslint = require('eslint').linter;
12+
var eslint = require('eslint');
1313
var rule = require('../../../lib/rules/jsx-no-undef');
14-
var RuleTester = require('eslint').RuleTester;
14+
var RuleTester = eslint.RuleTester;
1515

1616
var parserOptions = {
1717
ecmaVersion: 8,
@@ -26,7 +26,8 @@ var parserOptions = {
2626
// -----------------------------------------------------------------------------
2727

2828
var ruleTester = new RuleTester({parserOptions});
29-
eslint.defineRule('no-undef', require('eslint/lib/rules/no-undef'));
29+
var linter = ruleTester.linter || eslint.linter;
30+
linter.defineRule('no-undef', require('eslint/lib/rules/no-undef'));
3031
ruleTester.run('jsx-no-undef', rule, {
3132
valid: [{
3233
code: '/*eslint no-undef:1*/ var React, App; React.render(<App />);'

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
// Requirements
1010
// -----------------------------------------------------------------------------
1111

12-
var eslint = require('eslint').linter;
12+
var eslint = require('eslint');
1313
var rule = require('eslint/lib/rules/no-unused-vars');
14-
var RuleTester = require('eslint').RuleTester;
14+
var RuleTester = eslint.RuleTester;
1515

1616
var parserOptions = {
1717
ecmaVersion: 8,
@@ -33,7 +33,8 @@ var settings = {
3333
// -----------------------------------------------------------------------------
3434

3535
var ruleTester = new RuleTester({parserOptions});
36-
eslint.defineRule('jsx-uses-react', require('../../../lib/rules/jsx-uses-react'));
36+
var linter = ruleTester.linter || eslint.linter;
37+
linter.defineRule('jsx-uses-react', require('../../../lib/rules/jsx-uses-react'));
3738
ruleTester.run('no-unused-vars', rule, {
3839
valid: [
3940
{code: '/*eslint jsx-uses-react:1*/ var React; <div />;'},

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
// Requirements
1010
// -----------------------------------------------------------------------------
1111

12-
var eslint = require('eslint').linter;
12+
var eslint = require('eslint');
1313
var ruleNoUnusedVars = require('eslint/lib/rules/no-unused-vars');
1414
var rulePreferConst = require('eslint/lib/rules/prefer-const');
15-
var RuleTester = require('eslint').RuleTester;
15+
var RuleTester = eslint.RuleTester;
1616

1717
var parserOptions = {
1818
ecmaVersion: 8,
@@ -30,7 +30,8 @@ require('babel-eslint');
3030
// -----------------------------------------------------------------------------
3131

3232
var ruleTester = new RuleTester({parserOptions});
33-
eslint.defineRule('jsx-uses-vars', require('../../../lib/rules/jsx-uses-vars'));
33+
var linter = ruleTester.linter || eslint.linter;
34+
linter.defineRule('jsx-uses-vars', require('../../../lib/rules/jsx-uses-vars'));
3435
ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
3536
valid: [
3637
{

0 commit comments

Comments
 (0)