diff --git a/packages/schematics/angular/refactor/jasmine-vitest/test-file-transformer.integration_spec.ts b/packages/schematics/angular/refactor/jasmine-vitest/test-file-transformer.integration_spec.ts index 016c8d9fe1d4..b84aeba57411 100644 --- a/packages/schematics/angular/refactor/jasmine-vitest/test-file-transformer.integration_spec.ts +++ b/packages/schematics/angular/refactor/jasmine-vitest/test-file-transformer.integration_spec.ts @@ -576,10 +576,10 @@ describe('Jasmine to Vitest Transformer - Integration Tests', () => { `; const vitestCode = ` describe('My fakeAsync suite', () => { - beforeAll(() => { + beforeEach(() => { vi.useFakeTimers({ advanceTimeDelta: 1, shouldAdvanceTime: true }); }); - afterAll(() => { + afterEach(() => { vi.useRealTimers(); }); it('works', async () => { diff --git a/packages/schematics/angular/refactor/jasmine-vitest/test-file-transformer_add-imports_spec.ts b/packages/schematics/angular/refactor/jasmine-vitest/test-file-transformer_add-imports_spec.ts index c835dc9640c5..82b76ee31782 100644 --- a/packages/schematics/angular/refactor/jasmine-vitest/test-file-transformer_add-imports_spec.ts +++ b/packages/schematics/angular/refactor/jasmine-vitest/test-file-transformer_add-imports_spec.ts @@ -162,13 +162,13 @@ describe('Jasmine to Vitest Transformer - addImports option', () => { }); `; const expected = ` - import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'; + import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; describe('My fakeAsync suite', () => { - beforeAll(() => { + beforeEach(() => { vi.useFakeTimers({ advanceTimeDelta: 1, shouldAdvanceTime: true }); }); - afterAll(() => { + afterEach(() => { vi.useRealTimers(); }); it('works', async () => { diff --git a/packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-test.ts b/packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-test.ts index ea2a2ef52cb5..723d3a66c4b7 100644 --- a/packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-test.ts +++ b/packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-test.ts @@ -119,14 +119,14 @@ function _transformFakeAsyncCall( function _createFakeTimersHookStatements(ctx: RefactorContext): ts.Statement[] { return [ - // > beforeAll(() => { + // > beforeEach(() => { // > vi.useFakeTimers({ // > advanceTimeDelta: 1, // > shouldAdvanceTime: true // > }); // > }); ts.factory.createExpressionStatement( - ts.factory.createCallExpression(ts.factory.createIdentifier('beforeAll'), undefined, [ + ts.factory.createCallExpression(ts.factory.createIdentifier('beforeEach'), undefined, [ ts.factory.createArrowFunction( undefined, undefined, @@ -156,11 +156,11 @@ function _createFakeTimersHookStatements(ctx: RefactorContext): ts.Statement[] { ]), ), - // > afterAll(() => { + // > afterEach(() => { // > vi.useRealTimers(); // > }); ts.factory.createExpressionStatement( - ts.factory.createCallExpression(ts.factory.createIdentifier('afterAll'), undefined, [ + ts.factory.createCallExpression(ts.factory.createIdentifier('afterEach'), undefined, [ ts.factory.createArrowFunction( undefined, undefined, diff --git a/packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-test_spec.ts b/packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-test_spec.ts index 5efb23282f5a..9ac3e8f5f9bc 100644 --- a/packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-test_spec.ts +++ b/packages/schematics/angular/refactor/jasmine-vitest/transformers/fake-async-test_spec.ts @@ -23,10 +23,10 @@ describe('transformFakeAsyncTest', () => { `, expected: ` describe('My fakeAsync suite', () => { - beforeAll(() => { + beforeEach(() => { vi.useFakeTimers({ advanceTimeDelta: 1, shouldAdvanceTime: true }); }); - afterAll(() => { + afterEach(() => { vi.useRealTimers(); }); it('works', async () => { @@ -49,10 +49,10 @@ describe('transformFakeAsyncTest', () => { `, expected: ` describe('My fakeAsync suite', () => { - beforeAll(() => { + beforeEach(() => { vi.useFakeTimers({ advanceTimeDelta: 1, shouldAdvanceTime: true }); }); - afterAll(() => { + afterEach(() => { vi.useRealTimers(); }); it('works', async (strangeArg: Strange = myStrangeDefault) => { @@ -91,10 +91,10 @@ describe('transformFakeAsyncTest', () => { }); describe('My outer fakeAsync suite', () => { - beforeAll(() => { + beforeEach(() => { vi.useFakeTimers({ advanceTimeDelta: 1, shouldAdvanceTime: true }); }); - afterAll(() => { + afterEach(() => { vi.useRealTimers(); }); @@ -137,10 +137,10 @@ describe('transformFakeAsyncTest', () => { }); describe.skip('My outer fakeAsync suite', () => { - beforeAll(() => { + beforeEach(() => { vi.useFakeTimers({ advanceTimeDelta: 1, shouldAdvanceTime: true }); }); - afterAll(() => { + afterEach(() => { vi.useRealTimers(); }); @@ -178,10 +178,10 @@ describe('transformFakeAsyncTest', () => { `, expected: ` describe('My fakeAsync suite', () => { - beforeAll(() => { + beforeEach(() => { vi.useFakeTimers({ advanceTimeDelta: 1, shouldAdvanceTime: true }); }); - afterAll(() => { + afterEach(() => { vi.useRealTimers(); }); beforeAll(async () => {