diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts index 77fb4f78b5..0318fe58c5 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts @@ -21,9 +21,9 @@ describe('AdminNotifyMetricsComponent', () => { await TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot(), AdminNotifyMetricsComponent], - providers: [{ provide: Router, useValue: router }] -}) + imports: [TranslateModule.forRoot(), AdminNotifyMetricsComponent], + providers: [{ provide: Router, useValue: router }], + }) .compileComponents(); diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts index 431bfdd8d1..3bab1ab5bb 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts @@ -13,6 +13,7 @@ import { of, } from 'rxjs'; +import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface'; import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service'; import { ObjectCacheService } from '../../../core/cache/object-cache.service'; import { RequestService } from '../../../core/data/request.service'; @@ -23,6 +24,8 @@ import { SearchConfigurationService } from '../../../core/shared/search/search-c import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service'; import { routeServiceStub } from '../../../shared/testing/route-service.stub'; import { RouterStub } from '../../../shared/testing/router.stub'; +import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component'; +import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component'; import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component'; import { AdminNotifyMessage } from '../models/admin-notify-message.model'; import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service'; @@ -128,8 +131,8 @@ describe('AdminNotifySearchResultComponent', () => { await TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot(), AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent], - providers: [ + imports: [TranslateModule.forRoot(), AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent], + providers: [ { provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService }, { provide: RouteService, useValue: routeServiceStub }, { provide: ActivatedRoute, useValue: new RouterStub() }, @@ -138,10 +141,19 @@ describe('AdminNotifySearchResultComponent', () => { { provide: RequestService, useValue: requestService }, { provide: RemoteDataBuildService, useValue: rdbService }, { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService }, + { provide: APP_DATA_SERVICES_MAP, useValue: {} }, DatePipe, - ], - schemas: [NO_ERRORS_SCHEMA] -}) + ], + schemas: [NO_ERRORS_SCHEMA], + }) + .overrideComponent(AdminNotifySearchResultComponent, { + remove: { + imports: [ + TruncatableComponent, + TruncatablePartComponent, + ], + }, + }) .compileComponents(); fixture = TestBed.createComponent(AdminNotifySearchResultComponent); diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts index 8f1f040ebf..aeca1fccc6 100644 --- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts @@ -66,7 +66,7 @@ describe('JournalIssueGridElementComponent', () => { }).overrideComponent(JournalIssueGridElementComponent, { add: { changeDetection: ChangeDetectionStrategy.Default }, remove: { - providers: [JournalIssueSearchResultGridElementComponent], + imports: [JournalIssueSearchResultGridElementComponent], }, }).compileComponents(); })); diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts index 511725f651..09d0a6dbaf 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts @@ -18,11 +18,15 @@ import { Item } from '../../../../../core/shared/item.model'; import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; +import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model'; import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub'; import { ThemeService } from '../../../../../shared/theme-support/theme.service'; +import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; +import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component'; import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe'; +import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component'; import { JournalIssueSearchResultListElementComponent } from './journal-issue-search-result-list-element.component'; let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent; @@ -102,7 +106,10 @@ describe('JournalIssueSearchResultListElementComponent', () => { ], schemas: [NO_ERRORS_SCHEMA], }).overrideComponent(JournalIssueSearchResultListElementComponent, { - add: { changeDetection: ChangeDetectionStrategy.Default } }, + add: { changeDetection: ChangeDetectionStrategy.Default } , + remove: { + imports: [ThumbnailComponent, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent], + } }, ).compileComponents(); })); diff --git a/src/app/my-dspace-page/my-dspace-page.component.spec.ts b/src/app/my-dspace-page/my-dspace-page.component.spec.ts index e89c126b98..58f95e74c3 100644 --- a/src/app/my-dspace-page/my-dspace-page.component.spec.ts +++ b/src/app/my-dspace-page/my-dspace-page.component.spec.ts @@ -28,12 +28,8 @@ import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value- import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component'; import { MyDSpacePageComponent } from './my-dspace-page.component'; import SpyObj = jasmine.SpyObj; -import { - SuggestionsNotificationComponent -} from '../notifications/suggestions-notification/suggestions-notification.component'; -import { - MyDspaceQaEventsNotificationsComponent -} from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component'; +import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component'; +import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component'; describe('MyDSpacePageComponent', () => { let comp: MyDSpacePageComponent; diff --git a/src/app/process-page/overview/table/process-overview-table.component.spec.ts b/src/app/process-page/overview/table/process-overview-table.component.spec.ts index 9cec00a8b4..f161b77ead 100644 --- a/src/app/process-page/overview/table/process-overview-table.component.spec.ts +++ b/src/app/process-page/overview/table/process-overview-table.component.spec.ts @@ -131,9 +131,9 @@ describe('ProcessOverviewTableComponent', () => { init(); void TestBed.configureTestingModule({ - declarations: [NgbCollapse], - imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), VarDirective, ProcessOverviewTableComponent], - providers: [ + declarations: [NgbCollapse], + imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), VarDirective, ProcessOverviewTableComponent], + providers: [ { provide: ProcessOverviewService, useValue: processOverviewService }, { provide: ProcessDataService, useValue: processService }, { provide: EPersonDataService, useValue: ePersonService }, @@ -142,8 +142,8 @@ describe('ProcessOverviewTableComponent', () => { { provide: NgbModal, useValue: modalService }, { provide: AuthService, useValue: authService }, { provide: RouteService, useValue: routeService }, - ] -}).compileComponents(); + ], + }).compileComponents(); })); beforeEach(() => { diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts index d525e0e54f..501a60e3b8 100644 --- a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts +++ b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts @@ -31,6 +31,7 @@ import { MetadataValue } from '../../../core/shared/metadata.models'; import { SubmissionScopeType } from '../../../core/submission/submission-scope-type'; import { FormBuilderService } from '../../../shared/form/builder/form-builder.service'; import { FormService } from '../../../shared/form/form.service'; +import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock'; import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock'; import { getMockFormService } from '../../../shared/mocks/form-service.mock'; import { @@ -168,7 +169,7 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => { { provide: 'submissionIdProvider', useValue: submissionId }, { provide: PaginationService, useValue: paginationService }, ChangeDetectorRef, - FormBuilderService, + { provide: FormBuilderService, useValue: getMockFormBuilderService() }, ], schemas: [NO_ERRORS_SCHEMA], }).compileComponents().then(); diff --git a/src/app/submission/sections/sections-decorator.ts b/src/app/submission/sections/sections-decorator.ts index 8fda9437c7..8e0df1cb23 100644 --- a/src/app/submission/sections/sections-decorator.ts +++ b/src/app/submission/sections/sections-decorator.ts @@ -1,5 +1,6 @@ import { SubmissionSectionAccessesComponent } from './accesses/section-accesses.component'; import { SubmissionSectionCcLicensesComponent } from './cc-license/submission-section-cc-licenses.component'; +import { SubmissionSectionDuplicatesComponent } from './duplicates/section-duplicates.component'; import { SubmissionSectionFormComponent } from './form/section-form.component'; import { SubmissionSectionIdentifiersComponent } from './identifiers/section-identifiers.component'; import { SubmissionSectionLicenseComponent } from './license/section-license.component'; @@ -7,7 +8,6 @@ import { SubmissionSectionCoarNotifyComponent } from './section-coar-notify/sect import { SectionsType } from './sections-type'; import { SubmissionSectionSherpaPoliciesComponent } from './sherpa-policies/section-sherpa-policies.component'; import { SubmissionSectionUploadComponent } from './upload/section-upload.component'; -import { SubmissionSectionDuplicatesComponent } from './duplicates/section-duplicates.component'; const submissionSectionsMap = new Map();