chore(plugin-typescript): switch to jest, fix some tests

JamesHenry · JamesHenry · commit f68d82ce0ad0 · 2019-01-18T07:42:16.000-05:00
diff --git a/packages/eslint-plugin-typescript/jest.config.js b/packages/eslint-plugin-typescript/jest.config.js
@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest'
+  },
+  testRegex: './tests/lib/.+\\.js$',
+  collectCoverage: false,
+  collectCoverageFrom: ['lib/**/*.{js,jsx,ts,tsx}'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
+  coverageReporters: ['text-summary', 'lcov']
+};
diff --git a/packages/eslint-plugin-typescript/lib/rules/generic-type-naming.js b/packages/eslint-plugin-typescript/lib/rules/generic-type-naming.js
@@ -15,7 +15,7 @@ function createTypeParameterChecker(context, rule) {
   const regex = new RegExp(rule);
 
   return function checkTypeParameters(pnode) {
-    const params = pnode.typeParameters && pnode.typeParameters.params;
+    const params = pnode.typeParameters && pnode.typeParameters.parameters;
 
     if (!Array.isArray(params) || params.length === 0) {
       return;
diff --git a/packages/eslint-plugin-typescript/lib/rules/no-empty-interface.js b/packages/eslint-plugin-typescript/lib/rules/no-empty-interface.js
@@ -30,15 +30,22 @@ module.exports = {
   create(context) {
     return {
       TSInterfaceDeclaration(node) {
-        if (node.body.body.length === 0) {
-          context.report({
-            node: node.id,
-            message:
-              (!node.extends || node.extends.length === 0)
-                ? 'An empty interface is equivalent to `{}`.'
-                : 'An interface declaring no members is equivalent to its supertype.'
-          });
+        if (node.body.body.length !== 0) {
+          return;
         }
+        let message;
+        if (!node.extends || node.extends.length === 0) {
+          message = 'An empty interface is equivalent to `{}`.';
+        } else if (node.extends.length === 1) {
+          message = 'An interface declaring no members is equivalent to its supertype.'
+        }
+        if (!message) {
+          return;
+        }
+        context.report({
+          node: node.id,
+          message
+        });
       }
     };
   }
diff --git a/packages/eslint-plugin-typescript/lib/rules/no-misused-new.js b/packages/eslint-plugin-typescript/lib/rules/no-misused-new.js
@@ -65,7 +65,7 @@ module.exports = {
     }
 
     return {
-      'TSInterfaceBody > TSConstructSignature'(node) {
+      'TSInterfaceBody > TSConstructSignatureDeclaration'(node) {
         if (isMatchingParentType(node.parent.parent, node.typeAnnotation)) {
           // constructor
           context.report({
diff --git a/packages/eslint-plugin-typescript/package.json b/packages/eslint-plugin-typescript/package.json
@@ -20,8 +20,7 @@
   "scripts": {
     "docs": "eslint-docs",
     "docs:check": "eslint-docs check",
-    "test": "nyc mocha tests --recursive --reporter=dot",
-    "test:coverage": "nyc check-coverage --lines 95 --per-file",
+    "test": "jest --coverage", 
     "recommended:update": "node tools/update-recommended.js"
   },
   "dependencies": {
@@ -30,17 +29,10 @@
   },
   "devDependencies": {
     "eslint": "^5.9.0",
-    "nyc": "^13.1.0",
-    "eslint-docs": "^0.2.6",
-    "mocha": "^5.2.0"
+    "eslint-docs": "^0.2.6"
   },
   "peerDependencies": {
     "eslint": ">=4.13.1 < 6",
     "typescript": "~3.2.1"
-  },
-  "nyc": {
-    "include": [
-      "lib"
-    ]
   }
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ module.exports = {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`return {`
`68`		`- 'TSInterfaceBody > TSConstructSignature'(node) {`
	`68`	`+ 'TSInterfaceBody > TSConstructSignatureDeclaration'(node) {`
`69`	`69`	`if (isMatchingParentType(node.parent.parent, node.typeAnnotation)) {`
`70`	`70`	`// constructor`
`71`	`71`	`context.report({`