From 66471dfadf83bfad2fc919e46be449345cc30a85 Mon Sep 17 00:00:00 2001
From: Fahri Gedik <fahrican9978@gmail.com>
Date: Thu, 25 Sep 2025 12:51:47 +0300
Subject: [PATCH] Remove redundant Angular test environment setup

Eliminated manual Angular test environment initialization from multiple test-setup.ts files, relying on jest-preset-angular defaults. Also removed unused 'timer' and 'firstValueFrom' imports from test specs. This simplifies test configuration and reduces boilerplate.
---
 npm/ng-packs/packages/account-core/src/test-setup.ts  | 11 -----------
 npm/ng-packs/packages/account/src/test-setup.ts       | 11 -----------
 npm/ng-packs/packages/components/src/test-setup.ts    | 11 -----------
 .../core/src/lib/tests/ng-model.component.spec.ts     |  1 -
 npm/ng-packs/packages/core/src/test-setup.ts          | 11 -----------
 .../packages/feature-management/src/test-setup.ts     | 11 -----------
 npm/ng-packs/packages/identity/src/test-setup.ts      | 11 -----------
 .../packages/permission-management/src/test-setup.ts  | 11 -----------
 npm/ng-packs/packages/schematics/src/test-setup.ts    | 11 -----------
 .../packages/setting-management/src/test-setup.ts     | 11 -----------
 .../packages/tenant-management/src/test-setup.ts      | 11 -----------
 npm/ng-packs/packages/theme-basic/src/test-setup.ts   | 11 -----------
 .../src/lib/tests/toaster.service.spec.ts             |  1 -
 npm/ng-packs/packages/theme-shared/src/test-setup.ts  | 11 -----------
 14 files changed, 134 deletions(-)

diff --git a/npm/ng-packs/packages/account-core/src/test-setup.ts b/npm/ng-packs/packages/account-core/src/test-setup.ts
index e3361fb01b..1100b3e8a6 100644
--- a/npm/ng-packs/packages/account-core/src/test-setup.ts
+++ b/npm/ng-packs/packages/account-core/src/test-setup.ts
@@ -1,12 +1 @@
 import 'jest-preset-angular/setup-jest';
-
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/account/src/test-setup.ts b/npm/ng-packs/packages/account/src/test-setup.ts
index e3361fb01b..1100b3e8a6 100644
--- a/npm/ng-packs/packages/account/src/test-setup.ts
+++ b/npm/ng-packs/packages/account/src/test-setup.ts
@@ -1,12 +1 @@
 import 'jest-preset-angular/setup-jest';
-
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/components/src/test-setup.ts b/npm/ng-packs/packages/components/src/test-setup.ts
index 1e2322cf13..1eaa88edf0 100644
--- a/npm/ng-packs/packages/components/src/test-setup.ts
+++ b/npm/ng-packs/packages/components/src/test-setup.ts
@@ -1,14 +1,3 @@
 import 'jest-canvas-mock';
 import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
 setupZoneTestEnv();
-
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/core/src/lib/tests/ng-model.component.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/ng-model.component.spec.ts
index 1da3feb4a5..d447001d4f 100644
--- a/npm/ng-packs/packages/core/src/lib/tests/ng-model.component.spec.ts
+++ b/npm/ng-packs/packages/core/src/lib/tests/ng-model.component.spec.ts
@@ -1,7 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
 import { createHostFactory, SpectatorHost } from '@ngneat/spectator/jest';
-import { timer } from 'rxjs';
 import { AbstractNgModelComponent } from '../abstracts';
 
 @Component({
diff --git a/npm/ng-packs/packages/core/src/test-setup.ts b/npm/ng-packs/packages/core/src/test-setup.ts
index ebbb75f974..13874ec714 100644
--- a/npm/ng-packs/packages/core/src/test-setup.ts
+++ b/npm/ng-packs/packages/core/src/test-setup.ts
@@ -1,12 +1,6 @@
 import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
 setupZoneTestEnv();
 
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
 // Mock window.location for test environment
 Object.defineProperty(window, 'location', {
   value: {
@@ -18,8 +12,3 @@ Object.defineProperty(window, 'location', {
   },
   writable: true,
 });
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/feature-management/src/test-setup.ts b/npm/ng-packs/packages/feature-management/src/test-setup.ts
index e3361fb01b..1100b3e8a6 100644
--- a/npm/ng-packs/packages/feature-management/src/test-setup.ts
+++ b/npm/ng-packs/packages/feature-management/src/test-setup.ts
@@ -1,12 +1 @@
 import 'jest-preset-angular/setup-jest';
-
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/identity/src/test-setup.ts b/npm/ng-packs/packages/identity/src/test-setup.ts
index e3361fb01b..1100b3e8a6 100644
--- a/npm/ng-packs/packages/identity/src/test-setup.ts
+++ b/npm/ng-packs/packages/identity/src/test-setup.ts
@@ -1,12 +1 @@
 import 'jest-preset-angular/setup-jest';
-
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/permission-management/src/test-setup.ts b/npm/ng-packs/packages/permission-management/src/test-setup.ts
index e3361fb01b..1100b3e8a6 100644
--- a/npm/ng-packs/packages/permission-management/src/test-setup.ts
+++ b/npm/ng-packs/packages/permission-management/src/test-setup.ts
@@ -1,12 +1 @@
 import 'jest-preset-angular/setup-jest';
-
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/schematics/src/test-setup.ts b/npm/ng-packs/packages/schematics/src/test-setup.ts
index e3361fb01b..1100b3e8a6 100644
--- a/npm/ng-packs/packages/schematics/src/test-setup.ts
+++ b/npm/ng-packs/packages/schematics/src/test-setup.ts
@@ -1,12 +1 @@
 import 'jest-preset-angular/setup-jest';
-
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/setting-management/src/test-setup.ts b/npm/ng-packs/packages/setting-management/src/test-setup.ts
index e3361fb01b..1100b3e8a6 100644
--- a/npm/ng-packs/packages/setting-management/src/test-setup.ts
+++ b/npm/ng-packs/packages/setting-management/src/test-setup.ts
@@ -1,12 +1 @@
 import 'jest-preset-angular/setup-jest';
-
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/tenant-management/src/test-setup.ts b/npm/ng-packs/packages/tenant-management/src/test-setup.ts
index e3361fb01b..1100b3e8a6 100644
--- a/npm/ng-packs/packages/tenant-management/src/test-setup.ts
+++ b/npm/ng-packs/packages/tenant-management/src/test-setup.ts
@@ -1,12 +1 @@
 import 'jest-preset-angular/setup-jest';
-
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/theme-basic/src/test-setup.ts b/npm/ng-packs/packages/theme-basic/src/test-setup.ts
index 4e0c3b389b..4555f138a7 100644
--- a/npm/ng-packs/packages/theme-basic/src/test-setup.ts
+++ b/npm/ng-packs/packages/theme-basic/src/test-setup.ts
@@ -1,13 +1,2 @@
 import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
 setupZoneTestEnv();
-
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
index 830ba3a394..ae008d73ee 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/tests/toaster.service.spec.ts
@@ -1,7 +1,6 @@
 import { CoreTestingModule } from '@abp/ng.core/testing';
 import { NgModule } from '@angular/core';
 import { createServiceFactory, SpectatorService } from '@ngneat/spectator/jest';
-import { firstValueFrom, timer } from 'rxjs';
 import { ToastContainerComponent } from '../components/toast-container/toast-container.component';
 import { ToastComponent } from '../components/toast/toast.component';
 import { ToasterService } from '../services/toaster.service';
diff --git a/npm/ng-packs/packages/theme-shared/src/test-setup.ts b/npm/ng-packs/packages/theme-shared/src/test-setup.ts
index 3cb67bb820..2cf1ac7191 100644
--- a/npm/ng-packs/packages/theme-shared/src/test-setup.ts
+++ b/npm/ng-packs/packages/theme-shared/src/test-setup.ts
@@ -1,17 +1,6 @@
 import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
 setupZoneTestEnv();
 
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting,
-} from '@angular/platform-browser-dynamic/testing';
-
-getTestBed().resetTestEnvironment();
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
-  teardown: { destroyAfterEach: false },
-});
-
 const originalError = console.error;
 console.error = (...args: any[]) => {
   if (args[0]?.includes?.('ExpressionChangedAfterItHasBeenCheckedError')) {