Merge branch 'master'

.eslintrc.json

@@ -29,19 +29,26 @@
   "overrides": [
     {
       "files": [
-        "packages/eslint-plugin-tslint/**/*.ts",
-        "packages/eslint-plugin/**/*.js",
-        "packages/parser/**/*.ts",
-        "packages/typescript-estree/**/*.ts"
+        "packages/eslint-plugin-tslint/tests/**/*.ts",
+        "packages/eslint-plugin/tests/**/*.js",
+        "packages/parser/tests/**/*.ts",
+        "packages/typescript-estree/tests/**/*.ts"
       ],
       "env": {
         "jest/globals": true
       },
       "rules": {
         "jest/no-disabled-tests": "warn",
         "jest/no-focused-tests": "error",
+        "jest/no-alias-methods": "error",
         "jest/no-identical-title": "error",
+        "jest/no-jasmine-globals": "error",
+        "jest/no-jest-import": "error",
+        "jest/no-test-prefixes": "error",
+        "jest/no-test-callback": "error",
+        "jest/no-test-return-statement": "error",
         "jest/prefer-to-have-length": "warn",
+        "jest/prefer-spy-on": "error",
         "jest/valid-expect": "error"
       }
     },

.vscode/launch.json

@@ -12,7 +12,7 @@
           "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
           "args": [
               "--colors",
-              "${workspaceFolder}/packages/eslint-plugin/tests/lib/rules/${fileBasename}"
+              "tests/lib/rules/${fileBasename}"
           ],
           "console": "integratedTerminal",
           "internalConsoleOptions": "neverOpen"

package.json

@@ -58,7 +58,7 @@
     "cz-conventional-changelog": "2.1.0",
     "eslint": "^5.12.1",
     "eslint-plugin-eslint-plugin": "^2.0.1",
-    "eslint-plugin-jest": "^22.1.3",
+    "eslint-plugin-jest": "^22.2.2",
     "glob": "7.1.2",
     "husky": "^1.3.1",
     "jest": "23.6.0",

packages/eslint-plugin/README.md

@@ -96,7 +96,7 @@ Install [`eslint-config-prettier`](https://github.com/prettier/eslint-config-pre
 | --------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ | -------- |
 | [`@typescript-eslint/adjacent-overload-signatures`](./docs/rules/adjacent-overload-signatures.md)         | Require that member overloads be consecutive (`adjacent-overload-signatures` from TSLint)                                                           | :heavy_check_mark: |          |
 | [`@typescript-eslint/array-type`](./docs/rules/array-type.md)                                             | Requires using either `T[]` or `Array<T>` for arrays (`array-type` from TSLint)                                                                     | :heavy_check_mark: | :wrench: |
-| [`@typescript-eslint/await-promise`](./docs/rules/await-promise.md)                                       | Disallow awaiting a value that is not a Promise (`await-promise` from TSLint)                                                                       | :heavy_check_mark: | :wrench: |
+| [`@typescript-eslint/await-promise`](./docs/rules/await-promise.md)                                       | Disallow awaiting a value that is not a Promise (`await-promise` from TSLint)                                                                       | :heavy_check_mark: |          |
 | [`@typescript-eslint/ban-types`](./docs/rules/ban-types.md)                                               | Enforces that types will not to be used (`ban-types` from TSLint)                                                                                   | :heavy_check_mark: | :wrench: |
 | [`@typescript-eslint/camelcase`](./docs/rules/camelcase.md)                                               | Enforce camelCase naming convention                                                                                                                 | :heavy_check_mark: |          |
 | [`@typescript-eslint/class-name-casing`](./docs/rules/class-name-casing.md)                               | Require PascalCased class and interface names (`class-name` from TSLint)                                                                            | :heavy_check_mark: |          |

packages/eslint-plugin/ROADMAP.md

@@ -1,9 +1,9 @@
 # Roadmap
 
-✅ (28) = done
-🌟 (79) = in ESLint core
-🔌 (33) = in another plugin
-🌓 (17) = implementations differ or ESLint version is missing functionality
+✅ (29) = done<br>
+🌟 (79) = in ESLint core<br>
+🔌 (33) = in another plugin<br>
+🌓 (16) = implementations differ or ESLint version is missing functionality<br>
 🛑 (69) = unimplemented
 
 ## TSLint rules
@@ -96,7 +96,7 @@
 | [`use-default-type-parameter`]       | 🛑  | N/A                                                                   |
 | [`use-isnan`]                        | 🌟  | [`use-isnan`][use-isnan]                                              |
 
-<sup>[1]</sup> The ESLint rule also supports silencing with an extra set of parens (`if ((foo = bar)) {}`)
+<sup>[1]</sup> The ESLint rule also supports silencing with an extra set of parens (`if ((foo = bar)) {}`)<br>
 <sup>[2]</sup> Missing private class member support. [`@typescript-eslint/no-unused-vars`] adds support for some TS-specific features.
 
 ### Maintainability
@@ -120,7 +120,7 @@
 | [`prefer-readonly`]          | 🛑  | N/A                                                |
 | [`trailing-comma`]           | 🌓  | [`comma-dangle`][comma-dangle] or [Prettier]       |
 
-<sup>[1]</sup> Only warns when importing deprecated symbols
+<sup>[1]</sup> Only warns when importing deprecated symbols<br>
 <sup>[2]</sup> Missing support for blank-line-delimited sections
 
 ### Style
@@ -179,7 +179,7 @@
 | [`variable-name`]                   | 🌟  | <sup>[2]</sup>                                                                      |
 | [`whitespace`]                      | 🔌  | Use [Prettier]                                                                      |
 
-<sup>[1]</sup> Recommended config: `["error", { blankLine: "always", prev: "*", next: "return" }]`
+<sup>[1]</sup> Recommended config: `["error", { blankLine: "always", prev: "*", next: "return" }]`<br>
 <sup>[2]</sup> [`camelcase`][camelcase], [`no-underscore-dangle`][no-underscore-dangle], [`id-blacklist`][id-blacklist], and/or [`id-match`][id-match]
 
 ## tslint-microsoft-contrib rules
@@ -245,10 +245,10 @@ Relevant plugins: [`chai-expect-keywords`](https://github.com/gavinaiken/eslint-
 | `use-named-parameter`                 | 🛑  | N/A                                                                    |
 | `use-simple-attributes`               | 🛑  | N/A                                                                    |
 
-<sup>[1]</sup> Enforces blank lines both at the beginning and end of a block
-<sup>[2]</sup> Recommended config: `["error", "ForInStatement"]`
-<sup>[3]</sup> Recommended config: `["error", "declaration", { "allowArrowFunctions": true }]`
-<sup>[4]</sup> Recommended config: `["error", { "terms": ["BUG", "HACK", "FIXME", "LATER", "LATER2", "TODO"], "location": "anywhere" }]`
+<sup>[1]</sup> Enforces blank lines both at the beginning and end of a block<br>
+<sup>[2]</sup> Recommended config: `["error", "ForInStatement"]`<br>
+<sup>[3]</sup> Recommended config: `["error", "declaration", { "allowArrowFunctions": true }]`<br>
+<sup>[4]</sup> Recommended config: `["error", { "terms": ["BUG", "HACK", "FIXME", "LATER", "LATER2", "TODO"], "location": "anywhere" }]`<br>
 <sup>[5]</sup> Does not check class fields.
 
 [insecure-random]: https://github.com/desktop/desktop/blob/master/eslint-rules/insecure-random.js
@@ -310,7 +310,7 @@ Relevant plugins: [`chai-expect-keywords`](https://github.com/gavinaiken/eslint-
 | `react-a11y-titles`                       | 🛑  | N/A                                                        |
 | `react-anchor-blank-noopener`             | 🛑  | N/A                                                        |
 
-<sup>[1]</sup> TSLint rule is more strict
+<sup>[1]</sup> TSLint rule is more strict<br>
 <sup>[2]</sup> ESLint rule only reports for click handlers
 
 [prettier]: https://prettier.io