Migrate unit tests to Angular 18 syntax (#1153)

jhipster · Jun 6, 2024 · e0d9753 · e0d9753
1 parent 4b9ea7a
commit e0d9753
Show file tree

Hide file tree

Showing 16 changed files with 71 additions and 58 deletions.
diff --git a/generators/ionic/resources/base/src/app/pages/account/account.page.spec.ts b/generators/ionic/resources/base/src/app/pages/account/account.page.spec.ts
@@ -3,8 +3,8 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { AccountPage } from './account.page';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 describe('AccountPage', () => {
   let component: AccountPage;
@@ -14,7 +14,8 @@ describe('AccountPage', () => {
     TestBed.configureTestingModule({
       declarations: [AccountPage],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [TranslateModule.forRoot(), RouterTestingModule, HttpClientTestingModule],
+      imports: [TranslateModule.forRoot()],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
   }));
 

diff --git a/generators/ionic/resources/base/src/app/pages/entities/entities.page.spec.ts b/generators/ionic/resources/base/src/app/pages/entities/entities.page.spec.ts
@@ -3,8 +3,8 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { EntitiesPage } from './entities.page';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 describe('EntitiesPage', () => {
   let component: EntitiesPage;
@@ -14,7 +14,8 @@ describe('EntitiesPage', () => {
     TestBed.configureTestingModule({
       declarations: [EntitiesPage],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [TranslateModule.forRoot(), RouterTestingModule, HttpClientTestingModule],
+      imports: [TranslateModule.forRoot()],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
   }));
 

diff --git a/generators/ionic/resources/jwt/src/app/pages/home/home.page.spec.ts b/generators/ionic/resources/jwt/src/app/pages/home/home.page.spec.ts
@@ -3,8 +3,8 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { HomePage } from './home.page';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 describe('HomePage', () => {
   let component: HomePage;
@@ -14,7 +14,8 @@ describe('HomePage', () => {
     TestBed.configureTestingModule({
       declarations: [HomePage],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [TranslateModule.forRoot(), RouterTestingModule, HttpClientTestingModule],
+      imports: [TranslateModule.forRoot()],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
   }));
 

diff --git a/generators/ionic/resources/jwt/src/app/pages/login/login.page.spec.ts b/generators/ionic/resources/jwt/src/app/pages/login/login.page.spec.ts
@@ -3,8 +3,8 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LoginPage } from './login.page';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 describe('LoginPage', () => {
   let component: LoginPage;
@@ -14,7 +14,8 @@ describe('LoginPage', () => {
     TestBed.configureTestingModule({
       declarations: [LoginPage],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [TranslateModule.forRoot(), RouterTestingModule, HttpClientTestingModule],
+      imports: [TranslateModule.forRoot()],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
   }));
 

diff --git a/generators/ionic/resources/jwt/src/app/pages/signup/signup.page.spec.ts b/generators/ionic/resources/jwt/src/app/pages/signup/signup.page.spec.ts
@@ -3,8 +3,8 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { SignupPage } from './signup.page';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 describe('SignupPage', () => {
   let component: SignupPage;
@@ -14,7 +14,8 @@ describe('SignupPage', () => {
     TestBed.configureTestingModule({
       declarations: [SignupPage],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [TranslateModule.forRoot(), RouterTestingModule, HttpClientTestingModule],
+      imports: [TranslateModule.forRoot()],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
   }));
 

diff --git a/generators/ionic/resources/jwt/src/app/pages/welcome/welcome.page.spec.ts b/generators/ionic/resources/jwt/src/app/pages/welcome/welcome.page.spec.ts
@@ -3,8 +3,8 @@ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { WelcomePage } from './welcome.page';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 describe('WelcomePage', () => {
   let component: WelcomePage;
@@ -14,7 +14,8 @@ describe('WelcomePage', () => {
     TestBed.configureTestingModule({
       declarations: [WelcomePage],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [TranslateModule.forRoot(), RouterTestingModule, HttpClientTestingModule],
+      imports: [TranslateModule.forRoot()],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
   }));
 

diff --git a/generators/ionic/resources/jwt/src/app/services/login/login.service.spec.ts b/generators/ionic/resources/jwt/src/app/services/login/login.service.spec.ts
@@ -1,12 +1,14 @@
 import { TestBed } from '@angular/core/testing';
 import { LoginService } from './login.service';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
 describe('LoginService', () => {
   beforeEach(() =>
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, TranslateModule.forRoot()],
+      imports: [TranslateModule.forRoot()],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }),
   );
 

diff --git a/generators/ionic/resources/jwt/src/app/services/user/user.service.spec.ts b/generators/ionic/resources/jwt/src/app/services/user/user.service.spec.ts
@@ -1,12 +1,14 @@
 import { TestBed } from '@angular/core/testing';
 import { UserService } from './user.service';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
 describe('UserService', () => {
   beforeEach(() =>
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, TranslateModule.forRoot()],
+      imports: [TranslateModule.forRoot()],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }),
   );
 

diff --git a/generators/ionic/resources/oauth2/src/app/app.component.spec.ts b/generators/ionic/resources/oauth2/src/app/app.component.spec.ts
@@ -1,6 +1,7 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TestBed, fakeAsync, tick } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 import { Platform } from '@ionic/angular';
 import { IonicStorageModule } from '@ionic/storage-angular';
@@ -46,11 +47,13 @@ describe('AppComponent', () => {
 
     TestBed.configureTestingModule({
       declarations: [AppComponent],
-      imports: [TranslateModule.forRoot(), HttpClientTestingModule, IonicStorageModule.forRoot()],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
+      imports: [TranslateModule.forRoot(), IonicStorageModule.forRoot()],
       providers: [
         { provide: Platform, useValue: platformSpy },
         { provide: AuthService, useValue: authServiceSpy },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     }).compileComponents();
   });

diff --git a/generators/ionic/resources/oauth2/src/app/pages/home/home.page.spec.ts b/generators/ionic/resources/oauth2/src/app/pages/home/home.page.spec.ts
@@ -1,9 +1,9 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { IonicStorageModule } from '@ionic/storage-angular';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { HomePage } from './home.page';
 import { AuthModule } from '../../auth/auth.module';
 
@@ -15,7 +15,8 @@ describe('HomePage', () => {
     TestBed.configureTestingModule({
       declarations: [HomePage],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [TranslateModule.forRoot(), RouterTestingModule, HttpClientTestingModule, IonicStorageModule.forRoot(), AuthModule],
+      imports: [TranslateModule.forRoot(), IonicStorageModule.forRoot(), AuthModule],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
   }));
 

diff --git a/generators/ionic/resources/oauth2/src/app/pages/login/login.page.spec.ts b/generators/ionic/resources/oauth2/src/app/pages/login/login.page.spec.ts
@@ -2,8 +2,8 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { IonicStorageModule } from '@ionic/storage-angular';
 import { TranslateModule } from '@ngx-translate/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { LoginPage } from './login.page';
 import { AuthModule } from '../../auth/auth.module';
 
@@ -15,7 +15,8 @@ describe('LoginPage', () => {
     TestBed.configureTestingModule({
       declarations: [LoginPage],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [TranslateModule.forRoot(), RouterTestingModule, HttpClientTestingModule, IonicStorageModule.forRoot(), AuthModule],
+      imports: [TranslateModule.forRoot(), IonicStorageModule.forRoot(), AuthModule],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
   }));
 

diff --git a/generators/ionic/resources/oauth2/src/app/pages/welcome/welcome.page.spec.ts b/generators/ionic/resources/oauth2/src/app/pages/welcome/welcome.page.spec.ts
@@ -2,8 +2,8 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { IonicStorageModule } from '@ionic/storage-angular';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { WelcomePage } from './welcome.page';
 import { AuthModule } from '../../auth/auth.module';
 
@@ -15,7 +15,8 @@ describe('WelcomePage', () => {
     TestBed.configureTestingModule({
       declarations: [WelcomePage],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [TranslateModule.forRoot(), HttpClientTestingModule, IonicStorageModule.forRoot(), RouterTestingModule, AuthModule],
+      imports: [TranslateModule.forRoot(), IonicStorageModule.forRoot(), AuthModule],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
   }));
 

diff --git a/generators/ionic/resources/oauth2/src/app/services/login/login.service.spec.ts b/generators/ionic/resources/oauth2/src/app/services/login/login.service.spec.ts
@@ -1,14 +1,16 @@
 import { IonicStorageModule } from '@ionic/storage-angular';
 import { TranslateModule } from '@ngx-translate/core';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { LoginService } from './login.service';
 import { AuthModule } from '../../auth/auth.module';
 
 describe('LoginService', () => {
   beforeEach(() =>
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule, TranslateModule.forRoot(), IonicStorageModule.forRoot(), AuthModule],
+      imports: [TranslateModule.forRoot(), IonicStorageModule.forRoot(), AuthModule],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }),
   );
 

diff --git a/generators/ionic/templates/src/app/pages/entities/_entity-detail.spec.ts.ejs b/generators/ionic/templates/src/app/pages/entities/_entity-detail.spec.ts.ejs
@@ -19,8 +19,8 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ActivatedRoute } from '@angular/router';
 import { of } from 'rxjs';
 import { <%= entityAngularName %>DetailPage } from './<%= entityFileName %>-detail';
@@ -39,13 +39,11 @@ describe('<%= entityAngularName %>DetailPage', () => {
     TestBed.configureTestingModule({
       declarations: [<%= entityAngularName %>DetailPage],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [
-        TranslateModule.forRoot(),
-        HttpClientTestingModule,
-        RouterTestingModule,
-      ],
+      imports: [TranslateModule.forRoot()],
       providers: [
-        { provide: ActivatedRoute, useValue: activatedRouteMock }
+        { provide: ActivatedRoute, useValue: activatedRouteMock },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ]
     }).compileComponents();
   }));

diff --git a/generators/ionic/templates/src/app/pages/entities/_entity-update.spec.ts.ejs b/generators/ionic/templates/src/app/pages/entities/_entity-update.spec.ts.ejs
@@ -19,8 +19,8 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { ActivatedRoute } from '@angular/router';
 import { of } from 'rxjs';
 import { IonicModule } from '@ionic/angular';
@@ -49,13 +49,13 @@ const activatedRouteMock = ({ data: of({ data: entityMock }) } as any) as Activa
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
       imports: [
         TranslateModule.forRoot(),
-        HttpClientTestingModule,
-        RouterTestingModule,
         FormsModule, ReactiveFormsModule, IonicModule ],
-        providers: [
-         { provide: ActivatedRoute, useValue: activatedRouteMock },
-         { provide: UserService, useValue:  userServiceMock },
-        ]
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRouteMock },
+        { provide: UserService, useValue:  userServiceMock },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+      ]
     }).compileComponents();
   }));
 

diff --git a/generators/ionic/templates/src/app/pages/entities/_entity.spec.ts.ejs b/generators/ionic/templates/src/app/pages/entities/_entity.spec.ts.ejs
@@ -19,8 +19,8 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { <%= entityAngularName %>Page } from './<%= entityFileName %>';
 
 describe('<%= entityAngularName %>Page', () => {
@@ -31,11 +31,8 @@ describe('<%= entityAngularName %>Page', () => {
     TestBed.configureTestingModule({
       declarations: [<%= entityAngularName %>Page],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      imports: [
-        TranslateModule.forRoot(),
-        HttpClientTestingModule,
-        RouterTestingModule,
-      ]
+      imports: [TranslateModule.forRoot()],
+      providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
     }).compileComponents();
   }));