Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 983afe0

Browse files
l-linl-lin
authored
Merge pull request #1799 from l-lin/feat-ng18
chore: upgrade to Angular v18
2 parents a88e47d + a026651 commit 983afe0

21 files changed

+4564
-2749
lines changed

‎demo/src/app/advanced/custom-range-search.component.spec.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RouterTestingModule } from '@angular/router/testing';
2-
import { HttpClientModule } from '@angular/common/http';
2+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
33
import { NO_ERRORS_SCHEMA, SecurityContext } from '@angular/core';
44
import { ComponentFixture, TestBed, tick, waitForAsync } from '@angular/core/testing';
55
import { DataTableDirective, DataTablesModule } from 'angular-datatables';
@@ -16,25 +16,21 @@ let fixture: ComponentFixture<CustomRangeSearchComponent>, component: null| Cust
1616
describe('CustomRangeSearchComponent', () => {
1717
beforeEach(() => {
1818
fixture = TestBed.configureTestingModule({
19-
declarations: [
19+
declarations: [
2020
BaseDemoComponent,
2121
CustomRangeSearchComponent,
2222
DataTableDirective
23-
],
24-
imports: [
25-
AppRoutingModule,
23+
],
24+
schemas: [NO_ERRORS_SCHEMA],
25+
imports: [AppRoutingModule,
2626
RouterTestingModule,
2727
DataTablesModule,
28-
HttpClientModule,
29-
MarkdownModule.forRoot(
30-
{
28+
MarkdownModule.forRoot({
3129
sanitize: SecurityContext.NONE
32-
}
33-
),
34-
FormsModule
35-
],
36-
schemas: [NO_ERRORS_SCHEMA]
37-
}).createComponent(CustomRangeSearchComponent);
30+
}),
31+
FormsModule],
32+
providers: [provideHttpClient(withInterceptorsFromDi())]
33+
}).createComponent(CustomRangeSearchComponent);
3834

3935
component = fixture.componentInstance;
4036

‎demo/src/app/advanced/dt-instance.component.spec.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RouterTestingModule } from '@angular/router/testing';
2-
import { HttpClientModule } from '@angular/common/http';
2+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
33
import { NO_ERRORS_SCHEMA, SecurityContext } from '@angular/core';
44
import { ComponentFixture, TestBed, tick, waitForAsync } from '@angular/core/testing';
55
import { DataTableDirective, DataTablesModule } from 'angular-datatables';
@@ -16,25 +16,21 @@ let fixture: ComponentFixture<DtInstanceComponent>, component: null| DtInstanceC
1616
describe('DtInstanceComponent', () => {
1717
beforeEach(() => {
1818
fixture = TestBed.configureTestingModule({
19-
declarations: [
19+
declarations: [
2020
BaseDemoComponent,
2121
DtInstanceComponent,
2222
DataTableDirective
23-
],
24-
imports: [
25-
AppRoutingModule,
23+
],
24+
schemas: [NO_ERRORS_SCHEMA],
25+
imports: [AppRoutingModule,
2626
RouterTestingModule,
2727
DataTablesModule,
28-
HttpClientModule,
29-
MarkdownModule.forRoot(
30-
{
28+
MarkdownModule.forRoot({
3129
sanitize: SecurityContext.NONE
32-
}
33-
),
34-
FormsModule
35-
],
36-
schemas: [NO_ERRORS_SCHEMA]
37-
}).createComponent(DtInstanceComponent);
30+
}),
31+
FormsModule],
32+
providers: [provideHttpClient(withInterceptorsFromDi())]
33+
}).createComponent(DtInstanceComponent);
3834

3935
component = fixture.componentInstance;
4036

‎demo/src/app/advanced/individual-column-filtering.component.spec.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RouterTestingModule } from '@angular/router/testing';
2-
import { HttpClientModule } from '@angular/common/http';
2+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
33
import { NO_ERRORS_SCHEMA, SecurityContext } from '@angular/core';
44
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
55
import { DataTableDirective, DataTablesModule } from 'angular-datatables';
@@ -24,25 +24,21 @@ function applyValueToInput(inputElement: HTMLInputElement, value: string, table:
2424
describe('IndividualColumnFilteringComponent', () => {
2525
beforeEach(() => {
2626
fixture = TestBed.configureTestingModule({
27-
declarations: [
27+
declarations: [
2828
BaseDemoComponent,
2929
IndividualColumnFilteringComponent,
3030
DataTableDirective
31-
],
32-
imports: [
33-
AppRoutingModule,
31+
],
32+
schemas: [NO_ERRORS_SCHEMA],
33+
imports: [AppRoutingModule,
3434
RouterTestingModule,
3535
DataTablesModule,
36-
HttpClientModule,
37-
MarkdownModule.forRoot(
38-
{
36+
MarkdownModule.forRoot({
3937
sanitize: SecurityContext.NONE
40-
}
41-
),
42-
FormsModule
43-
],
44-
schemas: [NO_ERRORS_SCHEMA]
45-
}).createComponent(IndividualColumnFilteringComponent);
38+
}),
39+
FormsModule],
40+
providers: [provideHttpClient(withInterceptorsFromDi())]
41+
}).createComponent(IndividualColumnFilteringComponent);
4642

4743
component = fixture.componentInstance;
4844

‎demo/src/app/advanced/load-dt-options-with-promise.component.spec.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RouterTestingModule } from '@angular/router/testing';
2-
import { HttpClientModule } from '@angular/common/http';
2+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
33
import { NO_ERRORS_SCHEMA, SecurityContext } from '@angular/core';
44
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
55
import { DataTableDirective, DataTablesModule } from 'angular-datatables';
@@ -16,25 +16,21 @@ let fixture: ComponentFixture<LoadDtOptionsWithPromiseComponent>, component: nul
1616
describe('LoadDtOptionsWithPromiseComponent', () => {
1717
beforeEach(() => {
1818
fixture = TestBed.configureTestingModule({
19-
declarations: [
19+
declarations: [
2020
BaseDemoComponent,
2121
LoadDtOptionsWithPromiseComponent,
2222
DataTableDirective
23-
],
24-
imports: [
25-
AppRoutingModule,
23+
],
24+
schemas: [NO_ERRORS_SCHEMA],
25+
imports: [AppRoutingModule,
2626
RouterTestingModule,
2727
DataTablesModule,
28-
HttpClientModule,
29-
MarkdownModule.forRoot(
30-
{
28+
MarkdownModule.forRoot({
3129
sanitize: SecurityContext.NONE
32-
}
33-
),
34-
FormsModule
35-
],
36-
schemas: [NO_ERRORS_SCHEMA]
37-
}).createComponent(LoadDtOptionsWithPromiseComponent);
30+
}),
31+
FormsModule],
32+
providers: [provideHttpClient(withInterceptorsFromDi())]
33+
}).createComponent(LoadDtOptionsWithPromiseComponent);
3834

3935
component = fixture.componentInstance;
4036

‎demo/src/app/advanced/multiple-tables.component.spec.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RouterTestingModule } from '@angular/router/testing';
2-
import { HttpClientModule } from '@angular/common/http';
2+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
33
import { NO_ERRORS_SCHEMA, QueryList, SecurityContext } from '@angular/core';
44
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
55
import { DataTableDirective, DataTablesModule } from 'angular-datatables';
@@ -16,25 +16,21 @@ let fixture: ComponentFixture<MultipleTablesComponent>, component: null| Multipl
1616
describe('MultipleTablesComponent', () => {
1717
beforeEach(() => {
1818
fixture = TestBed.configureTestingModule({
19-
declarations: [
19+
declarations: [
2020
BaseDemoComponent,
2121
MultipleTablesComponent,
2222
DataTableDirective
23-
],
24-
imports: [
25-
AppRoutingModule,
23+
],
24+
schemas: [NO_ERRORS_SCHEMA],
25+
imports: [AppRoutingModule,
2626
RouterTestingModule,
2727
DataTablesModule,
28-
HttpClientModule,
29-
MarkdownModule.forRoot(
30-
{
28+
MarkdownModule.forRoot({
3129
sanitize: SecurityContext.NONE
32-
}
33-
),
34-
FormsModule
35-
],
36-
schemas: [NO_ERRORS_SCHEMA]
37-
}).createComponent(MultipleTablesComponent);
30+
}),
31+
FormsModule],
32+
providers: [provideHttpClient(withInterceptorsFromDi())]
33+
}).createComponent(MultipleTablesComponent);
3834

3935
component = fixture.componentInstance;
4036

‎demo/src/app/advanced/rerender.component.spec.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RouterTestingModule } from '@angular/router/testing';
2-
import { HttpClientModule } from '@angular/common/http';
2+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
33
import { NO_ERRORS_SCHEMA, SecurityContext } from '@angular/core';
44
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
55
import { DataTableDirective, DataTablesModule } from 'angular-datatables';
@@ -15,25 +15,21 @@ let fixture: ComponentFixture<RerenderComponent>, component: null| RerenderCompo
1515
describe('RerenderComponent', () => {
1616
beforeEach(() => {
1717
fixture = TestBed.configureTestingModule({
18-
declarations: [
18+
declarations: [
1919
BaseDemoComponent,
2020
RerenderComponent,
2121
DataTableDirective
22-
],
23-
imports: [
24-
AppRoutingModule,
22+
],
23+
schemas: [NO_ERRORS_SCHEMA],
24+
imports: [AppRoutingModule,
2525
RouterTestingModule,
2626
DataTablesModule,
27-
HttpClientModule,
28-
MarkdownModule.forRoot(
29-
{
27+
MarkdownModule.forRoot({
3028
sanitize: SecurityContext.NONE
31-
}
32-
),
33-
FormsModule
34-
],
35-
schemas: [NO_ERRORS_SCHEMA]
36-
}).createComponent(RerenderComponent);
29+
}),
30+
FormsModule],
31+
providers: [provideHttpClient(withInterceptorsFromDi())]
32+
}).createComponent(RerenderComponent);
3733

3834
component = fixture.componentInstance;
3935

‎demo/src/app/advanced/router-link.component.spec.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RouterTestingModule } from '@angular/router/testing';
2-
import { HttpClientModule } from '@angular/common/http';
2+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
33
import { NO_ERRORS_SCHEMA, SecurityContext } from '@angular/core';
44
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
55
import { DataTableDirective, DataTablesModule } from 'angular-datatables';
@@ -18,26 +18,22 @@ let fixture: ComponentFixture<RouterLinkComponent>, component: null| RouterLinkC
1818
describe('RouterLinkComponent', () => {
1919
beforeEach(() => {
2020
fixture = TestBed.configureTestingModule({
21-
declarations: [
21+
declarations: [
2222
BaseDemoComponent,
2323
DemoNgComponent,
2424
RouterLinkComponent,
2525
DataTableDirective
26-
],
27-
imports: [
28-
AppRoutingModule,
26+
],
27+
schemas: [NO_ERRORS_SCHEMA],
28+
imports: [AppRoutingModule,
2929
RouterTestingModule,
3030
DataTablesModule,
31-
HttpClientModule,
32-
MarkdownModule.forRoot(
33-
{
31+
MarkdownModule.forRoot({
3432
sanitize: SecurityContext.NONE
35-
}
36-
),
37-
FormsModule
38-
],
39-
schemas: [NO_ERRORS_SCHEMA]
40-
}).createComponent(RouterLinkComponent);
33+
}),
34+
FormsModule],
35+
providers: [provideHttpClient(withInterceptorsFromDi())]
36+
}).createComponent(RouterLinkComponent);
4137

4238
component = fixture.componentInstance;
4339
router = TestBed.inject(Router);

‎demo/src/app/advanced/row-click-event.component.spec.ts

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RouterTestingModule } from '@angular/router/testing';
2-
import { HttpClientModule } from '@angular/common/http';
2+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
33
import { NO_ERRORS_SCHEMA, SecurityContext } from '@angular/core';
44
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
55
import { DataTableDirective, DataTablesModule } from 'angular-datatables';
@@ -15,25 +15,21 @@ let fixture: ComponentFixture<RowClickEventComponent>, component: null| RowClick
1515
describe('RowClickEventComponent', () => {
1616
beforeEach(() => {
1717
fixture = TestBed.configureTestingModule({
18-
declarations: [
18+
declarations: [
1919
BaseDemoComponent,
2020
RowClickEventComponent,
2121
DataTableDirective
22-
],
23-
imports: [
24-
AppRoutingModule,
22+
],
23+
schemas: [NO_ERRORS_SCHEMA],
24+
imports: [AppRoutingModule,
2525
RouterTestingModule,
2626
DataTablesModule,
27-
HttpClientModule,
28-
MarkdownModule.forRoot(
29-
{
27+
MarkdownModule.forRoot({
3028
sanitize: SecurityContext.NONE
31-
}
32-
),
33-
FormsModule
34-
],
35-
schemas: [NO_ERRORS_SCHEMA]
36-
}).createComponent(RowClickEventComponent);
29+
}),
30+
FormsModule],
31+
providers: [provideHttpClient(withInterceptorsFromDi())]
32+
}).createComponent(RowClickEventComponent);
3733

3834
component = fixture.componentInstance;
3935

‎demo/src/app/advanced/using-ng-pipe.component.spec.ts

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { RouterTestingModule } from '@angular/router/testing';
2-
import { HttpClientModule } from '@angular/common/http';
2+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
33
import { NO_ERRORS_SCHEMA, SecurityContext } from '@angular/core';
44
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
55
import { DataTableDirective, DataTablesModule } from 'angular-datatables';
@@ -18,29 +18,25 @@ let fixture: ComponentFixture<UsingNgPipeComponent>, component: null| UsingNgPip
1818
describe('UsingNgPipeComponent', () => {
1919
beforeEach(() => {
2020
fixture = TestBed.configureTestingModule({
21-
declarations: [
21+
declarations: [
2222
BaseDemoComponent,
2323
UsingNgPipeComponent,
2424
DataTableDirective
25-
],
26-
imports: [
27-
AppRoutingModule,
25+
],
26+
schemas: [NO_ERRORS_SCHEMA],
27+
imports: [AppRoutingModule,
2828
RouterTestingModule,
2929
DataTablesModule,
30-
HttpClientModule,
31-
MarkdownModule.forRoot(
32-
{
30+
MarkdownModule.forRoot({
3331
sanitize: SecurityContext.NONE
34-
}
35-
),
36-
FormsModule
37-
],
38-
schemas: [NO_ERRORS_SCHEMA],
39-
providers: [
32+
}),
33+
FormsModule],
34+
providers: [
4035
UpperCasePipe,
41-
CurrencyPipe
42-
]
43-
}).createComponent(UsingNgPipeComponent);
36+
CurrencyPipe,
37+
provideHttpClient(withInterceptorsFromDi())
38+
]
39+
}).createComponent(UsingNgPipeComponent);
4440

4541
component = fixture.componentInstance;
4642

0 commit comments

Comments
 (0)