Skip to content
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.

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

fix(max-expect): reset expect counter when entering and exiting test function calls #1206

Merged
merged 1 commit into from Aug 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 64 additions & 0 deletions src/rules/__tests__/max-expects.test.ts
Expand Up @@ -120,6 +120,70 @@ ruleTester.run('max-expects', rule, {
expect(true).toBeDefined();
});
`,
dedent`
function myHelper() {
expect(true).toBeDefined();
expect(true).toBeDefined();
expect(true).toBeDefined();
};

test('should pass', () => {
expect(true).toBeDefined();
expect(true).toBeDefined();
expect(true).toBeDefined();
});
`,
dedent`
function myHelper1() {
expect(true).toBeDefined();
expect(true).toBeDefined();
expect(true).toBeDefined();
};

test('should pass', () => {
expect(true).toBeDefined();
expect(true).toBeDefined();
expect(true).toBeDefined();
});

function myHelper2() {
expect(true).toBeDefined();
expect(true).toBeDefined();
expect(true).toBeDefined();
};
`,
dedent`
test('should pass', () => {
expect(true).toBeDefined();
expect(true).toBeDefined();
expect(true).toBeDefined();
});

function myHelper() {
expect(true).toBeDefined();
expect(true).toBeDefined();
expect(true).toBeDefined();
};
`,
dedent`
const myHelper1 = () => {
expect(true).toBeDefined();
expect(true).toBeDefined();
expect(true).toBeDefined();
};

test('should pass', function() {
expect(true).toBeDefined();
expect(true).toBeDefined();
expect(true).toBeDefined();
});

const myHelper2 = function() {
expect(true).toBeDefined();
expect(true).toBeDefined();
expect(true).toBeDefined();
};
`,
{
code: dedent`
test('should pass', () => {
Expand Down
8 changes: 5 additions & 3 deletions src/rules/max-expects.ts
Expand Up @@ -36,7 +36,7 @@ export default createRule({
create(context, [{ max }]) {
let count = 0;

const onFunctionExpressionEnter = (node: FunctionExpression) => {
const maybeResetCount = (node: FunctionExpression) => {
const isTestFn =
node.parent?.type !== AST_NODE_TYPES.CallExpression ||
isTypeOfJestFnCall(node.parent, context, ['test']);
Expand All @@ -47,8 +47,10 @@ export default createRule({
};

return {
FunctionExpression: onFunctionExpressionEnter,
ArrowFunctionExpression: onFunctionExpressionEnter,
FunctionExpression: maybeResetCount,
'FunctionExpression:exit': maybeResetCount,
ArrowFunctionExpression: maybeResetCount,
'ArrowFunctionExpression:exit': maybeResetCount,
CallExpression(node) {
const jestFnCall = parseJestFnCall(node, context);

Expand Down