From bcbbca7d64db2ec58efcb9436cf3c4dac28cdacc Mon Sep 17 00:00:00 2001 From: sumeyye Date: Tue, 20 Jan 2026 16:24:59 +0300 Subject: [PATCH] update: theme basic and theme shared test utils --- npm/ng-packs/packages/theme-basic/jest.config.ts | 4 ++++ .../theme-basic/src/lib/tests/lazy-style.handler.spec.ts | 2 +- .../packages/theme-basic/src/lib/tests/utils/index.ts | 1 + .../{test-utils.ts => utils/setup-component-resources.ts} | 2 +- npm/ng-packs/packages/theme-shared/jest.config.ts | 4 ++++ .../theme-shared/src/lib/tests/breadcrumb.component.spec.ts | 2 +- .../theme-shared/src/lib/tests/confirmation.service.spec.ts | 2 +- .../theme-shared/src/lib/tests/error.component.spec.ts | 2 +- .../theme-shared/src/lib/tests/loader-bar.component.spec.ts | 2 +- .../theme-shared/src/lib/tests/modal.component.spec.ts | 2 +- .../packages/theme-shared/src/lib/tests/utils/index.ts | 1 + .../{test-utils.ts => utils/setup-component-resources.ts} | 2 +- 12 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 npm/ng-packs/packages/theme-basic/src/lib/tests/utils/index.ts rename npm/ng-packs/packages/theme-basic/src/lib/tests/{test-utils.ts => utils/setup-component-resources.ts} (97%) create mode 100644 npm/ng-packs/packages/theme-shared/src/lib/tests/utils/index.ts rename npm/ng-packs/packages/theme-shared/src/lib/tests/{test-utils.ts => utils/setup-component-resources.ts} (97%) diff --git a/npm/ng-packs/packages/theme-basic/jest.config.ts b/npm/ng-packs/packages/theme-basic/jest.config.ts index 5e30d9abd6..2c6efb6a7e 100644 --- a/npm/ng-packs/packages/theme-basic/jest.config.ts +++ b/npm/ng-packs/packages/theme-basic/jest.config.ts @@ -1,4 +1,8 @@ /* eslint-disable */ +/** + * @deprecated use vitest instead of jest + * @see https://vitest.dev/guide/migration.html#jest + */ export default { displayName: 'theme-basic', preset: '../../jest.preset.js', diff --git a/npm/ng-packs/packages/theme-basic/src/lib/tests/lazy-style.handler.spec.ts b/npm/ng-packs/packages/theme-basic/src/lib/tests/lazy-style.handler.spec.ts index e2e910c5d7..847c3418a6 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/tests/lazy-style.handler.spec.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/tests/lazy-style.handler.spec.ts @@ -7,7 +7,7 @@ import { LazyLoadService, LoadingStrategy, LocalizationService } from '@abp/ng.c import { DocumentDirHandlerService } from '@abp/ng.theme.shared'; import { BOOTSTRAP, createLazyStyleHref, LazyStyleHandler } from '../handlers'; import { LAZY_STYLES } from '../tokens/lazy-styles.token'; -import { setupComponentResources } from './test-utils'; +import { setupComponentResources } from './utils'; describe('LazyStyleHandler', () => { let spectator: SpectatorService; diff --git a/npm/ng-packs/packages/theme-basic/src/lib/tests/utils/index.ts b/npm/ng-packs/packages/theme-basic/src/lib/tests/utils/index.ts new file mode 100644 index 0000000000..73b11724ec --- /dev/null +++ b/npm/ng-packs/packages/theme-basic/src/lib/tests/utils/index.ts @@ -0,0 +1 @@ +export * from './setup-component-resources'; \ No newline at end of file diff --git a/npm/ng-packs/packages/theme-basic/src/lib/tests/test-utils.ts b/npm/ng-packs/packages/theme-basic/src/lib/tests/utils/setup-component-resources.ts similarity index 97% rename from npm/ng-packs/packages/theme-basic/src/lib/tests/test-utils.ts rename to npm/ng-packs/packages/theme-basic/src/lib/tests/utils/setup-component-resources.ts index ac9c9eff50..0795a5e32b 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/tests/test-utils.ts +++ b/npm/ng-packs/packages/theme-basic/src/lib/tests/utils/setup-component-resources.ts @@ -13,7 +13,7 @@ import { fileURLToPath } from 'node:url'; * @example * ```typescript * - * import { setupComponentResources } from './test-utils'; + * import { setupComponentResources } from './utils'; * * beforeAll(() => setupComponentResources('../components/loader-bar', import.meta.url)); * ``` diff --git a/npm/ng-packs/packages/theme-shared/jest.config.ts b/npm/ng-packs/packages/theme-shared/jest.config.ts index af6440fc3e..c03a94ad03 100644 --- a/npm/ng-packs/packages/theme-shared/jest.config.ts +++ b/npm/ng-packs/packages/theme-shared/jest.config.ts @@ -1,4 +1,8 @@ /* eslint-disable */ +/** + * @deprecated use vitest instead of jest + * @see https://vitest.dev/guide/migration.html#jest + */ export default { displayName: 'theme-shared', preset: '../../jest.preset.js', diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts index 74a2fcaa36..d0d204dceb 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/breadcrumb.component.spec.ts @@ -13,7 +13,7 @@ import { RouterModule } from '@angular/router'; import { createRoutingFactory, SpectatorRouting } from '@ngneat/spectator/vitest'; import { of } from 'rxjs'; import { BreadcrumbComponent, BreadcrumbItemsComponent } from '../components'; -import { setupComponentResources } from './test-utils'; +import { setupComponentResources } from './utils'; const mockRoutes: ABP.Route[] = [ { name: '_::Identity', path: '/identity' }, diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts index 3870ca1185..d03e69733d 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/confirmation.service.spec.ts @@ -5,7 +5,7 @@ import { ConfirmationComponent } from '../components'; import { Confirmation } from '../models'; import { ConfirmationService } from '../services'; import { CONFIRMATION_ICONS, DEFAULT_CONFIRMATION_ICONS } from '../tokens/confirmation-icons.token'; -import { setupComponentResources } from './test-utils'; +import { setupComponentResources } from './utils'; describe('ConfirmationService', () => { let spectator: SpectatorService; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts index f2a8716082..d1cb9a5940 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/error.component.spec.ts @@ -6,7 +6,7 @@ import { Subject } from 'rxjs'; import { vi } from 'vitest'; import { HttpErrorWrapperComponent } from '../components/http-error-wrapper/http-error-wrapper.component'; -import { setupComponentResources } from './test-utils'; +import { setupComponentResources } from './utils'; /** * Mock pipe to avoid ABP DI chain diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts index 5d6a90173f..a825cbf7db 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/loader-bar.component.spec.ts @@ -4,7 +4,7 @@ import { NavigationStart, Router } from '@angular/router'; import { createComponentFactory, Spectator } from '@ngneat/spectator/vitest'; import { combineLatest, firstValueFrom, Subject, timer } from 'rxjs'; import { LoaderBarComponent } from '../components/loader-bar/loader-bar.component'; -import { setupComponentResources } from './test-utils'; +import { setupComponentResources } from './utils'; describe('LoaderBarComponent', () => { let spectator: Spectator; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts index 28982aefe2..0caef230ca 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/modal.component.spec.ts @@ -5,7 +5,7 @@ import { createComponentFactory, Spectator } from '@ngneat/spectator/vitest'; import { Confirmation } from '@abp/ng.theme.shared'; import { firstValueFrom, Subject, timer } from 'rxjs'; import { ModalComponent } from '../components/modal/modal.component'; -import { setupComponentResources } from './test-utils'; +import { setupComponentResources } from './utils'; @Component({ template: ` diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/utils/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/utils/index.ts new file mode 100644 index 0000000000..73b11724ec --- /dev/null +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/utils/index.ts @@ -0,0 +1 @@ +export * from './setup-component-resources'; \ No newline at end of file diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/test-utils.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/utils/setup-component-resources.ts similarity index 97% rename from npm/ng-packs/packages/theme-shared/src/lib/tests/test-utils.ts rename to npm/ng-packs/packages/theme-shared/src/lib/tests/utils/setup-component-resources.ts index ac9c9eff50..0795a5e32b 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tests/test-utils.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/utils/setup-component-resources.ts @@ -13,7 +13,7 @@ import { fileURLToPath } from 'node:url'; * @example * ```typescript * - * import { setupComponentResources } from './test-utils'; + * import { setupComponentResources } from './utils'; * * beforeAll(() => setupComponentResources('../components/loader-bar', import.meta.url)); * ```