@for (status of getStatusHidden(); track status) {
diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts
index 688dc8cd6..0cfdf6e98 100644
--- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts
+++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import {
ComponentFixture,
TestBed,
@@ -27,6 +27,7 @@ import { WidgetFrameComponent } from '../widget-frame/widget-frame.component'
import { UploadFileWidgetComponent } from './upload-file-widget.component'
import { DragDropModule } from '@angular/cdk/drag-drop'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const FAILED_STATUSES = [new FileStatus()]
const WORKING_STATUSES = [new FileStatus(), new FileStatus()]
@@ -59,6 +60,13 @@ describe('UploadFileWidgetComponent', () => {
WidgetFrameComponent,
IfPermissionsDirective,
],
+ imports: [
+ NgbModule,
+ RouterTestingModule.withRoutes(routes),
+ NgbAlertModule,
+ DragDropModule,
+ NgxBootstrapIconsModule.pick(allIcons),
+ ],
providers: [
PermissionsGuard,
{
@@ -67,14 +75,8 @@ describe('UploadFileWidgetComponent', () => {
currentUserCan: () => true,
},
},
- ],
- imports: [
- HttpClientTestingModule,
- NgbModule,
- RouterTestingModule.withRoutes(routes),
- NgbAlertModule,
- DragDropModule,
- NgxBootstrapIconsModule.pick(allIcons),
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
],
}).compileComponents()
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
index 0a6eb3a5f..1a1ba44ad 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
@@ -1,7 +1,7 @@
import { DatePipe } from '@angular/common'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import {
ComponentFixture,
@@ -83,6 +83,8 @@ import { SplitConfirmDialogComponent } from '../common/confirm-dialog/split-conf
import { DeletePagesConfirmDialogComponent } from '../common/confirm-dialog/delete-pages-confirm-dialog/delete-pages-confirm-dialog.component'
import { PdfViewerModule } from 'ng2-pdf-viewer'
import { DataType } from 'src/app/data/datatype'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
+import { TagService } from 'src/app/services/rest/tag.service'
const doc: Document = {
id: 3,
@@ -182,8 +184,51 @@ describe('DocumentDetailComponent', () => {
RotateConfirmDialogComponent,
DeletePagesConfirmDialogComponent,
],
+ imports: [
+ RouterModule.forRoot(routes),
+ NgbModule,
+ NgSelectModule,
+ FormsModule,
+ ReactiveFormsModule,
+ NgbModalModule,
+ NgxBootstrapIconsModule.pick(allIcons),
+ PdfViewerModule,
+ ],
providers: [
DocumentTitlePipe,
+ {
+ provide: TagService,
+ useValue: {
+ listAll: () =>
+ of({
+ count: 3,
+ all: [41, 42, 43],
+ results: [
+ {
+ id: 41,
+ name: 'Tag41',
+ is_inbox_tag: true,
+ color: '#ff0000',
+ text_color: '#000000',
+ },
+ {
+ id: 42,
+ name: 'Tag42',
+ is_inbox_tag: true,
+ color: '#ff0000',
+ text_color: '#000000',
+ },
+ {
+ id: 43,
+ name: 'Tag43',
+ is_inbox_tag: true,
+ color: '#ff0000',
+ text_color: '#000000',
+ },
+ ],
+ }),
+ },
+ },
{
provide: CorrespondentService,
useValue: {
@@ -257,17 +302,8 @@ describe('DocumentDetailComponent', () => {
PermissionsGuard,
CustomDatePipe,
DatePipe,
- ],
- imports: [
- RouterModule.forRoot(routes),
- HttpClientTestingModule,
- NgbModule,
- NgSelectModule,
- FormsModule,
- ReactiveFormsModule,
- NgbModalModule,
- NgxBootstrapIconsModule.pick(allIcons),
- PdfViewerModule,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
],
}).compileComponents()
@@ -989,10 +1025,10 @@ describe('DocumentDetailComponent', () => {
it('should get suggestions', () => {
const suggestionsSpy = jest.spyOn(documentService, 'getSuggestions')
- suggestionsSpy.mockReturnValue(of({ tags: [1, 2] }))
+ suggestionsSpy.mockReturnValue(of({ tags: [42, 43] }))
initNormally()
expect(suggestionsSpy).toHaveBeenCalled()
- expect(component.suggestions).toEqual({ tags: [1, 2] })
+ expect(component.suggestions).toEqual({ tags: [42, 43] })
})
it('should show error if needed for get suggestions', () => {
diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html
index 3f325eae9..bc76e70fd 100644
--- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html
+++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html
@@ -11,7 +11,7 @@
{{title}}
-
+
@for (m of metadata; track m) {
diff --git a/src-ui/src/app/components/document-history/document-history.component.spec.ts b/src-ui/src/app/components/document-history/document-history.component.spec.ts
index 57133ed74..53023f4af 100644
--- a/src-ui/src/app/components/document-history/document-history.component.spec.ts
+++ b/src-ui/src/app/components/document-history/document-history.component.spec.ts
@@ -4,11 +4,12 @@ import { DocumentHistoryComponent } from './document-history.component'
import { DocumentService } from 'src/app/services/rest/document.service'
import { of } from 'rxjs'
import { AuditLogAction } from 'src/app/data/auditlog-entry'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
import { DatePipe } from '@angular/common'
import { NgbCollapseModule, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
import { CorrespondentService } from 'src/app/services/rest/correspondent.service'
import { DocumentTypeService } from 'src/app/services/rest/document-type.service'
import { StoragePathService } from 'src/app/services/rest/storage-path.service'
@@ -27,13 +28,16 @@ describe('DocumentHistoryComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [DocumentHistoryComponent, CustomDatePipe],
- providers: [DatePipe],
imports: [
- HttpClientTestingModule,
NgbCollapseModule,
NgxBootstrapIconsModule.pick(allIcons),
NgbTooltipModule,
],
+ providers: [
+ DatePipe,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
fixture = TestBed.createComponent(DocumentHistoryComponent)
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
index 6a58abf1e..0dd056cfd 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
@@ -1,6 +1,6 @@
import {
HttpTestingController,
- HttpClientTestingModule,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { ComponentFixture, TestBed } from '@angular/core/testing'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
@@ -58,6 +58,7 @@ import { MergeConfirmDialogComponent } from '../../common/confirm-dialog/merge-c
import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const selectionData: SelectionData = {
selected_tags: [
@@ -112,6 +113,14 @@ describe('BulkEditorComponent', () => {
IsNumberPipe,
MergeConfirmDialogComponent,
],
+ imports: [
+ FormsModule,
+ ReactiveFormsModule,
+ NgbModule,
+ NgbModalModule,
+ NgSelectModule,
+ NgxBootstrapIconsModule.pick(allIcons),
+ ],
providers: [
PermissionsService,
{
@@ -188,15 +197,8 @@ describe('BulkEditorComponent', () => {
}),
},
},
- ],
- imports: [
- HttpClientTestingModule,
- FormsModule,
- ReactiveFormsModule,
- NgbModule,
- NgbModalModule,
- NgSelectModule,
- NgxBootstrapIconsModule.pick(allIcons),
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
],
}).compileComponents()
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.spec.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.spec.ts
index 20da1cfad..a3f047f03 100644
--- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.spec.ts
+++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.spec.ts
@@ -1,5 +1,5 @@
import { DatePipe } from '@angular/common'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import {
ComponentFixture,
TestBed,
@@ -22,6 +22,7 @@ import { IsNumberPipe } from 'src/app/pipes/is-number.pipe'
import { PreviewPopupComponent } from '../../common/preview-popup/preview-popup.component'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
import { CustomFieldDisplayComponent } from '../../common/custom-field-display/custom-field-display.component'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const doc = {
id: 10,
@@ -56,15 +57,18 @@ describe('DocumentCardLargeComponent', () => {
PreviewPopupComponent,
CustomFieldDisplayComponent,
],
- providers: [DatePipe],
imports: [
- HttpClientTestingModule,
RouterTestingModule,
NgbPopoverModule,
NgbTooltipModule,
NgbProgressbarModule,
NgxBootstrapIconsModule.pick(allIcons),
],
+ providers: [
+ DatePipe,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
fixture = TestBed.createComponent(DocumentCardLargeComponent)
diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.spec.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.spec.ts
index 2e4b927c3..fc15453be 100644
--- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.spec.ts
+++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.spec.ts
@@ -1,5 +1,5 @@
import { DatePipe } from '@angular/common'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import {
ComponentFixture,
TestBed,
@@ -25,6 +25,7 @@ import { IsNumberPipe } from 'src/app/pipes/is-number.pipe'
import { PreviewPopupComponent } from '../../common/preview-popup/preview-popup.component'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
import { CustomFieldDisplayComponent } from '../../common/custom-field-display/custom-field-display.component'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const doc = {
id: 10,
@@ -70,15 +71,18 @@ describe('DocumentCardSmallComponent', () => {
PreviewPopupComponent,
CustomFieldDisplayComponent,
],
- providers: [DatePipe],
imports: [
- HttpClientTestingModule,
RouterTestingModule,
NgbPopoverModule,
NgbTooltipModule,
NgbProgressbarModule,
NgxBootstrapIconsModule.pick(allIcons),
],
+ providers: [
+ DatePipe,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
fixture = TestBed.createComponent(DocumentCardSmallComponent)
diff --git a/src-ui/src/app/components/document-list/document-list.component.spec.ts b/src-ui/src/app/components/document-list/document-list.component.spec.ts
index 984b27c69..26758b3c0 100644
--- a/src-ui/src/app/components/document-list/document-list.component.spec.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.spec.ts
@@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'
import { DocumentListComponent } from './document-list.component'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { RouterTestingModule } from '@angular/router/testing'
import { routes } from 'src/app/app-routing.module'
import { FilterEditorComponent } from './filter-editor/filter-editor.component'
@@ -60,7 +60,11 @@ import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-view-config-dialog.component'
import { TextComponent } from '../common/input/text/text.component'
import { CheckComponent } from '../common/input/check/check.component'
-import { HttpErrorResponse } from '@angular/common/http'
+import {
+ HttpErrorResponse,
+ provideHttpClient,
+ withInterceptorsFromDi,
+} from '@angular/common/http'
import { PermissionsGuard } from 'src/app/guards/permissions.guard'
import { SettingsService } from 'src/app/services/settings.service'
import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
@@ -134,17 +138,7 @@ describe('DocumentListComponent', () => {
SafeHtmlPipe,
IsNumberPipe,
],
- providers: [
- FilterPipe,
- CustomDatePipe,
- DatePipe,
- DocumentTitlePipe,
- UsernamePipe,
- SafeHtmlPipe,
- PermissionsGuard,
- ],
imports: [
- HttpClientTestingModule,
RouterTestingModule.withRoutes(routes),
FormsModule,
ReactiveFormsModule,
@@ -156,6 +150,17 @@ describe('DocumentListComponent', () => {
NgSelectModule,
NgbTypeaheadModule,
],
+ providers: [
+ FilterPipe,
+ CustomDatePipe,
+ DatePipe,
+ DocumentTitlePipe,
+ UsernamePipe,
+ SafeHtmlPipe,
+ PermissionsGuard,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
documentListService = TestBed.inject(DocumentListViewService)
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
index 0fcbbc299..5b95d4407 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts
@@ -1,7 +1,7 @@
import { DatePipe } from '@angular/common'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import {
ComponentFixture,
@@ -94,6 +94,7 @@ import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
import { RouterModule } from '@angular/router'
import { SearchService } from 'src/app/services/rest/search.service'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const tags: Tag[] = [
{
@@ -181,6 +182,15 @@ describe('FilterEditorComponent', () => {
DatesDropdownComponent,
CustomDatePipe,
],
+ imports: [
+ RouterModule,
+ NgbDropdownModule,
+ FormsModule,
+ ReactiveFormsModule,
+ NgbDatepickerModule,
+ NgxBootstrapIconsModule.pick(allIcons),
+ NgbTypeaheadModule,
+ ],
providers: [
FilterPipe,
CustomDatePipe,
@@ -222,16 +232,8 @@ describe('FilterEditorComponent', () => {
},
},
SettingsService,
- ],
- imports: [
- HttpClientTestingModule,
- RouterModule,
- NgbDropdownModule,
- FormsModule,
- ReactiveFormsModule,
- NgbDatepickerModule,
- NgxBootstrapIconsModule.pick(allIcons),
- NgbTypeaheadModule,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
],
}).compileComponents()
diff --git a/src-ui/src/app/components/document-notes/document-notes.component.spec.ts b/src-ui/src/app/components/document-notes/document-notes.component.spec.ts
index 4472d5ca5..3853d9fda 100644
--- a/src-ui/src/app/components/document-notes/document-notes.component.spec.ts
+++ b/src-ui/src/app/components/document-notes/document-notes.component.spec.ts
@@ -6,7 +6,7 @@ import { of, throwError } from 'rxjs'
import { DocumentNotesService } from 'src/app/services/rest/document-notes.service'
import { ToastService } from 'src/app/services/toast.service'
import { DocumentNote } from 'src/app/data/document-note'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
import { DatePipe } from '@angular/common'
@@ -14,6 +14,7 @@ import { By } from '@angular/platform-browser'
import { PermissionsService } from 'src/app/services/permissions.service'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const notes: DocumentNote[] = [
{
@@ -61,6 +62,11 @@ describe('DocumentNotesComponent', () => {
CustomDatePipe,
IfPermissionsDirective,
],
+ imports: [
+ FormsModule,
+ ReactiveFormsModule,
+ NgxBootstrapIconsModule.pick(allIcons),
+ ],
providers: [
{
provide: UserService,
@@ -94,12 +100,8 @@ describe('DocumentNotesComponent', () => {
},
CustomDatePipe,
DatePipe,
- ],
- imports: [
- HttpClientTestingModule,
- FormsModule,
- ReactiveFormsModule,
- NgxBootstrapIconsModule.pick(allIcons),
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
],
}).compileComponents()
diff --git a/src-ui/src/app/components/file-drop/file-drop.component.spec.ts b/src-ui/src/app/components/file-drop/file-drop.component.spec.ts
index d35bf54d9..c58a64708 100644
--- a/src-ui/src/app/components/file-drop/file-drop.component.spec.ts
+++ b/src-ui/src/app/components/file-drop/file-drop.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import {
ComponentFixture,
TestBed,
@@ -15,6 +15,7 @@ import { UploadDocumentsService } from 'src/app/services/upload-documents.servic
import { ToastsComponent } from '../common/toasts/toasts.component'
import { FileDropComponent } from './file-drop.component'
import { NgxFileDropEntry, NgxFileDropModule } from 'ngx-file-drop'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('FileDropComponent', () => {
let component: FileDropComponent
@@ -27,8 +28,11 @@ describe('FileDropComponent', () => {
beforeEach(() => {
TestBed.configureTestingModule({
declarations: [FileDropComponent, ToastsComponent],
- providers: [],
- imports: [HttpClientTestingModule, NgxFileDropModule],
+ imports: [NgxFileDropModule],
+ providers: [
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
permissionsService = TestBed.inject(PermissionsService)
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.spec.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.spec.ts
index ff6618197..788f6e368 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.spec.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.spec.ts
@@ -1,6 +1,6 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'
import { CorrespondentListComponent } from './correspondent-list.component'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { DatePipe } from '@angular/common'
import { SortableDirective } from 'src/app/directives/sortable.directive'
import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap'
@@ -10,6 +10,7 @@ import { IfPermissionsDirective } from 'src/app/directives/if-permissions.direct
import { CorrespondentService } from 'src/app/services/rest/correspondent.service'
import { of } from 'rxjs'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('CorrespondentListComponent', () => {
let component: CorrespondentListComponent
@@ -24,14 +25,17 @@ describe('CorrespondentListComponent', () => {
PageHeaderComponent,
IfPermissionsDirective,
],
- providers: [DatePipe],
imports: [
- HttpClientTestingModule,
NgbPaginationModule,
FormsModule,
ReactiveFormsModule,
NgxBootstrapIconsModule.pick(allIcons),
],
+ providers: [
+ DatePipe,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
correspondentsService = TestBed.inject(CorrespondentService)
})
diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.spec.ts b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.spec.ts
index 8797d6803..2bb6c82d7 100644
--- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.spec.ts
+++ b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'
import { CustomFieldsComponent } from './custom-fields.component'
import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { By } from '@angular/platform-browser'
import {
@@ -21,6 +21,7 @@ import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dial
import { PageHeaderComponent } from '../../common/page-header/page-header.component'
import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const fields: CustomField[] = [
{
@@ -50,6 +51,14 @@ describe('CustomFieldsComponent', () => {
PageHeaderComponent,
ConfirmDialogComponent,
],
+ imports: [
+ NgbPaginationModule,
+ FormsModule,
+ ReactiveFormsModule,
+ NgbModalModule,
+ NgbPopoverModule,
+ NgxBootstrapIconsModule.pick(allIcons),
+ ],
providers: [
{
provide: PermissionsService,
@@ -59,15 +68,8 @@ describe('CustomFieldsComponent', () => {
currentUserOwnsObject: () => true,
},
},
- ],
- imports: [
- HttpClientTestingModule,
- NgbPaginationModule,
- FormsModule,
- ReactiveFormsModule,
- NgbModalModule,
- NgbPopoverModule,
- NgxBootstrapIconsModule.pick(allIcons),
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
],
})
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.spec.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.spec.ts
index 31287477a..06e66ed07 100644
--- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.spec.ts
+++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.spec.ts
@@ -1,5 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { DatePipe } from '@angular/common'
import { SortableDirective } from 'src/app/directives/sortable.directive'
import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap'
@@ -10,6 +10,7 @@ import { of } from 'rxjs'
import { DocumentTypeListComponent } from './document-type-list.component'
import { DocumentTypeService } from 'src/app/services/rest/document-type.service'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('DocumentTypeListComponent', () => {
let component: DocumentTypeListComponent
@@ -24,14 +25,17 @@ describe('DocumentTypeListComponent', () => {
PageHeaderComponent,
IfPermissionsDirective,
],
- providers: [DatePipe],
imports: [
- HttpClientTestingModule,
NgbPaginationModule,
FormsModule,
ReactiveFormsModule,
NgxBootstrapIconsModule.pick(allIcons),
],
+ providers: [
+ DatePipe,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
documentTypeService = TestBed.inject(DocumentTypeService)
diff --git a/src-ui/src/app/components/manage/mail/mail.component.spec.ts b/src-ui/src/app/components/manage/mail/mail.component.spec.ts
index fcc5bcc6b..e72b49b0f 100644
--- a/src-ui/src/app/components/manage/mail/mail.component.spec.ts
+++ b/src-ui/src/app/components/manage/mail/mail.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'
import { MailComponent } from './mail.component'
import { DatePipe } from '@angular/common'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { RouterTestingModule } from '@angular/router/testing'
import {
NgbModule,
@@ -42,6 +42,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
import { SwitchComponent } from '../../common/input/switch/switch.component'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const mailAccounts = [
{ id: 1, name: 'account1' },
@@ -85,10 +86,8 @@ describe('MailComponent', () => {
PermissionsFormComponent,
SwitchComponent,
],
- providers: [CustomDatePipe, DatePipe, PermissionsGuard],
imports: [
NgbModule,
- HttpClientTestingModule,
RouterTestingModule.withRoutes(routes),
FormsModule,
ReactiveFormsModule,
@@ -96,6 +95,13 @@ describe('MailComponent', () => {
NgSelectModule,
NgxBootstrapIconsModule.pick(allIcons),
],
+ providers: [
+ CustomDatePipe,
+ DatePipe,
+ PermissionsGuard,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
mailAccountService = TestBed.inject(MailAccountService)
diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.spec.ts b/src-ui/src/app/components/manage/management-list/management-list.component.spec.ts
index c349fa935..557d5f388 100644
--- a/src-ui/src/app/components/manage/management-list/management-list.component.spec.ts
+++ b/src-ui/src/app/components/manage/management-list/management-list.component.spec.ts
@@ -1,5 +1,5 @@
import { DatePipe } from '@angular/common'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import {
ComponentFixture,
TestBed,
@@ -41,6 +41,7 @@ import { MATCH_LITERAL } from 'src/app/data/matching-model'
import { PermissionsDialogComponent } from '../../common/permissions-dialog/permissions-dialog.component'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
import { BulkEditObjectOperation } from 'src/app/services/rest/abstract-name-filter-service'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const tags: Tag[] = [
{
@@ -81,9 +82,7 @@ describe('ManagementListComponent', () => {
ConfirmDialogComponent,
PermissionsDialogComponent,
],
- providers: [DatePipe, PermissionsGuard],
imports: [
- HttpClientTestingModule,
NgbPaginationModule,
FormsModule,
ReactiveFormsModule,
@@ -91,6 +90,12 @@ describe('ManagementListComponent', () => {
RouterTestingModule.withRoutes(routes),
NgxBootstrapIconsModule.pick(allIcons),
],
+ providers: [
+ DatePipe,
+ PermissionsGuard,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
tagService = TestBed.inject(TagService)
diff --git a/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.spec.ts b/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.spec.ts
index 7acdacb13..0816dae7d 100644
--- a/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.spec.ts
+++ b/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.spec.ts
@@ -1,5 +1,5 @@
import { DatePipe } from '@angular/common'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { ComponentFixture, TestBed } from '@angular/core/testing'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap'
@@ -10,6 +10,7 @@ import { StoragePathService } from 'src/app/services/rest/storage-path.service'
import { PageHeaderComponent } from '../../common/page-header/page-header.component'
import { StoragePathListComponent } from './storage-path-list.component'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('StoragePathListComponent', () => {
let component: StoragePathListComponent
@@ -24,14 +25,17 @@ describe('StoragePathListComponent', () => {
PageHeaderComponent,
IfPermissionsDirective,
],
- providers: [DatePipe],
imports: [
- HttpClientTestingModule,
NgbPaginationModule,
FormsModule,
ReactiveFormsModule,
NgxBootstrapIconsModule.pick(allIcons),
],
+ providers: [
+ DatePipe,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
storagePathService = TestBed.inject(StoragePathService)
diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.spec.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.spec.ts
index ed79a3650..33cf36e7c 100644
--- a/src-ui/src/app/components/manage/tag-list/tag-list.component.spec.ts
+++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.spec.ts
@@ -1,5 +1,5 @@
import { DatePipe } from '@angular/common'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { ComponentFixture, TestBed } from '@angular/core/testing'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap'
@@ -11,6 +11,7 @@ import { PageHeaderComponent } from '../../common/page-header/page-header.compon
import { TagListComponent } from './tag-list.component'
import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('TagListComponent', () => {
let component: TagListComponent
@@ -26,14 +27,17 @@ describe('TagListComponent', () => {
IfPermissionsDirective,
SafeHtmlPipe,
],
- providers: [DatePipe],
imports: [
- HttpClientTestingModule,
NgbPaginationModule,
FormsModule,
ReactiveFormsModule,
NgxBootstrapIconsModule.pick(allIcons),
],
+ providers: [
+ DatePipe,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
}).compileComponents()
tagService = TestBed.inject(TagService)
diff --git a/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts b/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts
index 51e0eda72..5a73b07b0 100644
--- a/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts
+++ b/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts
@@ -1,4 +1,4 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { ComponentFixture, TestBed } from '@angular/core/testing'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
import { By } from '@angular/platform-browser'
@@ -25,6 +25,7 @@ import {
} from 'src/app/data/workflow-trigger'
import { WorkflowActionType } from 'src/app/data/workflow-action'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const workflows: Workflow[] = [
{
@@ -85,6 +86,14 @@ describe('WorkflowsComponent', () => {
PageHeaderComponent,
ConfirmDialogComponent,
],
+ imports: [
+ NgbPaginationModule,
+ FormsModule,
+ ReactiveFormsModule,
+ NgbModalModule,
+ NgbPopoverModule,
+ NgxBootstrapIconsModule.pick(allIcons),
+ ],
providers: [
{
provide: PermissionsService,
@@ -94,15 +103,8 @@ describe('WorkflowsComponent', () => {
currentUserOwnsObject: () => true,
},
},
- ],
- imports: [
- HttpClientTestingModule,
- NgbPaginationModule,
- FormsModule,
- ReactiveFormsModule,
- NgbModalModule,
- NgbPopoverModule,
- NgxBootstrapIconsModule.pick(allIcons),
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
],
})
diff --git a/src-ui/src/app/components/not-found/not-found.component.spec.ts b/src-ui/src/app/components/not-found/not-found.component.spec.ts
index bf42fb409..6d4a70aca 100644
--- a/src-ui/src/app/components/not-found/not-found.component.spec.ts
+++ b/src-ui/src/app/components/not-found/not-found.component.spec.ts
@@ -2,8 +2,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'
import { NotFoundComponent } from './not-found.component'
import { By } from '@angular/platform-browser'
import { LogoComponent } from '../common/logo/logo.component'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('NotFoundComponent', () => {
let component: NotFoundComponent
@@ -12,9 +13,10 @@ describe('NotFoundComponent', () => {
beforeEach(async () => {
TestBed.configureTestingModule({
declarations: [NotFoundComponent, LogoComponent],
- imports: [
- HttpClientTestingModule,
- NgxBootstrapIconsModule.pick(allIcons),
+ imports: [NgxBootstrapIconsModule.pick(allIcons)],
+ providers: [
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
],
}).compileComponents()
diff --git a/src-ui/src/app/guards/dirty-saved-view.guard.spec.ts b/src-ui/src/app/guards/dirty-saved-view.guard.spec.ts
index f4388d91f..07ac5e08a 100644
--- a/src-ui/src/app/guards/dirty-saved-view.guard.spec.ts
+++ b/src-ui/src/app/guards/dirty-saved-view.guard.spec.ts
@@ -5,8 +5,9 @@ import { SettingsService } from '../services/settings.service'
import { DocumentListComponent } from '../components/document-list/document-list.component'
import { RouterTestingModule } from '@angular/router/testing'
import { routes } from '../app-routing.module'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { ConfirmDialogComponent } from '../components/common/confirm-dialog/confirm-dialog.component'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('DirtySavedViewGuard', () => {
let guard: DirtySavedViewGuard
@@ -16,17 +17,16 @@ describe('DirtySavedViewGuard', () => {
beforeEach(() => {
TestBed.configureTestingModule({
+ declarations: [ConfirmDialogComponent],
+ imports: [RouterTestingModule.withRoutes(routes)],
providers: [
DirtySavedViewGuard,
SettingsService,
NgbModal,
DocumentListComponent,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
],
- imports: [
- RouterTestingModule.withRoutes(routes),
- HttpClientTestingModule,
- ],
- declarations: [ConfirmDialogComponent],
})
settingsService = TestBed.inject(SettingsService)
diff --git a/src-ui/src/app/pipes/custom-date.pipe.spec.ts b/src-ui/src/app/pipes/custom-date.pipe.spec.ts
index 32505fa7c..0877d9157 100644
--- a/src-ui/src/app/pipes/custom-date.pipe.spec.ts
+++ b/src-ui/src/app/pipes/custom-date.pipe.spec.ts
@@ -1,16 +1,23 @@
import { TestBed } from '@angular/core/testing'
import { CustomDatePipe } from './custom-date.pipe'
import { SettingsService } from '../services/settings.service'
-import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { provideHttpClientTesting } from '@angular/common/http/testing'
import { DatePipe } from '@angular/common'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('CustomDatePipe', () => {
let datePipe: CustomDatePipe
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [CustomDatePipe, SettingsService, DatePipe],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ CustomDatePipe,
+ SettingsService,
+ DatePipe,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
datePipe = TestBed.inject(CustomDatePipe)
diff --git a/src-ui/src/app/pipes/username.pipe.spec.ts b/src-ui/src/app/pipes/username.pipe.spec.ts
index cab2116d6..58eeaccde 100644
--- a/src-ui/src/app/pipes/username.pipe.spec.ts
+++ b/src-ui/src/app/pipes/username.pipe.spec.ts
@@ -1,12 +1,13 @@
import { TestBed } from '@angular/core/testing'
import { UsernamePipe } from './username.pipe'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { environment } from 'src/environments/environment'
import { PermissionsService } from '../services/permissions.service'
import { UserService } from '../services/rest/user.service'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('UsernamePipe', () => {
let pipe: UsernamePipe
@@ -15,8 +16,13 @@ describe('UsernamePipe', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [UsernamePipe, PermissionsService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ UsernamePipe,
+ PermissionsService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/config.service.spec.ts b/src-ui/src/app/services/config.service.spec.ts
index 4fb24727f..91c90e734 100644
--- a/src-ui/src/app/services/config.service.spec.ts
+++ b/src-ui/src/app/services/config.service.spec.ts
@@ -2,11 +2,12 @@ import { TestBed } from '@angular/core/testing'
import { ConfigService } from './config.service'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { environment } from 'src/environments/environment'
import { OutputTypeConfig, PaperlessConfig } from '../data/paperless-config'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('ConfigService', () => {
let service: ConfigService
@@ -14,7 +15,11 @@ describe('ConfigService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
service = TestBed.inject(ConfigService)
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/consumer-status.service.spec.ts b/src-ui/src/app/services/consumer-status.service.spec.ts
index b9066bbc0..a39a9a145 100644
--- a/src-ui/src/app/services/consumer-status.service.spec.ts
+++ b/src-ui/src/app/services/consumer-status.service.spec.ts
@@ -5,12 +5,17 @@ import {
FileStatusPhase,
} from './consumer-status.service'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { environment } from 'src/environments/environment'
import { DocumentService } from './rest/document.service'
-import { HttpEventType, HttpResponse } from '@angular/common/http'
+import {
+ HttpEventType,
+ HttpResponse,
+ provideHttpClient,
+ withInterceptorsFromDi,
+} from '@angular/common/http'
import WS from 'jest-websocket-mock'
import { SettingsService } from './settings.service'
@@ -27,8 +32,14 @@ describe('ConsumerStatusService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [ConsumerStatusService, DocumentService, SettingsService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ ConsumerStatusService,
+ DocumentService,
+ SettingsService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/document-list-view.service.spec.ts b/src-ui/src/app/services/document-list-view.service.spec.ts
index 73d0bc429..74ef8e5a1 100644
--- a/src-ui/src/app/services/document-list-view.service.spec.ts
+++ b/src-ui/src/app/services/document-list-view.service.spec.ts
@@ -1,8 +1,8 @@
import { TestBed } from '@angular/core/testing'
import { DocumentListViewService } from './document-list-view.service'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { environment } from 'src/environments/environment'
import { Subscription } from 'rxjs'
@@ -24,6 +24,7 @@ import {
DisplayField,
DEFAULT_DISPLAY_FIELDS,
} from '../data/document'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const documents = [
{
@@ -91,13 +92,16 @@ describe('DocumentListViewService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [DocumentListViewService, PermissionsGuard, SettingsService],
- imports: [
- HttpClientTestingModule,
- RouterTestingModule.withRoutes(routes),
- ],
declarations: [ConfirmDialogComponent],
teardown: { destroyAfterEach: true },
+ imports: [RouterTestingModule.withRoutes(routes)],
+ providers: [
+ DocumentListViewService,
+ PermissionsGuard,
+ SettingsService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
sessionStorage.clear()
diff --git a/src-ui/src/app/services/open-documents.service.spec.ts b/src-ui/src/app/services/open-documents.service.spec.ts
index 21d5d91a8..3dc7f9c3f 100644
--- a/src-ui/src/app/services/open-documents.service.spec.ts
+++ b/src-ui/src/app/services/open-documents.service.spec.ts
@@ -1,8 +1,8 @@
import { TestBed } from '@angular/core/testing'
import { OpenDocumentsService } from './open-documents.service'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { environment } from 'src/environments/environment'
import { Subscription, throwError } from 'rxjs'
@@ -10,6 +10,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { ConfirmDialogComponent } from '../components/common/confirm-dialog/confirm-dialog.component'
import { OPEN_DOCUMENT_SERVICE } from '../data/storage-keys'
import { wind } from 'ngx-bootstrap-icons'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const documents = [
{
@@ -56,9 +57,14 @@ describe('OpenDocumentsService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [OpenDocumentsService, NgbModal],
- imports: [HttpClientTestingModule],
declarations: [ConfirmDialogComponent],
+ imports: [],
+ providers: [
+ OpenDocumentsService,
+ NgbModal,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
sessionStorage.clear()
diff --git a/src-ui/src/app/services/profile.service.spec.ts b/src-ui/src/app/services/profile.service.spec.ts
index 538911ac3..beb7e9ad5 100644
--- a/src-ui/src/app/services/profile.service.spec.ts
+++ b/src-ui/src/app/services/profile.service.spec.ts
@@ -2,10 +2,11 @@ import { TestBed } from '@angular/core/testing'
import { ProfileService } from './profile.service'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { environment } from 'src/environments/environment'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('ProfileService', () => {
let httpTestingController: HttpTestingController
@@ -13,8 +14,12 @@ describe('ProfileService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [ProfileService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ ProfileService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/rest/abstract-paperless-service.spec.ts b/src-ui/src/app/services/rest/abstract-paperless-service.spec.ts
index 0cabcef02..38549c0bc 100644
--- a/src-ui/src/app/services/rest/abstract-paperless-service.spec.ts
+++ b/src-ui/src/app/services/rest/abstract-paperless-service.spec.ts
@@ -1,11 +1,12 @@
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { AbstractPaperlessService } from './abstract-paperless-service'
import { Subscription } from 'rxjs'
import { TestBed } from '@angular/core/testing'
import { environment } from 'src/environments/environment'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
let httpTestingController: HttpTestingController
let service: AbstractPaperlessService
@@ -115,9 +116,13 @@ export const commonAbstractPaperlessServiceTests = (endpoint, ServiceClass) => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [ServiceClass],
- imports: [HttpClientTestingModule],
teardown: { destroyAfterEach: true },
+ imports: [],
+ providers: [
+ ServiceClass,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/rest/document.service.spec.ts b/src-ui/src/app/services/rest/document.service.spec.ts
index b08051a79..3bea435fc 100644
--- a/src-ui/src/app/services/rest/document.service.spec.ts
+++ b/src-ui/src/app/services/rest/document.service.spec.ts
@@ -1,6 +1,6 @@
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { Subscription } from 'rxjs'
import { TestBed } from '@angular/core/testing'
@@ -14,6 +14,7 @@ import {
DOCUMENT_SORT_FIELDS_FULLTEXT,
} from 'src/app/data/document'
import { PermissionsService } from '../permissions.service'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
let httpTestingController: HttpTestingController
let service: DocumentService
@@ -45,8 +46,12 @@ const documents = [
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [DocumentService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ DocumentService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/rest/log.service.spec.ts b/src-ui/src/app/services/rest/log.service.spec.ts
index 234c94b6c..ec0bf094a 100644
--- a/src-ui/src/app/services/rest/log.service.spec.ts
+++ b/src-ui/src/app/services/rest/log.service.spec.ts
@@ -1,11 +1,12 @@
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { Subscription } from 'rxjs'
import { TestBed } from '@angular/core/testing'
import { environment } from 'src/environments/environment'
import { LogService } from './log.service'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
let httpTestingController: HttpTestingController
let service: LogService
@@ -15,8 +16,12 @@ const endpoint = 'logs'
describe('LogService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [LogService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ LogService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/rest/remote-version.service.spec.ts b/src-ui/src/app/services/rest/remote-version.service.spec.ts
index f816e2d93..2390dd5c5 100644
--- a/src-ui/src/app/services/rest/remote-version.service.spec.ts
+++ b/src-ui/src/app/services/rest/remote-version.service.spec.ts
@@ -1,11 +1,12 @@
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { Subscription } from 'rxjs'
import { TestBed } from '@angular/core/testing'
import { environment } from 'src/environments/environment'
import { RemoteVersionService } from './remote-version.service'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
let httpTestingController: HttpTestingController
let service: RemoteVersionService
@@ -15,8 +16,12 @@ const endpoint = 'remote_version'
describe('RemoteVersionService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [RemoteVersionService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ RemoteVersionService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/rest/search.service.spec.ts b/src-ui/src/app/services/rest/search.service.spec.ts
index 346b8a092..7705fb481 100644
--- a/src-ui/src/app/services/rest/search.service.spec.ts
+++ b/src-ui/src/app/services/rest/search.service.spec.ts
@@ -1,6 +1,6 @@
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { Subscription } from 'rxjs'
import { TestBed } from '@angular/core/testing'
@@ -8,6 +8,7 @@ import { environment } from 'src/environments/environment'
import { SearchService } from './search.service'
import { SettingsService } from '../settings.service'
import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
let httpTestingController: HttpTestingController
let service: SearchService
@@ -18,8 +19,12 @@ const endpoint = 'search/autocomplete'
describe('SearchService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [SearchService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ SearchService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/settings.service.spec.ts b/src-ui/src/app/services/settings.service.spec.ts
index ae8976726..6b4d713c8 100644
--- a/src-ui/src/app/services/settings.service.spec.ts
+++ b/src-ui/src/app/services/settings.service.spec.ts
@@ -1,6 +1,6 @@
import {
HttpTestingController,
- HttpClientTestingModule,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { TestBed } from '@angular/core/testing'
import { FormsModule, ReactiveFormsModule } from '@angular/forms'
@@ -17,6 +17,7 @@ import { CustomFieldsService } from './rest/custom-fields.service'
import { CustomFieldDataType } from '../data/custom-field'
import { PermissionsService } from './permissions.service'
import { DEFAULT_DISPLAY_FIELDS, DisplayField } from '../data/document'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
const customFields = [
{
@@ -84,15 +85,19 @@ describe('SettingsService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
declarations: [],
- providers: [SettingsService, CookieService],
imports: [
- HttpClientTestingModule,
RouterTestingModule,
NgbModule,
FormsModule,
ReactiveFormsModule,
AppModule,
],
+ providers: [
+ SettingsService,
+ CookieService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/system-status.service.spec.ts b/src-ui/src/app/services/system-status.service.spec.ts
index dd0eb3a88..29c510197 100644
--- a/src-ui/src/app/services/system-status.service.spec.ts
+++ b/src-ui/src/app/services/system-status.service.spec.ts
@@ -2,10 +2,11 @@ import { TestBed } from '@angular/core/testing'
import { SystemStatusService } from './system-status.service'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { environment } from 'src/environments/environment'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('SystemStatusService', () => {
let httpTestingController: HttpTestingController
@@ -13,8 +14,12 @@ describe('SystemStatusService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [SystemStatusService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ SystemStatusService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/tasks.service.spec.ts b/src-ui/src/app/services/tasks.service.spec.ts
index c41b69f24..76a07c34e 100644
--- a/src-ui/src/app/services/tasks.service.spec.ts
+++ b/src-ui/src/app/services/tasks.service.spec.ts
@@ -1,12 +1,13 @@
import { TestBed } from '@angular/core/testing'
import { TasksService } from './tasks.service'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { environment } from 'src/environments/environment'
import { PaperlessTaskType } from '../data/paperless-task'
import { PaperlessTaskStatus } from '../data/paperless-task'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('TasksService', () => {
let httpTestingController: HttpTestingController
@@ -14,8 +15,12 @@ describe('TasksService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [TasksService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ TasksService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/services/upload-documents.service.spec.ts b/src-ui/src/app/services/upload-documents.service.spec.ts
index f1e1ae8b5..60a00d461 100644
--- a/src-ui/src/app/services/upload-documents.service.spec.ts
+++ b/src-ui/src/app/services/upload-documents.service.spec.ts
@@ -1,11 +1,15 @@
import { TestBed } from '@angular/core/testing'
import { UploadDocumentsService } from './upload-documents.service'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
import { environment } from 'src/environments/environment'
-import { HttpEventType } from '@angular/common/http'
+import {
+ HttpEventType,
+ provideHttpClient,
+ withInterceptorsFromDi,
+} from '@angular/common/http'
import {
ConsumerStatusService,
FileStatusPhase,
@@ -45,8 +49,13 @@ describe('UploadDocumentsService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [UploadDocumentsService, ConsumerStatusService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ UploadDocumentsService,
+ ConsumerStatusService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
httpTestingController = TestBed.inject(HttpTestingController)
diff --git a/src-ui/src/app/utils/ngb-date-parser-formatter.spec.ts b/src-ui/src/app/utils/ngb-date-parser-formatter.spec.ts
index b8531bbb3..a245b0f48 100644
--- a/src-ui/src/app/utils/ngb-date-parser-formatter.spec.ts
+++ b/src-ui/src/app/utils/ngb-date-parser-formatter.spec.ts
@@ -2,9 +2,10 @@ import { TestBed } from '@angular/core/testing'
import { LocalizedDateParserFormatter } from './ngb-date-parser-formatter'
import { SettingsService } from '../services/settings.service'
import {
- HttpClientTestingModule,
HttpTestingController,
+ provideHttpClientTesting,
} from '@angular/common/http/testing'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
describe('LocalizedDateParserFormatter', () => {
let dateParserFormatter: LocalizedDateParserFormatter
@@ -13,8 +14,13 @@ describe('LocalizedDateParserFormatter', () => {
beforeEach(() => {
TestBed.configureTestingModule({
- providers: [LocalizedDateParserFormatter, SettingsService],
- imports: [HttpClientTestingModule],
+ imports: [],
+ providers: [
+ LocalizedDateParserFormatter,
+ SettingsService,
+ provideHttpClient(withInterceptorsFromDi()),
+ provideHttpClientTesting(),
+ ],
})
dateParserFormatter = TestBed.inject(LocalizedDateParserFormatter)