Chore: upgrade ESLint that tests are using

Author: mysticatea

package.json

@@ -50,7 +50,7 @@
     "warun": "^1.0.0"
   },
   "scripts": {
-    "_mocha": "_mocha \"test/*.js\" --reporter dot --timeout 5000",
+    "_mocha": "_mocha \"test/*.js\" --reporter dot --timeout 10000",
     "prebuild": "npm run -s clean",
     "build": "tsc && rollup -c -o index.js && dts-bundle --name vue-eslint-parser --main .temp/index.d.ts --out ../index.d.ts",
     "clean": "rimraf .nyc_output .temp coverage index.*",

test/ast.js

@@ -14,7 +14,7 @@ const fs = require("fs")
 const path = require("path")
 const lodash = require("lodash")
 const parser = require("..")
-const linter = require("./fixtures/eslint").linter
+const Linter = require("./fixtures/eslint").Linter
 
 //------------------------------------------------------------------------------
 // Helpers
@@ -71,11 +71,11 @@ function getAllTokens(ast) {
  * @returns {object} Simple tree.
  */
 function getTree(source) {
+    const linter = new Linter()
     const stack = []
     const root = {children: []}
     let current = root
 
-    linter.reset()
     linter.defineRule("maketree", (ruleContext) =>
         ruleContext.parserServices.defineTemplateBodyVisitor({
             "*"(node) {
@@ -111,9 +111,9 @@ function getTree(source) {
  * @returns {void}
  */
 function validateParent(source) {
+    const linter = new Linter()
     const stack = []
 
-    linter.reset()
     linter.defineRule("validateparent", (ruleContext) =>
         ruleContext.parserServices.defineTemplateBodyVisitor({
             "*"(node) {

test/core-rules.js

@@ -17,7 +17,8 @@ const RuleTester = require("./fixtures/eslint/lib/testers/rule-tester")
 // Helpers
 //------------------------------------------------------------------------------
 
-const RULES_ROOT = path.join(__dirname, "fixtures/eslint/tests/lib/rules")
+const RULE_DEFS_ROOT = path.join(__dirname, "fixtures/eslint/lib/rules")
+const RULE_TESTS_ROOT = path.join(__dirname, "fixtures/eslint/tests/lib/rules")
 const PARSER_PATH = path.resolve(__dirname, "../index.js")
 const EXCEPTIONS = new Set([
     // Those rules check outside `<script>` tag as well.
@@ -34,9 +35,8 @@ const EXCEPTIONS = new Set([
     // are added.
     // It cannot test this rule correctly.
     "lines-around-comment",
-    "lines-around-directive",
-    "newline-after-var",
     "no-multiple-empty-lines",
+    "semi-style",
 
     // The inside of "<script>" tags is not related to Unicode BOM.
     "unicode-bom",
@@ -131,14 +131,18 @@ function overrideRun(ruleId, impl, patterns) {
 RuleTester.prototype.run = overrideRun
 try {
     describe("Tests of ESLint core rules", () => {
-        for (const fileName of fs.readdirSync(RULES_ROOT)) {
-            if (path.extname(fileName) !== ".js" ||
-                EXCEPTIONS.has(path.basename(fileName, ".js"))
-            ) {
+        for (const fileName of fs.readdirSync(RULE_TESTS_ROOT)) {
+            if (path.extname(fileName) !== ".js" || fileName.startsWith("_")) {
+                continue
+            }
+            if (require(path.join(RULE_DEFS_ROOT, fileName)).meta.deprecated) {
+                continue
+            }
+            if (EXCEPTIONS.has(path.basename(fileName, ".js"))) {
                 continue
             }
 
-            require(path.join(RULES_ROOT, fileName))
+            require(path.join(RULE_TESTS_ROOT, fileName))
         }
     })
 }

test/fixtures/eslint

@@ -186,57 +186,6 @@ describe("Basic tests", () => {
         })
     })
 
-    describe("About fixtures/lines-around-directive.vue", () => {
-        it("should notify no 'lines-around-directive' error (never)", () => {
-            const cli = new CLIEngine({
-                cwd: FIXTURE_DIR,
-                envs: ["es6", "node"],
-                parser: PARSER_PATH,
-                rules: {"lines-around-directive": ["error", "never"]},
-                useEslintrc: false,
-            })
-            const report = cli.executeOnFiles(["lines-around-directive.vue"])
-            const messages = report.results[0].messages
-
-            assert(messages.length === 0)
-        })
-
-        it("should notify a 'lines-around-directive' error (always)", () => {
-            const cli = new CLIEngine({
-                cwd: FIXTURE_DIR,
-                envs: ["es6", "node"],
-                parser: PARSER_PATH,
-                rules: {"lines-around-directive": ["error", "always"]},
-                useEslintrc: false,
-            })
-            const report = cli.executeOnFiles(["lines-around-directive.vue"])
-            const messages = report.results[0].messages
-
-            assert(messages.length === 1)
-            assert(messages[0].ruleId === "lines-around-directive")
-            assert(messages[0].line === 6)
-            assert(messages[0].column === 1)
-            assert(messages[0].source === "\"use strict\"")
-        })
-
-        it("should fix 'lines-around-directive' errors with --fix option", () => {
-            const cli = new CLIEngine({
-                cwd: FIXTURE_DIR,
-                envs: ["es6", "node"],
-                fix: true,
-                parser: PARSER_PATH,
-                rules: {"lines-around-directive": ["error", "always"]},
-                useEslintrc: false,
-            })
-            CLIEngine.outputFixes(cli.executeOnFiles(["lines-around-directive.vue"]))
-
-            const actual = fs.readFileSync(path.join(FIXTURE_DIR, "lines-around-directive.vue"), "utf8")
-            const expected = fs.readFileSync(path.join(FIXTURE_DIR, "lines-around-directive-always.vue.fixed"), "utf8")
-
-            assert(actual === expected)
-        })
-    })
-
     describe("About fixtures/crlf.vue", () => {
         it("should notify no 'indent' error", () => {
             const cli = new CLIEngine({