Skip to content

Commit d84135a

Browse files
lyubov-voloshkolyubov-voloshko
committed
update http deprecated testing tool
1 parent 82adf0f commit d84135a

File tree

57 files changed

+480
-502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+480
-502
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { ComponentFixture, TestBed } from '@angular/core/testing';
22

33
import { CompanyMemberInvitationComponent } from './company-member-invitation.component';
4-
import { HttpClientTestingModule } from '@angular/common/http/testing';
54
import { MatSnackBarModule } from '@angular/material/snack-bar';
65
import { RouterTestingModule } from '@angular/router/testing';
76
import { Angulartics2Module } from 'angulartics2';
87
import { IPasswordStrengthMeterService } from 'angular-password-strength-meter';
8+
import { provideHttpClient } from '@angular/common/http';
99

1010
describe('CompanyMemberInvitationComponent', () => {
1111
let component: CompanyMemberInvitationComponent;
@@ -14,13 +14,15 @@ describe('CompanyMemberInvitationComponent', () => {
1414
beforeEach(async () => {
1515
await TestBed.configureTestingModule({
1616
imports: [
17-
HttpClientTestingModule,
1817
RouterTestingModule.withRoutes([]),
1918
MatSnackBarModule,
2019
Angulartics2Module.forRoot(),
2120
CompanyMemberInvitationComponent
2221
],
23-
providers: [{ provide: IPasswordStrengthMeterService, useValue: {} }]
22+
providers: [
23+
provideHttpClient(),
24+
{ provide: IPasswordStrengthMeterService, useValue: {} }
25+
]
2426
})
2527
.compileComponents();
2628

‎frontend/src/app/components/company/company.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import { CompanyComponent } from './company.component';
88
import { CompanyService } from 'src/app/services/company.service';
99
import { DeleteMemberDialogComponent } from './delete-member-dialog/delete-member-dialog.component';
1010
import { FormsModule } from '@angular/forms';
11-
import { HttpClientTestingModule } from '@angular/common/http/testing';
1211
import { InviteMemberDialogComponent } from './invite-member-dialog/invite-member-dialog.component';
1312
import { MatInputModule } from '@angular/material/input';
1413
import { MatSnackBarModule } from '@angular/material/snack-bar';
1514
import { RevokeInvitationDialogComponent } from './revoke-invitation-dialog/revoke-invitation-dialog.component';
1615
import { SubscriptionPlans } from 'src/app/models/user';
1716
import { UserService } from 'src/app/services/user.service';
1817
import { of } from 'rxjs';
18+
import { provideHttpClient } from '@angular/common/http';
1919

2020
describe('CompanyComponent', () => {
2121
let component: CompanyComponent;
@@ -111,7 +111,6 @@ describe('CompanyComponent', () => {
111111
beforeEach(async () => {
112112
await TestBed.configureTestingModule({
113113
imports: [
114-
HttpClientTestingModule,
115114
MatSnackBarModule,
116115
MatDialogModule,
117116
Angulartics2Module.forRoot(),
@@ -121,6 +120,7 @@ describe('CompanyComponent', () => {
121120
CompanyComponent
122121
],
123122
providers: [
123+
provideHttpClient(),
124124
{ provide: CompanyService, useValue: fakeCompanyService },
125125
{ provide: UserService, useValue: fakeUserService }
126126
]

‎frontend/src/app/components/company/delete-member-dialog/delete-member-dialog.component.spec.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { ComponentFixture, TestBed } from '@angular/core/testing';
2+
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
23

4+
import { Angulartics2Module } from 'angulartics2';
35
import { DeleteMemberDialogComponent } from './delete-member-dialog.component';
4-
import { HttpClientTestingModule } from '@angular/common/http/testing';
5-
import { MatSnackBarModule } from '@angular/material/snack-bar';
66
import { FormsModule } from '@angular/forms';
7-
import { Angulartics2Module } from 'angulartics2';
8-
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
7+
import { MatSnackBarModule } from '@angular/material/snack-bar';
8+
import { provideHttpClient } from '@angular/common/http';
99

1010
describe('DeleteMemberDialogComponent', () => {
1111
let component: DeleteMemberDialogComponent;
@@ -14,22 +14,22 @@ describe('DeleteMemberDialogComponent', () => {
1414
beforeEach(async () => {
1515
await TestBed.configureTestingModule({
1616
imports: [
17-
HttpClientTestingModule,
18-
MatSnackBarModule,
19-
FormsModule,
20-
Angulartics2Module.forRoot(),
21-
DeleteMemberDialogComponent
17+
MatSnackBarModule,
18+
FormsModule,
19+
Angulartics2Module.forRoot(),
20+
DeleteMemberDialogComponent
2221
],
2322
providers: [
24-
{ provide: MAT_DIALOG_DATA, useValue: {
25-
companyId: '',
26-
user: {
27-
id: '',
28-
email: '',
29-
name: ''
30-
}
31-
} },
32-
{ provide: MatDialogRef, useValue: MatDialogRef }
23+
provideHttpClient(),
24+
{ provide: MAT_DIALOG_DATA, useValue: {
25+
companyId: '',
26+
user: {
27+
id: '',
28+
email: '',
29+
name: ''
30+
}
31+
} },
32+
{ provide: MatDialogRef, useValue: MatDialogRef }
3333
],
3434
})
3535
.compileComponents();

‎frontend/src/app/components/company/invite-member-dialog/invite-member-dialog.component.spec.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { ComponentFixture, TestBed } from '@angular/core/testing';
2+
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
23

3-
import { InviteMemberDialogComponent } from './invite-member-dialog.component';
4-
import { HttpClientTestingModule } from '@angular/common/http/testing';
5-
import { MatSnackBarModule } from '@angular/material/snack-bar';
6-
import { FormsModule } from '@angular/forms';
74
import { Angulartics2Module } from 'angulartics2';
8-
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
95
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
6+
import { FormsModule } from '@angular/forms';
7+
import { InviteMemberDialogComponent } from './invite-member-dialog.component';
8+
import { MatSnackBarModule } from '@angular/material/snack-bar';
9+
import { provideHttpClient } from '@angular/common/http';
1010

1111
describe('AddMemberDialogComponent', () => {
1212
let component: InviteMemberDialogComponent;
@@ -15,16 +15,16 @@ describe('AddMemberDialogComponent', () => {
1515
beforeEach(async () => {
1616
await TestBed.configureTestingModule({
1717
imports: [
18-
HttpClientTestingModule,
19-
MatSnackBarModule,
20-
FormsModule,
21-
Angulartics2Module.forRoot(),
22-
InviteMemberDialogComponent,
23-
BrowserAnimationsModule
18+
MatSnackBarModule,
19+
FormsModule,
20+
Angulartics2Module.forRoot(),
21+
InviteMemberDialogComponent,
22+
BrowserAnimationsModule
2423
],
2524
providers: [
26-
{ provide: MAT_DIALOG_DATA, useValue: { id: '', connections: [] } },
27-
{ provide: MatDialogRef, useValue: MatDialogRef }
25+
provideHttpClient(),
26+
{ provide: MAT_DIALOG_DATA, useValue: { id: '', connections: [] } },
27+
{ provide: MatDialogRef, useValue: MatDialogRef }
2828
],
2929
})
3030
.compileComponents();

‎frontend/src/app/components/company/revoke-invitation-dialog/revoke-invitation-dialog.component.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { RevokeInvitationDialogComponent } from './revoke-invitation-dialog.comp
44
import { Angulartics2Module } from 'angulartics2';
55
import { MatSnackBarModule } from '@angular/material/snack-bar';
66
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
7-
import { HttpClientTestingModule } from '@angular/common/http/testing';
7+
import { provideHttpClient } from '@angular/common/http';
88

99
describe('RevokeInvitationDialogComponent', () => {
1010
let component: RevokeInvitationDialogComponent;
@@ -17,14 +17,14 @@ describe('RevokeInvitationDialogComponent', () => {
1717
beforeEach(async () => {
1818
await TestBed.configureTestingModule({
1919
imports: [
20-
HttpClientTestingModule,
21-
MatSnackBarModule,
22-
Angulartics2Module.forRoot(),
23-
RevokeInvitationDialogComponent
20+
MatSnackBarModule,
21+
Angulartics2Module.forRoot(),
22+
RevokeInvitationDialogComponent
2423
],
2524
providers: [
26-
{ provide: MAT_DIALOG_DATA, useValue: { companyId: '', userEmail: '' } },
27-
{ provide: MatDialogRef, useValue: MatDialogRef }
25+
provideHttpClient(),
26+
{ provide: MAT_DIALOG_DATA, useValue: { companyId: '', userEmail: '' } },
27+
{ provide: MatDialogRef, useValue: MatDialogRef }
2828
],
2929
})
3030
.compileComponents();

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { ConnectDBComponent } from './connect-db.component';
1010
import { ConnectionsService } from 'src/app/services/connections.service';
1111
import { DbConnectionConfirmDialogComponent } from './db-connection-confirm-dialog/db-connection-confirm-dialog.component';
1212
import { DbConnectionDeleteDialogComponent } from './db-connection-delete-dialog/db-connection-delete-dialog.component';
13-
import { HttpClientTestingModule } from '@angular/common/http/testing';
1413
import { MatInputModule } from '@angular/material/input';
1514
import { MatRadioModule } from '@angular/material/radio';
1615
import { MatSelectModule } from '@angular/material/select';
@@ -19,6 +18,7 @@ import { NotificationsService } from 'src/app/services/notifications.service';
1918
import { RouterTestingModule } from "@angular/router/testing";
2019
import { forwardRef } from '@angular/core';
2120
import { of } from 'rxjs';
21+
import { provideHttpClient } from '@angular/common/http';
2222

2323
describe('ConnectDBComponent', () => {
2424
let component: ConnectDBComponent;
@@ -56,26 +56,26 @@ describe('ConnectDBComponent', () => {
5656
beforeEach(async() => {
5757
await TestBed.configureTestingModule({
5858
imports: [
59-
HttpClientTestingModule,
60-
RouterTestingModule.withRoutes([]),
61-
MatSnackBarModule,
62-
FormsModule,
63-
MatSelectModule,
64-
MatRadioModule,
65-
MatInputModule,
66-
MatDialogModule,
67-
BrowserAnimationsModule,
68-
Angulartics2Module.forRoot({}),
69-
ConnectDBComponent
59+
RouterTestingModule.withRoutes([]),
60+
MatSnackBarModule,
61+
FormsModule,
62+
MatSelectModule,
63+
MatRadioModule,
64+
MatInputModule,
65+
MatDialogModule,
66+
BrowserAnimationsModule,
67+
Angulartics2Module.forRoot({}),
68+
ConnectDBComponent
7069
],
7170
providers: [
72-
{
73-
provide: NG_VALUE_ACCESSOR,
74-
useExisting: forwardRef(() => ConnectDBComponent),
75-
multi: true
76-
},
77-
{ provide: NotificationsService, useValue: fakeNotifications },
78-
{ provide: ConnectionsService, useValue: fakeConnectionsService },
71+
provideHttpClient(),
72+
{
73+
provide: NG_VALUE_ACCESSOR,
74+
useExisting: forwardRef(() => ConnectDBComponent),
75+
multi: true
76+
},
77+
{ provide: NotificationsService, useValue: fakeNotifications },
78+
{ provide: ConnectionsService, useValue: fakeConnectionsService },
7979
]
8080
})
8181
.compileComponents();

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/materia
44
import { Angulartics2Module } from 'angulartics2';
55
import { ConnectionsService } from 'src/app/services/connections.service';
66
import { DbConnectionConfirmDialogComponent } from './db-connection-confirm-dialog.component';
7-
import { HttpClientTestingModule } from '@angular/common/http/testing';
87
import { MatSnackBarModule } from '@angular/material/snack-bar';
98
import { Router } from '@angular/router';
109
import { RouterTestingModule } from "@angular/router/testing";
1110
import { of } from 'rxjs';
11+
import { provideHttpClient } from '@angular/common/http';
1212

1313
describe('DbConnectionConfirmDialogComponent', () => {
1414
let component: DbConnectionConfirmDialogComponent;
@@ -22,25 +22,25 @@ describe('DbConnectionConfirmDialogComponent', () => {
2222

2323
await TestBed.configureTestingModule({
2424
imports: [
25-
HttpClientTestingModule,
26-
RouterTestingModule.withRoutes([]),
27-
MatSnackBarModule,
28-
MatDialogModule,
29-
Angulartics2Module.forRoot(),
30-
DbConnectionConfirmDialogComponent
25+
RouterTestingModule.withRoutes([]),
26+
MatSnackBarModule,
27+
MatDialogModule,
28+
Angulartics2Module.forRoot(),
29+
DbConnectionConfirmDialogComponent
3130
],
3231
providers: [
33-
{ provide: MAT_DIALOG_DATA, useValue: {
34-
dbCreds: {
35-
id: '12345678'
36-
}
37-
} },
38-
{ provide: MatDialogRef, useValue: {} },
39-
{ provide: Router, useValue: routerSpy },
40-
{
41-
provide: ConnectionsService,
42-
useValue: fakeConnectionsService
43-
}
32+
provideHttpClient(),
33+
{ provide: MAT_DIALOG_DATA, useValue: {
34+
dbCreds: {
35+
id: '12345678'
36+
}
37+
} },
38+
{ provide: MatDialogRef, useValue: {} },
39+
{ provide: Router, useValue: routerSpy },
40+
{
41+
provide: ConnectionsService,
42+
useValue: fakeConnectionsService
43+
}
4444
],
4545
})
4646
.compileComponents();

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/materia
44

55
import { ConnectionsService } from 'src/app/services/connections.service';
66
import { DbConnectionDeleteDialogComponent } from './db-connection-delete-dialog.component';
7-
import { HttpClientTestingModule } from '@angular/common/http/testing';
87
import { MatSnackBarModule } from '@angular/material/snack-bar';
98
import { Router } from '@angular/router';
109
import { RouterTestingModule } from "@angular/router/testing";
1110
import { of } from 'rxjs';
1211
import { FormsModule } from '@angular/forms';
1312
import { MatRadioModule } from '@angular/material/radio';
13+
import { provideHttpClient } from '@angular/common/http';
1414

1515
xdescribe('DbConnectionDeleteDialogComponent', () => {
1616
let component: DbConnectionDeleteDialogComponent;
@@ -27,24 +27,24 @@ xdescribe('DbConnectionDeleteDialogComponent', () => {
2727

2828
await TestBed.configureTestingModule({
2929
imports: [
30-
HttpClientTestingModule,
31-
RouterTestingModule.withRoutes([]),
32-
MatSnackBarModule,
33-
MatDialogModule,
34-
FormsModule,
35-
MatRadioModule,
36-
Angulartics2Module.forRoot(),
37-
DbConnectionDeleteDialogComponent
30+
RouterTestingModule.withRoutes([]),
31+
MatSnackBarModule,
32+
MatDialogModule,
33+
FormsModule,
34+
MatRadioModule,
35+
Angulartics2Module.forRoot(),
36+
DbConnectionDeleteDialogComponent
3837
],
3938
providers: [
40-
{ provide: MAT_DIALOG_DATA, useValue: {} },
41-
{ provide: MatDialogRef, useValue: mockDialogRef },
42-
{ provide: Router, useValue: routerSpy },
43-
{
44-
provide: ConnectionsService,
45-
useValue: fakeConnectionsService
46-
},
47-
Angulartics2
39+
provideHttpClient(),
40+
{ provide: MAT_DIALOG_DATA, useValue: {} },
41+
{ provide: MatDialogRef, useValue: mockDialogRef },
42+
{ provide: Router, useValue: routerSpy },
43+
{
44+
provide: ConnectionsService,
45+
useValue: fakeConnectionsService
46+
},
47+
Angulartics2
4848
],
4949
}).compileComponents();
5050
});

0 commit comments

Comments
 (0)