Skip to content

Commit f898fc5

Browse files
ProgrammingByPermutationProgrammingByPermutation
authored
Merge pull request #26 from nullinside-development-group/feature/AngularUpgrade
Updating to Angular v18
2 parents a290132 + 96cdfee commit f898fc5

File tree

9 files changed

+2016
-1717
lines changed

9 files changed

+2016
-1717
lines changed

‎src/package-lock.json‎

Lines changed: 1953 additions & 1668 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/package.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,30 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/animations": "^17.3.5",
16+
"@angular/animations": "^18.0.0",
1717
"@angular/cdk": "^17.3.5",
18-
"@angular/common": "^17.3.5",
19-
"@angular/compiler": "^17.3.5",
20-
"@angular/core": "^17.3.5",
21-
"@angular/forms": "^17.3.5",
18+
"@angular/common": "^18.0.0",
19+
"@angular/compiler": "^18.0.0",
20+
"@angular/core": "^18.0.0",
21+
"@angular/forms": "^18.0.0",
2222
"@angular/material": "^17.3.5",
23-
"@angular/platform-browser": "^17.3.5",
24-
"@angular/platform-browser-dynamic": "^17.3.5",
25-
"@angular/router": "^17.3.5",
23+
"@angular/platform-browser": "^18.0.0",
24+
"@angular/platform-browser-dynamic": "^18.0.0",
25+
"@angular/router": "^18.0.0",
2626
"rxjs": "~7.8.1",
2727
"tslib": "^2.6.2",
28-
"zone.js": "~0.14.4",
28+
"zone.js": "~0.14.6",
2929
"webpack-dev-middleware": ">=7.2.1"
3030
},
3131
"devDependencies": {
32-
"@angular-devkit/build-angular": "^17.3.5",
33-
"@angular-eslint/builder": "17.3.0",
34-
"@angular-eslint/eslint-plugin": "17.3.0",
35-
"@angular-eslint/eslint-plugin-template": "17.3.0",
36-
"@angular-eslint/schematics": "17.3.0",
37-
"@angular-eslint/template-parser": "17.3.0",
38-
"@angular/cli": "^17.3.5",
39-
"@angular/compiler-cli": "^17.3.5",
32+
"@angular-devkit/build-angular": "^18.0.0",
33+
"@angular-eslint/builder": "17.5.0",
34+
"@angular-eslint/eslint-plugin": "17.5.0",
35+
"@angular-eslint/eslint-plugin-template": "17.5.0",
36+
"@angular-eslint/schematics": "rc-v18",
37+
"@angular-eslint/template-parser": "17.5.0",
38+
"@angular/cli": "^18.0.0",
39+
"@angular/compiler-cli": "^18.0.0",
4040
"@types/jasmine": "~5.1.4",
4141
"@typescript-eslint/eslint-plugin": "^7.7.0",
4242
"@typescript-eslint/parser": "^7.7.0",
@@ -50,4 +50,4 @@
5050
"typescript": "~5.4.5",
5151
"webpack-dev-middleware": ">=7.2.1"
5252
}
53-
}
53+
}

‎src/src/app/service/nullinside-null.service.spec.ts‎

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

33
import { NullinsideNullService } from './nullinside-null.service';
4-
import { HttpClientTestingModule } from "@angular/common/http/testing";
4+
import { provideHttpClientTesting } from "@angular/common/http/testing";
5+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
56

67
describe('NullinsideNullService', () => {
78
let service: NullinsideNullService;
89

910
beforeEach(() => {
10-
TestBed.configureTestingModule({
11-
imports: [HttpClientTestingModule]
12-
});
11+
TestBed.configureTestingModule({
12+
imports: [],
13+
providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
14+
});
1315
service = TestBed.inject(NullinsideNullService);
1416
});
1517

‎src/src/app/service/nullinside.service.spec.ts‎

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

33
import { NullinsideService } from './nullinside.service';
4-
import { HttpClientTestingModule } from '@angular/common/http/testing';
4+
import { provideHttpClientTesting } from '@angular/common/http/testing';
5+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
56

67
describe('NullinsideService', () => {
78
let service: NullinsideService;
89

910
beforeEach(() => {
10-
TestBed.configureTestingModule({
11-
imports: [HttpClientTestingModule]
12-
});
11+
TestBed.configureTestingModule({
12+
imports: [],
13+
providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
14+
});
1315
service = TestBed.inject(NullinsideService);
1416
});
1517

‎src/src/app/view/home/home.component.spec.ts‎

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

33
import { HomeComponent } from './home.component';
4-
import { HttpClientTestingModule } from '@angular/common/http/testing';
4+
import { provideHttpClientTesting } from '@angular/common/http/testing';
5+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
56

67
describe('HomeComponent', () => {
78
let component: HomeComponent;
89
let fixture: ComponentFixture<HomeComponent>;
910

1011
beforeEach(async () => {
11-
await TestBed.configureTestingModule({
12-
imports: [HomeComponent, HttpClientTestingModule]
13-
})
12+
await TestBed.configureTestingModule({
13+
imports: [HomeComponent],
14+
providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
15+
})
1416
.compileComponents();
1517

1618
fixture = TestBed.createComponent(HomeComponent);

‎src/src/app/view/imdb-search/imdb-search.component.spec.ts‎

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

33
import { ImdbSearchComponent } from './imdb-search.component';
4-
import { HttpClientTestingModule } from "@angular/common/http/testing";
5-
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
4+
import { provideHttpClientTesting } from "@angular/common/http/testing";
5+
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
6+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
67

78
describe('ImdbSearchComponent', () => {
89
let component: ImdbSearchComponent;
910
let fixture: ComponentFixture<ImdbSearchComponent>;
1011

1112
beforeEach(async () => {
12-
await TestBed.configureTestingModule({
13-
imports: [ImdbSearchComponent, HttpClientTestingModule, BrowserAnimationsModule]
14-
})
13+
await TestBed.configureTestingModule({
14+
imports: [ImdbSearchComponent, BrowserAnimationsModule],
15+
providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
16+
})
1517
.compileComponents();
1618

1719
fixture = TestBed.createComponent(ImdbSearchComponent);

‎src/src/app/view/login-landing/login-landing.component.spec.ts‎

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

33
import { LoginLandingComponent } from './login-landing.component';
4-
import { HttpClientTestingModule } from '@angular/common/http/testing';
5-
import { RouterModule } from '@angular/router';
4+
import { provideHttpClientTesting } from '@angular/common/http/testing';
5+
import { RouterModule } from '@angular/router';
6+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
67

78
describe('GoogleSigninLandingComponent', () => {
89
let component: LoginLandingComponent;
910
let fixture: ComponentFixture<LoginLandingComponent>;
1011

1112
beforeEach(async () => {
12-
await TestBed.configureTestingModule({
13-
imports: [LoginLandingComponent, HttpClientTestingModule, RouterModule.forRoot([])]
14-
})
13+
await TestBed.configureTestingModule({
14+
imports: [LoginLandingComponent, RouterModule.forRoot([])],
15+
providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
16+
})
1517
.compileComponents();
1618

1719
fixture = TestBed.createComponent(LoginLandingComponent);

‎src/src/app/view/login/login.component.spec.ts‎

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

33
import { LoginComponent } from './login.component';
4-
import { HttpClientTestingModule } from '@angular/common/http/testing';
5-
import { RouterModule } from '@angular/router';
4+
import { provideHttpClientTesting } from '@angular/common/http/testing';
5+
import { RouterModule } from '@angular/router';
6+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
67

78
describe('IndexComponent', () => {
89
let component: LoginComponent;
910
let fixture: ComponentFixture<LoginComponent>;
1011

1112
beforeEach(async () => {
12-
await TestBed.configureTestingModule({
13-
imports: [LoginComponent, HttpClientTestingModule, RouterModule.forRoot([])]
14-
})
13+
await TestBed.configureTestingModule({
14+
imports: [LoginComponent, RouterModule.forRoot([])],
15+
providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
16+
})
1517
.compileComponents();
1618

1719
fixture = TestBed.createComponent(LoginComponent);

‎src/src/app/view/vm-manager/vm-manager.component.spec.ts‎

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

33
import { VmManagerComponent } from './vm-manager.component';
4-
import { HttpClientTestingModule } from '@angular/common/http/testing';
4+
import { provideHttpClientTesting } from '@angular/common/http/testing';
5+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
56

67
describe('VmManagerComponent', () => {
78
let component: VmManagerComponent;
89
let fixture: ComponentFixture<VmManagerComponent>;
910

1011
beforeEach(async () => {
11-
await TestBed.configureTestingModule({
12-
imports: [VmManagerComponent, HttpClientTestingModule]
13-
})
12+
await TestBed.configureTestingModule({
13+
imports: [VmManagerComponent],
14+
providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
15+
})
1416
.compileComponents();
1517

1618
fixture = TestBed.createComponent(VmManagerComponent);

0 commit comments

Comments
 (0)