Skip to content

fix(@schematics/angular): handle pending() in focused and skipped tests in refactor-jasmine-vitest #34689

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

Open
MeAkib wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(@schematics/angular): handle pending() in focused and skipped tests in refactor-jasmine-vitest #34689

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
22 changes: 16 additions & 6 deletions packages/schematics/angular/refactor/jasmine-vitest/transformers/jasmine-lifecycle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,19 @@ export function transformPending(
node: ts.Node,
{ sourceFile, reporter, tsContext }: RefactorContext,
): ts.Node {
if (
!ts.isCallExpression(node) ||
!ts.isIdentifier(node.expression) ||
node.expression.text !== 'it'
) {
if (!ts.isCallExpression(node)) {
return node;
}

// `fit`/`xit` have already become `it.only`/`it.skip` when this transformer runs,
// as `transformFocusedAndSkippedTests` is applied earlier in the pipeline.
const isBareIt = ts.isIdentifier(node.expression) && node.expression.text === 'it';
const isFocusedOrSkippedIt =
ts.isPropertyAccessExpression(node.expression) &&
ts.isIdentifier(node.expression.expression) &&
node.expression.expression.text === 'it' &&
(node.expression.name.text === 'only' || node.expression.name.text === 'skip');
if (!isBareIt && !isFocusedOrSkippedIt) {
return node;
}

Expand Down Expand Up @@ -100,7 +108,9 @@ export function transformPending(
return node;
}

const newExpression = createPropertyAccess(node.expression, 'skip');
// A pending spec never runs its body in Jasmine, even when focused, so `it.only`
// also becomes `it.skip`.
const newExpression = createPropertyAccess('it', 'skip');
const newTestFn = ts.isArrowFunction(testFn)
? ts.factory.updateArrowFunction(
testFn,
Expand Down
28 changes: 28 additions & 0 deletions packages/schematics/angular/refactor/jasmine-vitest/transformers/jasmine-lifecycle_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,34 @@ describe('transformPending', () => {
});
`,
},
{
description: 'should transform a focused test (fit) with pending() to it.skip()',
input: `
fit('is a work in progress', () => {
pending('Not yet implemented');
});
`,
expected: `
it.skip('is a work in progress', () => {
// TODO: vitest-migration: The pending() function was converted to a skipped test (\`it.skip\`). See: https://vitest.dev/api/vi.html#it-skip
// pending('Not yet implemented');
});
`,
},
{
description: 'should comment out pending() in a skipped test (xit)',
input: `
xit('is a work in progress', () => {
pending('Not yet implemented');
});
`,
expected: `
it.skip('is a work in progress', () => {
// TODO: vitest-migration: The pending() function was converted to a skipped test (\`it.skip\`). See: https://vitest.dev/api/vi.html#it-skip
// pending('Not yet implemented');
});
`,
},
];

testCases.forEach(({ description, input, expected }) => {
Expand Down