Skip to content

ts-migration/expect-expect #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2019
Merged

ts-migration/expect-expect #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/rules/__tests__/expect-expect.test.js → src/rules/__tests__/expect-expect.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { RuleTester } from 'eslint';
import {
AST_NODE_TYPES,
TSESLint,
} from '@typescript-eslint/experimental-utils';
import rule from '../expect-expect';

const ruleTester = new RuleTester({
const ruleTester = new TSESLint.RuleTester({
parserOptions: {
ecmaVersion: 6,
},
Expand Down Expand Up @@ -37,7 +40,7 @@ ruleTester.run('expect-expect', rule, {
errors: [
{
messageId: 'noAssertions',
type: 'CallExpression',
type: AST_NODE_TYPES.CallExpression,
},
],
},
Expand All @@ -46,7 +49,7 @@ ruleTester.run('expect-expect', rule, {
errors: [
{
messageId: 'noAssertions',
type: 'CallExpression',
type: AST_NODE_TYPES.CallExpression,
},
],
},
Expand All @@ -55,7 +58,7 @@ ruleTester.run('expect-expect', rule, {
errors: [
{
messageId: 'noAssertions',
type: 'CallExpression',
type: AST_NODE_TYPES.CallExpression,
},
],
},
Expand All @@ -65,7 +68,7 @@ ruleTester.run('expect-expect', rule, {
errors: [
{
messageId: 'noAssertions',
type: 'CallExpression',
type: AST_NODE_TYPES.CallExpression,
},
],
},
Expand All @@ -75,7 +78,7 @@ ruleTester.run('expect-expect', rule, {
errors: [
{
messageId: 'noAssertions',
type: 'CallExpression',
type: AST_NODE_TYPES.CallExpression,
},
],
},
Expand Down
34 changes: 21 additions & 13 deletions src/rules/expect-expect.js → src/rules/expect-expect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,19 @@
* MIT license, Remco Haszing.
*/

import { getDocsUrl, getNodeName } from './util';
import {
AST_NODE_TYPES,
TSESTree,
} from '@typescript-eslint/experimental-utils';
import { createRule, getNodeName } from './tsUtils';

export default {
export default createRule({
name: __filename,
meta: {
docs: {
url: getDocsUrl(__filename),
category: 'Best Practices',
description: 'Enforce assertion to be made in a test body',
recommended: false,
},
messages: {
noAssertions: 'Test has no assertions',
Expand All @@ -25,24 +32,25 @@ export default {
additionalProperties: false,
},
],
type: 'suggestion',
},
create(context) {
const unchecked = [];
const assertFunctionNames = new Set(
context.options[0] && context.options[0].assertFunctionNames
? context.options[0].assertFunctionNames
: ['expect'],
);
defaultOptions: [{ assertFunctionNames: ['expect'] }],
create(context, [{ assertFunctionNames }]) {
const unchecked: TSESTree.CallExpression[] = [];

return {
CallExpression(node) {
const name = getNodeName(node.callee);
if (name === 'it' || name === 'test') {
unchecked.push(node);
} else if (assertFunctionNames.has(name)) {
} else if (name && assertFunctionNames.includes(name)) {
// Return early in case of nested `it` statements.
for (const ancestor of context.getAncestors()) {
const index = unchecked.indexOf(ancestor);
const index =
ancestor.type === AST_NODE_TYPES.CallExpression
? unchecked.indexOf(ancestor)
: -1;

if (index !== -1) {
unchecked.splice(index, 1);
break;
Expand All @@ -57,4 +65,4 @@ export default {
},
};
},
};
});