Merge pull request #196 from brettz9/coverage

Coverage
eslint-community · Apr 9, 2021 · 54c55b3 · 54c55b3
2 parents 7ac8796 + e09cc0d
commit 54c55b3
Show file tree

Hide file tree

Showing 16 changed files with 9,857 additions and 3,283 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,7 +9,6 @@ project, you agree to abide by its terms.
 ## Table of Contents
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
-
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 
 - [How can I contribute?](#how-can-i-contribute)

diff --git a/README.md b/README.md
@@ -90,7 +90,7 @@ or start with the recommended rule set:
 | [`no-new-statics`][no-new-statics]                       | Avoid calling `new` on a Promise static method                                   | :bangbang:  | :wrench: |
 | [`no-return-in-finally`][no-return-in-finally]           | Disallow return statements in `finally()`                                        | :warning:   |          |
 | [`valid-params`][valid-params]                           | Ensures the proper number of arguments are passed to Promise functions           | :warning:   |          |
-| [`prefer-await-to-then`][prefer-await-to-then]           | Prefer `await` to `then()` for reading Promise values                            | :seven:     |          |
+| [`prefer-await-to-then`][prefer-await-to-then]           | Prefer `await` to `then()`/`catch()`/`finally()` for reading Promise values                            | :seven:     |          |
 | [`prefer-await-to-callbacks`][prefer-await-to-callbacks] | Prefer async/await to the callback pattern                                       | :seven:     |          |
 
 **Key**

diff --git a/__tests__/catch-or-return.js b/__tests__/catch-or-return.js
@@ -123,6 +123,9 @@ ruleTester.run('catch-or-return', rule, {
       code: 'frank().then(go).finally()',
       options: [{ terminationMethod: ['catch', 'finally'] }],
     },
+
+    // for coverage
+    'nonPromiseExpressionStatement();',
   ],
 
   invalid: [

diff --git a/__tests__/param-names.js b/__tests__/param-names.js
@@ -17,6 +17,7 @@ ruleTester.run('param-names', rule, {
     'new Promise(resolve => {})',
     'new Promise((resolve, reject) => {})',
     'new Promise(() => {})',
+    'new NonPromise()',
   ],
 
   invalid: [

diff --git a/__tests__/prefer-await-to-callbacks.js b/__tests__/prefer-await-to-callbacks.js
@@ -17,6 +17,7 @@ ruleTester.run('prefer-await-to-callbacks', rule, {
     'async function hi() { await thing().catch() }',
     'dbConn.on("error", err => { console.error(err) })',
     'dbConn.once("error", err => { console.error(err) })',
+    'heart(something => {})',
   ],
 
   invalid: [

diff --git a/__tests__/prefer-await-to-then.js b/__tests__/prefer-await-to-then.js
@@ -8,15 +8,19 @@ const ruleTester = new RuleTester({
   },
 })
 
-const message = 'Prefer await to then().'
+const message = 'Prefer await to then()/catch()/finally().'
 
 ruleTester.run('prefer-await-to-then', rule, {
   valid: [
     'async function hi() { await thing() }',
     'async function hi() { await thing().then() }',
     'async function hi() { await thing().catch() }',
     'a = async () => (await something())',
+    `a = async () => {
+      try { await something() } catch (error) { somethingElse() }
+    }`,
     'something().then(async () => await somethingElse())',
+    'function foo() { hey.somethingElse(x => {}) }',
   ],
 
   invalid: [
@@ -30,12 +34,20 @@ ruleTester.run('prefer-await-to-then', rule, {
     },
     {
       code: 'function foo() { hey.then(function() { }).then(x).catch() }',
-      errors: [{ message }, { message }],
+      errors: [{ message }, { message }, { message }],
     },
     {
       code:
         'async function a() { hey.then(function() { }).then(function() { }) }',
       errors: [{ message }, { message }],
     },
+    {
+      code: 'function foo() { hey.catch(x => {}) }',
+      errors: [{ message }],
+    },
+    {
+      code: 'function foo() { hey.finally(x => {}) }',
+      errors: [{ message }],
+    },
   ],
 })
diff --git a/docs/rules/prefer-await-to-then.md b/docs/rules/prefer-await-to-then.md
@@ -1,4 +1,4 @@
-# Prefer `await` to `then()` for reading Promise values (prefer-await-to-then)
+# Prefer `await` to `then()`/`catch()`/`finally()` for reading Promise values (prefer-await-to-then)
 
 #### Valid
 
@@ -33,4 +33,14 @@ function exampleTwo() {
     .then(doSomethingElseAsync)
     .catch(errors)
 }
+
+function exampleThree() {
+  return myPromise
+    .catch(errors)
+}
+
+function exampleFour() {
+  return myPromise
+    .finally(cleanup)
+}
 ```