refactor(@schematics/angular): transform fakeAsync and tick only if they're Angular's and remove imports

Author: yjaaidi

packages/schematics/angular/refactor/jasmine-vitest/test-file-transformer_add-imports_spec.ts

@@ -119,6 +119,8 @@ describe('Jasmine to Vitest Transformer - addImports option', () => {
 
   it('should add imports for `onTestFinished` and `vi` when addImports is true', async () => {
     const input = `
+        import { fakeAsync } from '@angular/core/testing';
+        
         it('works', fakeAsync(() => {
           expect(1).toBe(1);
         }));

packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-flush.ts

@@ -8,10 +8,9 @@
 
 import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { isNamedImportFrom } from '../utils/ast-helpers';
+import { ANGULAR_CORE_TESTING } from '../utils/constants';
 import { RefactorContext, addImportSpecifierRemoval } from '../utils/refactor-context';
 
-const ANGULAR_CORE_TESTING = '@angular/core/testing';
-
 export function transformFakeAsyncFlush(node: ts.Node, ctx: RefactorContext): ts.Node {
   if (
     ts.isCallExpression(node) &&

packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-test.ts

@@ -7,10 +7,21 @@
  */
 
 import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
-import { RefactorContext } from '../utils/refactor-context';
+import { isNamedImportFrom } from '../utils/ast-helpers';
+import { ANGULAR_CORE_TESTING } from '../utils/constants';
+import { RefactorContext, addImportSpecifierRemoval } from '../utils/refactor-context';
 
 export function transformFakeAsyncTest(node: ts.Node, ctx: RefactorContext): ts.Node {
-  if (!isFakeAsyncCallExpression(node)) {
+  if (
+    !(
+      ts.isCallExpression(node) &&
+      ts.isIdentifier(node.expression) &&
+      node.expression.text === 'fakeAsync' &&
+      node.arguments.length >= 1 &&
+      (ts.isArrowFunction(node.arguments[0]) || ts.isFunctionExpression(node.arguments[0])) &&
+      isNamedImportFrom(ctx.sourceFile, 'fakeAsync', ANGULAR_CORE_TESTING)
+    )
+  ) {
     return node;
   }
 
@@ -20,6 +31,8 @@ export function transformFakeAsyncTest(node: ts.Node, ctx: RefactorContext): ts.
     `Transformed \`fakeAsync\` to \`vi.useFakeTimers\`.`,
   );
 
+  addImportSpecifierRemoval(ctx, 'fakeAsync', ANGULAR_CORE_TESTING);
+
   ctx.pendingVitestValueImports.add('onTestFinished');
   ctx.pendingVitestValueImports.add('vi');
 
@@ -79,16 +92,3 @@ export function transformFakeAsyncTest(node: ts.Node, ctx: RefactorContext): ts.
     ts.factory.createBlock(setupStatements),
   );
 }
-
-export function isFakeAsyncCallExpression(node: ts.Node): node is ts.CallExpression & {
-  expression: ts.Identifier;
-  arguments: [ts.ArrowFunction | ts.FunctionExpression];
-} {
-  return (
-    ts.isCallExpression(node) &&
-    ts.isIdentifier(node.expression) &&
-    node.expression.text === 'fakeAsync' &&
-    node.arguments.length >= 1 &&
-    (ts.isArrowFunction(node.arguments[0]) || ts.isFunctionExpression(node.arguments[0]))
-  );
-}

packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-test_spec.ts

@@ -8,11 +8,13 @@
 
 import { expectTransformation } from '../test-helpers';
 
-describe('transformFakeTimersTest', () => {
+describe('transformFakeAsyncTest', () => {
   const testCases = [
     {
       description: 'should transform fakeAsync test to `vi.useFakeTimers()`',
       input: `
+          import { fakeAsync } from '@angular/core/testing';
+
           it('works', fakeAsync(() => {
             expect(1).toBe(1);
           }));
@@ -27,6 +29,23 @@ describe('transformFakeTimersTest', () => {
           });
         `,
     },
+    {
+      description: 'should not replace `fakeAsync` if not imported from `@angular/core/testing`',
+      input: `
+          import { fakeAsync } from './my-fake-async';
+
+          it('works', fakeAsync(() => {
+            expect(1).toBe(1);
+          }));
+        `,
+      expected: `
+          import { fakeAsync } from './my-fake-async';
+
+          it('works', fakeAsync(() => {
+            expect(1).toBe(1);
+          }));
+        `,
+    },
   ];
 
   testCases.forEach(({ description, input, expected }) => {

packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-tick.ts

@@ -7,20 +7,25 @@
  */
 
 import ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
-import { RefactorContext } from '../utils/refactor-context';
+import { isNamedImportFrom } from '../utils/ast-helpers';
+import { ANGULAR_CORE_TESTING } from '../utils/constants';
+import { RefactorContext, addImportSpecifierRemoval } from '../utils/refactor-context';
 
 export function transformFakeAsyncTick(node: ts.Node, ctx: RefactorContext): ts.Node {
   if (
     ts.isCallExpression(node) &&
     ts.isIdentifier(node.expression) &&
-    node.expression.text === 'tick'
+    node.expression.text === 'tick' &&
+    isNamedImportFrom(ctx.sourceFile, 'tick', ANGULAR_CORE_TESTING)
   ) {
     ctx.reporter.reportTransformation(
       ctx.sourceFile,
       node,
       `Transformed \`tick\` to \`await vi.advanceTimersByTimeAsync()\`.`,
     );
 
+    addImportSpecifierRemoval(ctx, 'tick', ANGULAR_CORE_TESTING);
+
     const durationNumericLiteral =
       node.arguments.length > 0 && ts.isNumericLiteral(node.arguments[0])
         ? node.arguments[0]

packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-tick_spec.ts

@@ -12,14 +12,35 @@ describe('transformFakeAsyncTick', () => {
   const testCases = [
     {
       description: 'should replace `tick` with `vi.advanceTimersByTimeAsync`',
-      input: `tick(100);`,
+      input: `
+          import { tick } from '@angular/core/testing';
+          
+          tick(100);
+        `,
       expected: `await vi.advanceTimersByTimeAsync(100);`,
     },
     {
       description: 'should replace `tick()` with `vi.advanceTimersByTimeAsync(0)`',
-      input: `tick();`,
+      input: `
+          import { tick } from '@angular/core/testing';
+          
+          tick();
+        `,
       expected: `await vi.advanceTimersByTimeAsync(0);`,
     },
+    {
+      description: 'should not replace `tick` if not imported from `@angular/core/testing`',
+      input: `
+          import { tick } from './my-tick';
+          
+          tick(100);
+        `,
+      expected: `
+          import { tick } from './my-tick';
+          
+          tick(100);
+        `,
+    },
   ];
 
   testCases.forEach(({ description, input, expected }) => {

packages/schematics/angular/refactor/jasmine-vitest/utils/constants.ts

@@ -0,0 +1 @@
+export const ANGULAR_CORE_TESTING = '@angular/core/testing';