diff --git a/tests/src/rules/no-amd.js b/tests/src/rules/no-amd.js index d67739f71..62de5ac26 100644 --- a/tests/src/rules/no-amd.js +++ b/tests/src/rules/no-amd.js @@ -1,4 +1,6 @@ import { RuleTester } from 'eslint' +import eslintPkg from 'eslint/package.json' +import semver from 'semver' var ruleTester = new RuleTester() @@ -25,11 +27,11 @@ ruleTester.run('no-amd', require('rules/no-amd'), { 'define("a")', ], - invalid: [ - { code: 'define([], function() {})', errors: [ { message: 'Expected imports instead of AMD define().' }] }, - { code: 'define(["a"], function(a) { console.log(a); })', errors: [ { message: 'Expected imports instead of AMD define().' }] }, + invalid: semver.satisfies(eslintPkg.version, '< 4.0.0') ? [] : [ + { code: 'define([], function() {})', errors: [ { message: 'Expected imports instead of AMD define().' }] }, + { code: 'define(["a"], function(a) { console.log(a); })', errors: [ { message: 'Expected imports instead of AMD define().' }] }, - { code: 'require([], function() {})', errors: [ { message: 'Expected imports instead of AMD require().' }] }, - { code: 'require(["a"], function(a) { console.log(a); })', errors: [ { message: 'Expected imports instead of AMD require().' }] }, + { code: 'require([], function() {})', errors: [ { message: 'Expected imports instead of AMD require().' }] }, + { code: 'require(["a"], function(a) { console.log(a); })', errors: [ { message: 'Expected imports instead of AMD require().' }] }, ], }) diff --git a/tests/src/rules/no-commonjs.js b/tests/src/rules/no-commonjs.js index ae0377f4a..8ca8fde50 100644 --- a/tests/src/rules/no-commonjs.js +++ b/tests/src/rules/no-commonjs.js @@ -1,4 +1,6 @@ import { RuleTester } from 'eslint' +import eslintPkg from 'eslint/package.json' +import semver from 'semver' const EXPORT_MESSAGE = 'Expected "export" or "export default"' , IMPORT_MESSAGE = 'Expected "import" instead of "require()"' @@ -59,9 +61,11 @@ ruleTester.run('no-commonjs', require('rules/no-commonjs'), { invalid: [ // imports - { code: 'var x = require("x")', errors: [ { message: IMPORT_MESSAGE }] }, - { code: 'x = require("x")', errors: [ { message: IMPORT_MESSAGE }] }, - { code: 'require("x")', errors: [ { message: IMPORT_MESSAGE }] }, + ...(semver.satisfies(eslintPkg.version, '< 4.0.0') ? [] : [ + { code: 'var x = require("x")', errors: [ { message: IMPORT_MESSAGE }] }, + { code: 'x = require("x")', errors: [ { message: IMPORT_MESSAGE }] }, + { code: 'require("x")', errors: [ { message: IMPORT_MESSAGE }] }, + ]), // exports { code: 'exports.face = "palm"', errors: [ { message: EXPORT_MESSAGE }] },