update router deprecated testing tool

Author: lyubov-voloshko

frontend/src/app/components/audit/audit.component.spec.ts

@@ -5,14 +5,14 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { MatPaginatorModule } from '@angular/material/paginator';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { RouterTestingModule } from "@angular/router/testing";
 import { TablesService } from 'src/app/services/tables.service';
 import { UsersService } from 'src/app/services/users.service';
 import { of } from 'rxjs';
 import { LogAction, LogStatus } from 'src/app/models/logs';
 import { InfoDialogComponent } from './info-dialog/info-dialog.component';
 import { Angulartics2Module } from 'angulartics2';
 import { provideHttpClient } from '@angular/common/http';
+import { provideRouter } from '@angular/router';
 
 describe('AuditComponent', () => {
   let component: AuditComponent;
@@ -73,15 +73,14 @@ describe('AuditComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
     imports: [
-      RouterTestingModule.withRoutes([]),
       MatSnackBarModule,
       MatDialogModule,
       MatPaginatorModule,
       BrowserAnimationsModule,
       Angulartics2Module.forRoot(),
       AuditComponent
     ],
-    providers: [provideHttpClient()]
+    providers: [provideHttpClient(), provideRouter([])]
 })
     .compileComponents();
   });
@@ -91,7 +90,7 @@ describe('AuditComponent', () => {
     component = fixture.componentInstance;
     tablesService = TestBed.inject(TablesService);
     usersService = TestBed.inject(UsersService);
-    dialog = TestBed.get(MatDialog);
+    dialog = TestBed.inject(MatDialog);
 
     fixture.autoDetectChanges();
   });

frontend/src/app/components/company-member-invitation/company-member-invitation.component.spec.ts

@@ -2,29 +2,28 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { CompanyMemberInvitationComponent } from './company-member-invitation.component';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { RouterTestingModule } from '@angular/router/testing';
 import { Angulartics2Module } from 'angulartics2';
 import { IPasswordStrengthMeterService } from 'angular-password-strength-meter';
 import { provideHttpClient } from '@angular/common/http';
+import { provideRouter } from '@angular/router';
 
 describe('CompanyMemberInvitationComponent', () => {
   let component: CompanyMemberInvitationComponent;
   let fixture: ComponentFixture<CompanyMemberInvitationComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-    imports: [
-      RouterTestingModule.withRoutes([]),
-      MatSnackBarModule,
-      Angulartics2Module.forRoot(),
-      CompanyMemberInvitationComponent
-    ],
-    providers: [
-      provideHttpClient(),
-      { provide: IPasswordStrengthMeterService, useValue: {} }
-    ]
-})
-    .compileComponents();
+      imports: [
+        MatSnackBarModule,
+        Angulartics2Module.forRoot(),
+        CompanyMemberInvitationComponent
+      ],
+      providers: [
+        provideHttpClient(),
+        provideRouter([]),
+        { provide: IPasswordStrengthMeterService, useValue: {} }
+      ]
+    }).compileComponents();
 
     fixture = TestBed.createComponent(CompanyMemberInvitationComponent);
     component = fixture.componentInstance;

frontend/src/app/components/connect-db/connect-db.component.spec.ts

@@ -15,10 +15,10 @@ import { MatRadioModule } from '@angular/material/radio';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { NotificationsService } from 'src/app/services/notifications.service';
-import { RouterTestingModule } from "@angular/router/testing";
 import { forwardRef } from '@angular/core';
 import { of } from 'rxjs';
 import { provideHttpClient } from '@angular/common/http';
+import { provideRouter } from '@angular/router';
 
 describe('ConnectDBComponent', () => {
   let component: ConnectDBComponent;
@@ -56,7 +56,6 @@ describe('ConnectDBComponent', () => {
   beforeEach(async() => {
     await TestBed.configureTestingModule({
     imports: [
-      RouterTestingModule.withRoutes([]),
       MatSnackBarModule,
       FormsModule,
       MatSelectModule,
@@ -69,6 +68,7 @@ describe('ConnectDBComponent', () => {
     ],
     providers: [
       provideHttpClient(),
+      provideRouter([]),
       {
           provide: NG_VALUE_ACCESSOR,
           useExisting: forwardRef(() => ConnectDBComponent),

frontend/src/app/components/connect-db/db-connection-confirm-dialog/db-connection-confirm-dialog.component.spec.ts

@@ -5,8 +5,7 @@ import { Angulartics2Module } from 'angulartics2';
 import { ConnectionsService } from 'src/app/services/connections.service';
 import { DbConnectionConfirmDialogComponent } from './db-connection-confirm-dialog.component';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { Router } from '@angular/router';
-import { RouterTestingModule } from "@angular/router/testing";
+import { provideRouter, Router } from '@angular/router';
 import { of } from 'rxjs';
 import { provideHttpClient } from '@angular/common/http';
 
@@ -21,29 +20,28 @@ describe('DbConnectionConfirmDialogComponent', () => {
     routerSpy = {navigate: jasmine.createSpy('navigate')};
 
     await TestBed.configureTestingModule({
-    imports: [
-      RouterTestingModule.withRoutes([]),
-      MatSnackBarModule,
-      MatDialogModule,
-      Angulartics2Module.forRoot(),
-      DbConnectionConfirmDialogComponent
-    ],
-    providers: [
-      provideHttpClient(),
-      { provide: MAT_DIALOG_DATA, useValue: {
-              dbCreds: {
-                  id: '12345678'
-              }
-          } },
-      { provide: MatDialogRef, useValue: {} },
-      { provide: Router, useValue: routerSpy },
-      {
-          provide: ConnectionsService,
-          useValue: fakeConnectionsService
-      }
-    ],
-})
-    .compileComponents();
+      imports: [
+        MatSnackBarModule,
+        MatDialogModule,
+        Angulartics2Module.forRoot(),
+        DbConnectionConfirmDialogComponent
+      ],
+      providers: [
+        provideHttpClient(),
+        provideRouter([]),
+        { provide: MAT_DIALOG_DATA, useValue: {
+                dbCreds: {
+                    id: '12345678'
+                }
+            } },
+        { provide: MatDialogRef, useValue: {} },
+        { provide: Router, useValue: routerSpy },
+        {
+            provide: ConnectionsService,
+            useValue: fakeConnectionsService
+        }
+      ],
+    }).compileComponents();
   });
 
   beforeEach(() => {

frontend/src/app/components/connect-db/db-connection-delete-dialog/db-connection-delete-dialog.component.spec.ts

@@ -5,8 +5,7 @@ import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/materia
 import { ConnectionsService } from 'src/app/services/connections.service';
 import { DbConnectionDeleteDialogComponent } from './db-connection-delete-dialog.component';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { Router } from '@angular/router';
-import { RouterTestingModule } from "@angular/router/testing";
+import { provideRouter, Router } from '@angular/router';
 import { of } from 'rxjs';
 import { FormsModule } from '@angular/forms';
 import { MatRadioModule } from '@angular/material/radio';
@@ -26,27 +25,27 @@ xdescribe('DbConnectionDeleteDialogComponent', () => {
     routerSpy = {navigate: jasmine.createSpy('navigate')};
 
     await TestBed.configureTestingModule({
-    imports: [
-      RouterTestingModule.withRoutes([]),
-      MatSnackBarModule,
-      MatDialogModule,
-      FormsModule,
-      MatRadioModule,
-      Angulartics2Module.forRoot(),
-      DbConnectionDeleteDialogComponent
-    ],
-    providers: [
-      provideHttpClient(),
-      { provide: MAT_DIALOG_DATA, useValue: {} },
-      { provide: MatDialogRef, useValue: mockDialogRef },
-      { provide: Router, useValue: routerSpy },
-      {
-          provide: ConnectionsService,
-          useValue: fakeConnectionsService
-      },
-      Angulartics2
-    ],
-  }).compileComponents();
+      imports: [
+        MatSnackBarModule,
+        MatDialogModule,
+        FormsModule,
+        MatRadioModule,
+        Angulartics2Module.forRoot(),
+        DbConnectionDeleteDialogComponent
+      ],
+      providers: [
+        provideHttpClient(),
+        provideRouter([]),
+        { provide: MAT_DIALOG_DATA, useValue: {} },
+        { provide: MatDialogRef, useValue: mockDialogRef },
+        { provide: Router, useValue: routerSpy },
+        {
+            provide: ConnectionsService,
+            useValue: fakeConnectionsService
+        },
+        Angulartics2
+      ],
+    }).compileComponents();
   });
 
   beforeEach(() => {

frontend/src/app/components/connection-settings/connection-settings.component.spec.ts

@@ -8,12 +8,12 @@ import { ConnectionsService } from 'src/app/services/connections.service';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
-import { RouterTestingModule } from "@angular/router/testing";
 import { TablesService } from 'src/app/services/tables.service';
 import { forwardRef } from '@angular/core';
 import { of } from 'rxjs';
 import { Angulartics2Module } from 'angulartics2';
 import { provideHttpClient } from '@angular/common/http';
+import { provideRouter } from '@angular/router';
 
 describe('ConnectionSettingsComponent', () => {
   let component: ConnectionSettingsComponent;
@@ -75,7 +75,6 @@ describe('ConnectionSettingsComponent', () => {
 
     await TestBed.configureTestingModule({
       imports: [
-        RouterTestingModule.withRoutes([]),
         MatSnackBarModule,
         MatDialogModule,
         FormsModule,
@@ -86,6 +85,7 @@ describe('ConnectionSettingsComponent', () => {
       ],
       providers: [
         provideHttpClient(),
+        provideRouter([]),
         {
           provide: NG_VALUE_ACCESSOR,
           useExisting: forwardRef(() => ConnectionSettingsComponent),

frontend/src/app/components/connections-list/connections-list.component.spec.ts

@@ -4,32 +4,31 @@ import { MatSnackBarModule } from '@angular/material/snack-bar';
 
 import { ConnectionsListComponent } from './connections-list.component';
 import { ConnectionsService } from 'src/app/services/connections.service';
-import { RouterTestingModule } from "@angular/router/testing";
 import { Angulartics2Module } from 'angulartics2';
 import { provideHttpClient } from '@angular/common/http';
+import { provideRouter } from '@angular/router';
 
 describe('ConnectionsListComponent', () => {
   let component: ConnectionsListComponent;
   let fixture: ComponentFixture<ConnectionsListComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-    imports: [
-      RouterTestingModule.withRoutes([]),
-      MatSnackBarModule,
-      MatDialogModule,
-      Angulartics2Module.forRoot({}),
-      ConnectionsListComponent
-    ],
-    providers: [
-      provideHttpClient(),
-      {
-        provide: ConnectionsService,
-        // useClass: ConnectionsServiseStub
-      }
-    ],
-})
-    .compileComponents();
+      imports: [
+        MatSnackBarModule,
+        MatDialogModule,
+        Angulartics2Module.forRoot({}),
+        ConnectionsListComponent
+      ],
+      providers: [
+        provideHttpClient(),
+        provideRouter([]),
+        {
+          provide: ConnectionsService,
+          // useClass: ConnectionsServiseStub
+        }
+      ],
+    }).compileComponents();
   });
 
   beforeEach(() => {

frontend/src/app/components/dashboard/dashboard.component.spec.ts

@@ -1,4 +1,4 @@
-import { ActivatedRoute, Router, convertToParamMap } from '@angular/router';
+import { ActivatedRoute, Router, convertToParamMap, provideRouter } from '@angular/router';
 import { Angulartics2, Angulartics2Module } from 'angulartics2';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
@@ -7,7 +7,6 @@ import { ConnectionsService } from 'src/app/services/connections.service';
 import { DashboardComponent } from './dashboard.component';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { RouterTestingModule } from "@angular/router/testing";
 import { TablesService } from 'src/app/services/tables.service';
 import { of } from 'rxjs';
 import { provideHttpClient } from '@angular/common/http';
@@ -77,14 +76,14 @@ describe('DashboardComponent', () => {
 
     await TestBed.configureTestingModule({
       imports: [
-        RouterTestingModule.withRoutes([]),
         MatSnackBarModule,
         MatDialogModule,
         Angulartics2Module.forRoot(),
         DashboardComponent
       ],
       providers: [
         provideHttpClient(),
+        provideRouter([]),
         {
           provide: ConnectionsService,
           useValue: fakeConnectionsSevice

frontend/src/app/components/dashboard/db-bulk-action-confirmation-dialog/db-bulk-action-confirmation-dialog.component.spec.ts

@@ -3,11 +3,11 @@ import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/materia
 
 import { BbBulkActionConfirmationDialogComponent } from './db-bulk-action-confirmation-dialog.component';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { RouterTestingModule } from "@angular/router/testing";
 import { TablesService } from 'src/app/services/tables.service';
 import { of } from 'rxjs';
 import { Angulartics2Module } from 'angulartics2';
 import { provideHttpClient } from '@angular/common/http';
+import { provideRouter } from '@angular/router';
 
 describe('BbBulkActionConfirmationDialogComponent', () => {
   let component: BbBulkActionConfirmationDialogComponent;
@@ -21,14 +21,14 @@ describe('BbBulkActionConfirmationDialogComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [
-        RouterTestingModule.withRoutes([]),
         MatSnackBarModule,
         MatDialogModule,
         Angulartics2Module.forRoot(),
         BbBulkActionConfirmationDialogComponent
       ],
       providers: [
         provideHttpClient(),
+        provideRouter([]),
         { provide: MAT_DIALOG_DATA, useValue: {
           primaryKeys: [{
             column_name: 'id'

frontend/src/app/components/dashboard/db-table-filters-dialog/db-table-filters-dialog.component.spec.ts

@@ -6,9 +6,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { DbTableFiltersDialogComponent } from './db-table-filters-dialog.component';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { RouterTestingModule } from "@angular/router/testing";
 import { Angulartics2Module } from 'angulartics2';
 import { provideHttpClient } from '@angular/common/http';
+import { provideRouter } from '@angular/router';
 
 describe('DbTableFiltersDialogComponent', () => {
   let component: DbTableFiltersDialogComponent;
@@ -68,7 +68,6 @@ describe('DbTableFiltersDialogComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [
-        RouterTestingModule.withRoutes([]),
         MatSnackBarModule,
         MatDialogModule,
         FormsModule,
@@ -80,6 +79,7 @@ describe('DbTableFiltersDialogComponent', () => {
       ],
       providers: [
         provideHttpClient(),
+        provideRouter([]),
         { provide: MAT_DIALOG_DATA, useValue: {
             connectionID: '12345678',
             tableName: 'users',