Migrate from deprecated RouterTestingModule

V-Paranoiaque · May 5, 2024 · e8bd4f8 · e8bd4f8
1 parent 2a8785c
commit e8bd4f8
Show file tree

Hide file tree

Showing 121 changed files with 184 additions and 264 deletions.
diff --git a/src/app/admin-actions/admin-actions.component.spec.ts b/src/app/admin-actions/admin-actions.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminActionsComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminActionsComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-agora/admin-agora.component.spec.ts b/src/app/admin-agora/admin-agora.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminAgoraComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminAgoraComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-aimage/admin-aimage.component.spec.ts b/src/app/admin-aimage/admin-aimage.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminAimageComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminAimageComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-alliances/admin-alliances.component.spec.ts b/src/app/admin-alliances/admin-alliances.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminAlliancesComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminAlliancesComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-chat/admin-chat.component.spec.ts b/src/app/admin-chat/admin-chat.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminChatComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminChatComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-contact/admin-contact.component.spec.ts b/src/app/admin-contact/admin-contact.component.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideRouter } from '@angular/router';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +22,6 @@ describe('AdminContactComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminContactComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
@@ -33,7 +32,14 @@ describe('AdminContactComponent', () => {
         OAuthModule.forRoot(),
         HttpClientTestingModule,
       ],
-      providers: [Socket, User, OAuthService, BsModalService, FormBuilder],
+      providers: [
+        provideRouter([]),
+        Socket,
+        User,
+        OAuthService,
+        BsModalService,
+        FormBuilder,
+      ],
     }).compileComponents();
     socket = TestBed.inject(Socket);
     socket.setupSocketConnection(environment.SERVER_DEV);

diff --git a/src/app/admin-duplicateemail/admin-duplicateemail.component.spec.ts b/src/app/admin-duplicateemail/admin-duplicateemail.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminDuplicateemailComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminDuplicateemailComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-duplicateip/admin-duplicateip.component.spec.ts b/src/app/admin-duplicateip/admin-duplicateip.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminDuplicateipComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminDuplicateipComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-emails/admin-emails.component.spec.ts b/src/app/admin-emails/admin-emails.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminEmailsComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminEmailsComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-history/admin-history.component.spec.ts b/src/app/admin-history/admin-history.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminHistoryComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminHistoryComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-ip/admin-ip.component.spec.ts b/src/app/admin-ip/admin-ip.component.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideRouter } from '@angular/router';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +22,6 @@ describe('AdminIpComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminIpComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
@@ -33,7 +32,14 @@ describe('AdminIpComponent', () => {
         OAuthModule.forRoot(),
         HttpClientTestingModule,
       ],
-      providers: [Socket, User, OAuthService, BsModalService, FormBuilder],
+      providers: [
+        provideRouter([]),
+        Socket,
+        User,
+        OAuthService,
+        BsModalService,
+        FormBuilder,
+      ],
     }).compileComponents();
     socket = TestBed.inject(Socket);
     socket.setupSocketConnection(environment.SERVER_DEV);

diff --git a/src/app/admin-messages/admin-messages.component.spec.ts b/src/app/admin-messages/admin-messages.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminMessagesComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminMessagesComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-news/admin-news.component.spec.ts b/src/app/admin-news/admin-news.component.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideRouter } from '@angular/router';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +22,6 @@ describe('AdminNewsComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminNewsComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
@@ -33,7 +32,14 @@ describe('AdminNewsComponent', () => {
         OAuthModule.forRoot(),
         HttpClientTestingModule,
       ],
-      providers: [Socket, User, OAuthService, BsModalService, FormBuilder],
+      providers: [
+        provideRouter([]),
+        Socket,
+        User,
+        OAuthService,
+        BsModalService,
+        FormBuilder,
+      ],
     }).compileComponents();
     socket = TestBed.inject(Socket);
     socket.setupSocketConnection(environment.SERVER_DEV);

diff --git a/src/app/admin-page404/admin-page404.component.spec.ts b/src/app/admin-page404/admin-page404.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminPage404Component', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminPage404Component],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-passwordtry/admin-passwordtry.component.spec.ts b/src/app/admin-passwordtry/admin-passwordtry.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminPasswordtryComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminPasswordtryComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-pauses/admin-pauses.component.spec.ts b/src/app/admin-pauses/admin-pauses.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminPausesComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminPausesComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-permissions/admin-permissions.component.spec.ts b/src/app/admin-permissions/admin-permissions.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminPermissionsComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminPermissionsComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-pimage/admin-pimage.component.spec.ts b/src/app/admin-pimage/admin-pimage.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminPimageComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminPimageComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-players/admin-players.component.spec.ts b/src/app/admin-players/admin-players.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminPlayersComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminPlayersComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-prayers/admin-prayers.component.spec.ts b/src/app/admin-prayers/admin-prayers.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminPrayersComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminPrayersComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,

diff --git a/src/app/admin-profile/admin-profile.component.spec.ts b/src/app/admin-profile/admin-profile.component.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideRouter } from '@angular/router';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +22,6 @@ describe('AdminProfileComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminProfileComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
@@ -33,7 +32,14 @@ describe('AdminProfileComponent', () => {
         OAuthModule.forRoot(),
         HttpClientTestingModule,
       ],
-      providers: [Socket, User, OAuthService, BsModalService, FormBuilder],
+      providers: [
+        provideRouter([]),
+        Socket,
+        User,
+        OAuthService,
+        BsModalService,
+        FormBuilder,
+      ],
     }).compileComponents();
     socket = TestBed.inject(Socket);
     socket.setupSocketConnection(environment.SERVER_DEV);

diff --git a/src/app/admin-quests/admin-quests.component.spec.ts b/src/app/admin-quests/admin-quests.component.spec.ts
@@ -1,6 +1,5 @@
 import { TestBed } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { SocketComponent as Socket } from '../../services/socketio.service';
 import { UserComponent as User } from '../../services/user.service';
 import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
@@ -22,7 +21,6 @@ describe('AdminQuestsComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
       declarations: [AdminQuestsComponent],
       imports: [
-        RouterTestingModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,