diff --git a/src/rules/__tests__/prefer-expect-assertions.test.ts b/src/rules/__tests__/prefer-expect-assertions.test.ts index 8f0502acf..6b5a4e207 100644 --- a/src/rules/__tests__/prefer-expect-assertions.test.ts +++ b/src/rules/__tests__/prefer-expect-assertions.test.ts @@ -104,6 +104,17 @@ ruleTester.run('prefer-expect-assertions', rule, { }, ], invalid: [ + { + code: 'it("it1", () => foo())', + errors: [ + { + messageId: 'haveExpectAssertions', + column: 1, + line: 1, + suggestions: null, + }, + ], + }, { code: 'it("it1", () => {})', errors: [ diff --git a/src/rules/prefer-expect-assertions.ts b/src/rules/prefer-expect-assertions.ts index 86e0b5fc6..25192e4ef 100644 --- a/src/rules/prefer-expect-assertions.ts +++ b/src/rules/prefer-expect-assertions.ts @@ -52,10 +52,10 @@ type MessageIds = | 'suggestAddingAssertions' | 'suggestRemovingExtraArguments'; -const suggestions: Array<[MessageIds, string]> = [ - ['suggestAddingHasAssertions', 'expect.hasAssertions();'], - ['suggestAddingAssertions', 'expect.assertions();'], -]; +// const suggestions: Array<[MessageIds, string]> = [ +// ['suggestAddingHasAssertions', 'expect.hasAssertions();'], +// ['suggestAddingAssertions', 'expect.assertions();'], +// ]; export default createRule<[RuleOptions], MessageIds>({ name: __filename, @@ -248,14 +248,7 @@ export default createRule<[RuleOptions], MessageIds>({ const [, testFn] = node.arguments; - if ( - !isFunction(testFn) || - testFn.body.type !== AST_NODE_TYPES.BlockStatement - ) { - return; - } - - if (!shouldCheckFunction(testFn)) { + if (!isFunction(testFn) || !shouldCheckFunction(testFn)) { return; } @@ -268,6 +261,15 @@ export default createRule<[RuleOptions], MessageIds>({ return; } + const suggestions: Array<[MessageIds, string]> = []; + + if (testFn.body.type === AST_NODE_TYPES.BlockStatement) { + suggestions.push( + ['suggestAddingHasAssertions', 'expect.hasAssertions();'], + ['suggestAddingAssertions', 'expect.assertions();'], + ); + } + context.report({ messageId: 'haveExpectAssertions', node,