[Angular] HttpClientTestingModule is deprecated

jhipster · Jun 23, 2024 · 1174e68 · 1174e68
1 parent 83cd26e
commit 1174e68
Show file tree

Hide file tree

Showing 36 changed files with 109 additions and 97 deletions.
diff --git a/...ors/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs b/...ors/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs
@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { TestBed, waitForAsync, tick, fakeAsync, inject } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { ActivatedRoute } from '@angular/router';
 import { of, throwError } from 'rxjs';
 
@@ -30,8 +30,9 @@ describe('ActivateComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, ActivateComponent],
+        imports: [ActivateComponent],
         providers: [
+          provideHttpClient(),
           {
             provide: ActivatedRoute,
             useValue: { queryParams: of({ key: 'ABC123' }) },

diff --git a/...ators/angular/templates/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs b/...ators/angular/templates/src/main/webapp/app/account/activate/activate.service.spec.ts.ejs
@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { ActivateService } from './activate.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -29,7 +30,7 @@ describe('ActivateService Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(ActivateService);

diff --git a/...main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs b/...main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs
@@ -18,7 +18,7 @@
 -%>
 import { ElementRef, signal } from '@angular/core';
 import { ComponentFixture, TestBed, inject, tick, fakeAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import { of, throwError } from 'rxjs';
@@ -32,8 +32,9 @@ describe('PasswordResetFinishComponent', () => {
 
   beforeEach(() => {
     fixture = TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, PasswordResetFinishComponent],
+      imports: [PasswordResetFinishComponent],
       providers: [
+        provideHttpClient(),
         FormBuilder,
         {
           provide: ActivatedRoute,

diff --git a/...c/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts.ejs b/...c/main/webapp/app/account/password-reset/finish/password-reset-finish.service.spec.ts.ejs
@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { PasswordResetFinishService } from './password-reset-finish.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -29,7 +30,7 @@ describe('PasswordResetFinish Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(PasswordResetFinishService);

diff --git a/...src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs b/...src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs
@@ -18,7 +18,7 @@
 -%>
 import { ElementRef, signal } from '@angular/core';
 import { ComponentFixture, TestBed, inject } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { of, throwError } from 'rxjs';
 
@@ -31,8 +31,8 @@ describe('PasswordResetInitComponent', () => {
 
   beforeEach(() => {
     fixture = TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, PasswordResetInitComponent],
-      providers: [FormBuilder],
+      imports: [PasswordResetInitComponent],
+      providers: [provideHttpClient(), FormBuilder],
     })
       .overrideTemplate(PasswordResetInitComponent, '')
       .createComponent(PasswordResetInitComponent);

diff --git a/...s/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs b/...s/src/main/webapp/app/account/password-reset/init/password-reset-init.service.spec.ts.ejs
@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { PasswordResetInitService } from './password-reset-init.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -29,7 +30,7 @@ describe('PasswordResetInit Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(PasswordResetInitService);

diff --git a/...ors/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs b/...ors/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs
@@ -19,8 +19,7 @@
 jest.mock('app/core/auth/account.service');
 
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpResponse } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { HttpResponse, provideHttpClient } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { of, throwError } from 'rxjs';
 
@@ -37,8 +36,8 @@ describe('PasswordComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, PasswordComponent],
-        providers: [FormBuilder, AccountService],
+        imports: [PasswordComponent],
+        providers: [FormBuilder, AccountService, provideHttpClient()],
       })
         .overrideTemplate(PasswordComponent, '')
         .compileComponents();

diff --git a/...ators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs b/...ators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs
@@ -1,5 +1,6 @@
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { PasswordService } from './password.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -11,7 +12,7 @@ describe('Password Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(PasswordService);

diff --git a/...ors/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs b/...ors/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs
@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { ComponentFixture, TestBed, waitForAsync, inject, tick, fakeAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { of, throwError } from 'rxjs';
 <%_ if (enableTranslation) { _%>
@@ -40,10 +40,9 @@ describe('RegisterComponent', () => {
 <%_ if (enableTranslation) { _%>
           TranslateModule.forRoot(),
 <%_ } _%>
-          HttpClientTestingModule,
           RegisterComponent,
         ],
-        providers: [FormBuilder],
+        providers: [provideHttpClient(), FormBuilder],
       })
         .overrideTemplate(RegisterComponent, '')
         .compileComponents();

diff --git a/...ators/angular/templates/src/main/webapp/app/account/register/register.service.spec.ts.ejs b/...ators/angular/templates/src/main/webapp/app/account/register/register.service.spec.ts.ejs
@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { RegisterService } from './register.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -30,7 +31,7 @@ describe('RegisterService Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(RegisterService);

diff --git a/...ors/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs b/...ors/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs
@@ -19,7 +19,7 @@
 jest.mock('app/core/auth/account.service');
 
 import { ComponentFixture, TestBed, inject, tick, fakeAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { of, throwError } from 'rxjs';
 
 import { AccountService } from 'app/core/auth/account.service';
@@ -46,8 +46,8 @@ describe('SessionsComponent', () => {
 
   beforeEach(() => {
     fixture = TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, SessionsComponent],
-      providers: [AccountService],
+      imports: [SessionsComponent],
+      providers: [provideHttpClient(), AccountService],
     })
       .overrideTemplate(SessionsComponent, '')
       .createComponent(SessionsComponent);

diff --git a/...ors/angular/templates/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs b/...ors/angular/templates/src/main/webapp/app/account/settings/settings.component.spec.ts.ejs
@@ -19,7 +19,7 @@
 jest.mock('app/core/auth/account.service');
 
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { FormBuilder } from '@angular/forms';
 import { throwError, of } from 'rxjs';
 <%_ if (enableTranslation) { _%>
@@ -53,10 +53,9 @@ describe('SettingsComponent', () => {
 <%_ if (enableTranslation) { _%>
           TranslateModule.forRoot(),
 <%_ } _%>
-          HttpClientTestingModule,
           SettingsComponent,
         ],
-        providers: [FormBuilder, AccountService],
+        providers: [provideHttpClient(), FormBuilder, AccountService],
       })
         .overrideTemplate(SettingsComponent, '')
         .compileComponents();

diff --git a/...lar/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs b/...lar/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs
@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { of } from 'rxjs';
 
 import ConfigurationComponent from './configuration.component';
@@ -32,8 +32,8 @@ describe('ConfigurationComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, ConfigurationComponent],
-        providers: [ConfigurationService],
+        imports: [ConfigurationComponent],
+        providers: [provideHttpClient(), ConfigurationService],
       })
         .overrideTemplate(ConfigurationComponent, '')
         .compileComponents();

diff --git a/...gular/templates/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs b/...gular/templates/src/main/webapp/app/admin/configuration/configuration.service.spec.ts.ejs
@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { ConfigurationService } from './configuration.service';
 import { Bean, ConfigProps, Env, PropertySource } from './configuration.model';
@@ -29,7 +30,7 @@ describe('Logs Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     expectedResult = null;

diff --git a/generators/angular/templates/src/main/webapp/app/admin/health/health.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/health/health.component.spec.ts.ejs
@@ -17,8 +17,7 @@
  limitations under the License.
 -%>
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpErrorResponse } from '@angular/common/http';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, HttpErrorResponse } from '@angular/common/http';
 import { of, throwError } from 'rxjs';
 
 import HealthComponent from './health.component';
@@ -33,7 +32,8 @@ describe('HealthComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, HealthComponent],
+        imports: [HealthComponent],
+        providers: [provideHttpClient()],
       })
         .overrideTemplate(HealthComponent, '')
         .compileComponents();

diff --git a/generators/angular/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/health/health.service.spec.ts.ejs
@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { HealthService } from './health.service';
 import { ApplicationConfigService } from 'app/core/config/application-config.service';
@@ -29,7 +30,7 @@ describe('HealthService Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(HealthService);

diff --git a/...gular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs b/...gular/templates/src/main/webapp/app/admin/health/modal/health-modal.component.spec.ts.ejs
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 import HealthModalComponent from './health-modal.component';
@@ -12,8 +12,8 @@ describe('HealthModalComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, HealthModalComponent],
-        providers: [NgbActiveModal],
+        imports: [HealthModalComponent],
+        providers: [provideHttpClient(), NgbActiveModal],
       })
         .overrideTemplate(HealthModalComponent, '')
         .compileComponents();

diff --git a/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/logs/logs.component.spec.ts.ejs
@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { of } from 'rxjs';
 
 import LogsComponent from './logs.component';
@@ -35,8 +36,8 @@ describe('LogsComponent', () => {
   beforeEach(
     waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, LogsComponent],
-        providers: [LogsService<%= applicationTypeGateway && serviceDiscoveryAny ? ', GatewayRoutesService' : '' %>],
+        imports: [LogsComponent],
+        providers: [provideHttpClient(), provideHttpClientTesting(), LogsService<%= applicationTypeGateway && serviceDiscoveryAny ? ', GatewayRoutesService' : '' %>],
       })
         .overrideTemplate(LogsComponent, '')
         .compileComponents();

diff --git a/generators/angular/templates/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs b/generators/angular/templates/src/main/webapp/app/admin/logs/logs.service.spec.ts.ejs
@@ -17,7 +17,8 @@
  limitations under the License.
 -%>
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClientTesting, HttpTestingController } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 
 import { LogsService } from './logs.service';
 
@@ -27,7 +28,7 @@ describe('Logs Service', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      providers: [provideHttpClient(), provideHttpClientTesting()],
     });
 
     service = TestBed.inject(LogsService);

diff --git a/...pp/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs b/...pp/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.spec.ts.ejs
@@ -17,7 +17,7 @@
  limitations under the License.
 -%>
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient } from '@angular/common/http';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 import { MetricsModalThreadsComponent } from './metrics-modal-threads.component';
@@ -30,8 +30,8 @@ describe('MetricsModalThreadsComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, MetricsModalThreadsComponent],
-      providers: [NgbActiveModal],
+      imports: [MetricsModalThreadsComponent],
+      providers: [provideHttpClient(), NgbActiveModal],
     })
       .overrideTemplate(MetricsModalThreadsComponent, '')
       .compileComponents();