From f0a0e383027bd6df575b2a09fafd853f0581a402 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 14 Mar 2024 16:01:09 +0100 Subject: [PATCH 1/4] [DURACOM-191] fix some tests --- .../simple/item-types/shared/item.component.spec.ts | 2 ++ .../comcol-search-section.component.spec.ts | 9 ++++++++- .../notification-box/notification-box.component.spec.ts | 3 +-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts index 0b60e2a1e6..e1ae24ff4d 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.spec.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.spec.ts @@ -69,6 +69,7 @@ import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component'; import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component'; import { ThemedItemPageTitleFieldComponent } from '../../field-components/specific-field/title/themed-item-page-field.component'; +import { ThemedMetadataRepresentationListComponent } from '../../metadata-representation-list/themed-metadata-representation-list.component'; import { TabbedRelatedEntitiesSearchComponent } from '../../related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component'; import { RelatedItemsComponent } from '../../related-items/related-items-component'; import { ItemComponent } from './item.component'; @@ -198,6 +199,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) { ThemedThumbnailComponent, RelatedItemsComponent, TabbedRelatedEntitiesSearchComponent, + ThemedMetadataRepresentationListComponent, ], }, add: { changeDetection: ChangeDetectionStrategy.Default }, diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts index 2ae10f3133..48ad8e1c04 100644 --- a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts +++ b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts @@ -6,6 +6,7 @@ import { ActivatedRoute } from '@angular/router'; import { APP_CONFIG } from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment.test'; +import { ThemedSearchComponent } from '../../../search/themed-search.component'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; import { ComcolSearchSectionComponent } from './comcol-search-section.component'; @@ -24,7 +25,13 @@ describe('ComcolSearchSectionComponent', () => { { provide: APP_CONFIG, useValue: environment }, { provide: ActivatedRoute, useValue: route }, ], - }).compileComponents(); + }) + .overrideComponent(ComcolSearchSectionComponent, { + remove: { + imports: [ThemedSearchComponent], + }, + }) + .compileComponents(); fixture = TestBed.createComponent(ComcolSearchSectionComponent); component = fixture.componentInstance; diff --git a/src/app/shared/notification-box/notification-box.component.spec.ts b/src/app/shared/notification-box/notification-box.component.spec.ts index b661a97904..1b23e60cff 100644 --- a/src/app/shared/notification-box/notification-box.component.spec.ts +++ b/src/app/shared/notification-box/notification-box.component.spec.ts @@ -22,8 +22,7 @@ describe('NotificationBoxComponent', () => { }; await TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot()], - declarations: [NotificationBoxComponent], + imports: [TranslateModule.forRoot(), NotificationBoxComponent], }) .compileComponents(); From e73e95ebaf25ff6335bc3bb4255fb7209beeff4c Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 14 Mar 2024 16:51:05 +0100 Subject: [PATCH 2/4] [DURACOM-191] fix some tests and remaining decorator to be removed --- .../admin-notify-dashboard.component.spec.ts | 7 ++++++- .../admin-notify-incoming.component.spec.ts | 2 ++ .../admin-notify-metrics.component.spec.ts | 7 +++---- .../admin-notify-search-result.component.spec.ts | 11 +++++------ .../journal-issue-grid-element.component.spec.ts | 4 ++++ .../publication/publication.component.spec.ts | 6 +++++- .../my-dspace-page.component.spec.ts | 13 ++++++++++++- .../suggestion-list-element.component.spec.ts | 15 ++++++++++++++- .../suggestions-popup.component.spec.ts | 3 +++ .../process-overview-table.component.spec.ts | 10 +++++----- ...ions-suggestion-targets-page.component.spec.ts | 6 ++++++ ...search-result-detail-element.component.spec.ts | 5 +++++ .../duplicates/section-duplicates.component.ts | 3 --- src/app/submission/sections/sections-decorator.ts | 2 ++ 14 files changed, 72 insertions(+), 22 deletions(-) diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts index 3e8ff7b752..7d2e3204ed 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts @@ -2,12 +2,14 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule } from '@ngx-translate/core'; import { buildPaginatedList } from '../../core/data/paginated-list.model'; import { SearchService } from '../../core/shared/search/search.service'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; +import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component'; import { AdminNotifyMessage } from './models/admin-notify-message.model'; import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model'; @@ -40,7 +42,10 @@ describe('AdminNotifyDashboardComponent', () => { await TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), NgbNavModule, AdminNotifyDashboardComponent], - providers: [{ provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } }], + providers: [ + { provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } }, + { provide: ActivatedRoute, useValue: new ActivatedRouteStub() }, + ], }) .compileComponents(); diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts index a3890f1e2e..a2dc89b621 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts @@ -6,6 +6,7 @@ import { ActivatedRoute } from '@angular/router'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; +import { APP_DATA_SERVICES_MAP } from '../../../../../config/app-config.interface'; import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; import { RequestService } from '../../../../core/data/request.service'; import { RouteService } from '../../../../core/services/route.service'; @@ -44,6 +45,7 @@ describe('AdminNotifyIncomingComponent', () => { { provide: HALEndpointService, useValue: halService }, { provide: RequestService, useValue: requestService }, { provide: RemoteDataBuildService, useValue: rdbService }, + { provide: APP_DATA_SERVICES_MAP, useValue: {} }, provideMockStore({}), ], }) 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 81412968d5..77fb4f78b5 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,10 +21,9 @@ describe('AdminNotifyMetricsComponent', () => { await TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot()], - declarations: [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 8c06a9ad68..431bfdd8d1 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 @@ -128,9 +128,8 @@ describe('AdminNotifySearchResultComponent', () => { await TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot()], - declarations: [AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent], - providers: [ + imports: [TranslateModule.forRoot(), AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent], + providers: [ { provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService }, { provide: RouteService, useValue: routeServiceStub }, { provide: ActivatedRoute, useValue: new RouterStub() }, @@ -140,9 +139,9 @@ describe('AdminNotifySearchResultComponent', () => { { provide: RemoteDataBuildService, useValue: rdbService }, { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService }, DatePipe, - ], - schemas: [NO_ERRORS_SCHEMA], - }) + ], + schemas: [NO_ERRORS_SCHEMA] +}) .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 4854f21d80..8f1f040ebf 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 @@ -18,6 +18,7 @@ import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mo import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; +import { JournalIssueSearchResultGridElementComponent } from '../search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component'; import { JournalIssueGridElementComponent } from './journal-issue-grid-element.component'; @@ -64,6 +65,9 @@ describe('JournalIssueGridElementComponent', () => { schemas: [NO_ERRORS_SCHEMA], }).overrideComponent(JournalIssueGridElementComponent, { add: { changeDetection: ChangeDetectionStrategy.Default }, + remove: { + providers: [JournalIssueSearchResultGridElementComponent], + }, }).compileComponents(); })); diff --git a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts index 22add3f10f..3b60c77a44 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts +++ b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts @@ -22,7 +22,10 @@ import { of, } from 'rxjs'; -import { APP_CONFIG } from '../../../../../config/app-config.interface'; +import { + APP_CONFIG, + APP_DATA_SERVICES_MAP, +} from '../../../../../config/app-config.interface'; import { environment } from '../../../../../environments/environment.test'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; @@ -115,6 +118,7 @@ describe('PublicationComponent', () => { { provide: RouteService, useValue: mockRouteService }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, { provide: APP_CONFIG, useValue: environment }, + { provide: APP_DATA_SERVICES_MAP, useValue: {} }, ], schemas: [NO_ERRORS_SCHEMA], }).overrideComponent(PublicationComponent, { 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 c5c47fba53..e89c126b98 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,6 +28,12 @@ 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'; describe('MyDSpacePageComponent', () => { let comp: MyDSpacePageComponent; @@ -97,7 +103,12 @@ describe('MyDSpacePageComponent', () => { }) .overrideComponent(MyDSpacePageComponent, { remove: { - imports: [ThemedSearchComponent, MyDSpaceNewSubmissionComponent], + imports: [ + ThemedSearchComponent, + MyDSpaceNewSubmissionComponent, + SuggestionsNotificationComponent, + MyDspaceQaEventsNotificationsComponent, + ], }, }) .compileComponents(); diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts index ce52e016ff..3f803c468d 100644 --- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts +++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts @@ -9,8 +9,11 @@ import { TranslateModule } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; import { TestScheduler } from 'rxjs/testing'; +import { ItemSearchResultListElementComponent } from '../../../themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component'; import { Item } from '../../core/shared/item.model'; import { mockSuggestionPublicationOne } from '../../shared/mocks/publication-claim.mock'; +import { SuggestionActionsComponent } from '../suggestion-actions/suggestion-actions.component'; +import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-evidences.component'; import { SuggestionListElementComponent } from './suggestion-list-element.component'; describe('SuggestionListElementComponent', () => { @@ -29,7 +32,17 @@ describe('SuggestionListElementComponent', () => { NgbModal, ], schemas: [NO_ERRORS_SCHEMA], - }).compileComponents().then(); + }) + .overrideComponent(SuggestionListElementComponent, { + remove: { + imports: [ + ItemSearchResultListElementComponent, + SuggestionActionsComponent, + SuggestionEvidencesComponent, + ], + }, + }) + .compileComponents().then(); })); beforeEach(() => { diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts b/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts index e4263e7f46..3959e675bc 100644 --- a/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts +++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts @@ -4,10 +4,12 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { mockSuggestionTargetsObjectOne } from '../../shared/mocks/publication-claim-targets.mock'; +import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service'; import { SuggestionsService } from '../suggestions.service'; import { SuggestionsPopupComponent } from './suggestions-popup.component'; @@ -35,6 +37,7 @@ describe('SuggestionsPopupComponent', () => { providers: [ { provide: SuggestionTargetsStateService, useValue: suggestionStateService }, { provide: SuggestionsService, useValue: suggestionService }, + { provide: ActivatedRoute, useValue: new ActivatedRouteStub() }, ], schemas: [NO_ERRORS_SCHEMA], }) 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 f161b77ead..9cec00a8b4 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/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts index 1b99e3e1ca..e744498e7f 100644 --- a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts +++ b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts @@ -9,6 +9,7 @@ import { ActivatedRoute } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { AdminNotificationsPublicationClaimPageComponent } from '../../admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component'; +import { PublicationClaimComponent } from '../../notifications/suggestion-targets/publication-claim/publication-claim.component'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page.component'; @@ -29,6 +30,11 @@ describe('NotificationsSuggestionTargetsPageComponent', () => { ], schemas: [NO_ERRORS_SCHEMA], }) + .overrideComponent(NotificationsSuggestionTargetsPageComponent, { + remove: { + providers: [PublicationClaimComponent], + }, + }) .compileComponents(); })); diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts index ad846abae8..a31b8c7648 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts @@ -23,9 +23,11 @@ import { WorkflowItem } from '../../../../core/submission/models/workflowitem.mo import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; +import { PoolTaskActionsComponent } from '../../../mydspace-actions/pool-task/pool-task-actions.component'; import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { VarDirective } from '../../../utils/var.directive'; +import { ItemDetailPreviewComponent } from '../item-detail-preview/item-detail-preview.component'; import { PoolSearchResultDetailElementComponent } from './pool-search-result-detail-element.component'; let component: PoolSearchResultDetailElementComponent; @@ -88,6 +90,9 @@ describe('PoolSearchResultDetailElementComponent', () => { schemas: [NO_ERRORS_SCHEMA], }).overrideComponent(PoolSearchResultDetailElementComponent, { add: { changeDetection: ChangeDetectionStrategy.Default }, + remove: { + imports: [ItemDetailPreviewComponent, PoolTaskActionsComponent], + }, }).compileComponents(); })); diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.ts b/src/app/submission/sections/duplicates/section-duplicates.component.ts index a4dfca3cb9..d90a0ca85a 100644 --- a/src/app/submission/sections/duplicates/section-duplicates.component.ts +++ b/src/app/submission/sections/duplicates/section-duplicates.component.ts @@ -28,8 +28,6 @@ import { SubmissionService } from '../../submission.service'; import { SectionModelComponent } from '../models/section.model'; import { SectionDataObject } from '../models/section-data.model'; import { SectionsService } from '../sections.service'; -import { renderSectionFor } from '../sections-decorator'; -import { SectionsType } from '../sections-type'; /** * Detect duplicates step @@ -50,7 +48,6 @@ import { SectionsType } from '../sections-type'; standalone: true, }) -@renderSectionFor(SectionsType.Duplicates) export class SubmissionSectionDuplicatesComponent extends SectionModelComponent { protected readonly Metadata = Metadata; /** diff --git a/src/app/submission/sections/sections-decorator.ts b/src/app/submission/sections/sections-decorator.ts index 1147281579..8fda9437c7 100644 --- a/src/app/submission/sections/sections-decorator.ts +++ b/src/app/submission/sections/sections-decorator.ts @@ -7,6 +7,7 @@ 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(); @@ -18,6 +19,7 @@ submissionSectionsMap.set(SectionsType.Upload, SubmissionSectionUploadComponent) submissionSectionsMap.set(SectionsType.SubmissionForm, SubmissionSectionFormComponent); submissionSectionsMap.set(SectionsType.Identifiers, SubmissionSectionIdentifiersComponent); submissionSectionsMap.set(SectionsType.CoarNotify, SubmissionSectionCoarNotifyComponent); +submissionSectionsMap.set(SectionsType.Duplicates, SubmissionSectionDuplicatesComponent); /** * @deprecated From 1a14f3fb75d616995648638ffa138abeae84ab76 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 14 Mar 2024 17:24:03 +0100 Subject: [PATCH 3/4] [DURACOM-191] fix some tests --- .../admin-notify-metrics.component.spec.ts | 6 ++--- ...min-notify-search-result.component.spec.ts | 22 ++++++++++++++----- ...urnal-issue-grid-element.component.spec.ts | 2 +- ...arch-result-list-element.component.spec.ts | 9 +++++++- .../my-dspace-page.component.spec.ts | 8 ++----- .../process-overview-table.component.spec.ts | 10 ++++----- .../section-duplicates.component.spec.ts | 3 ++- .../submission/sections/sections-decorator.ts | 2 +- 8 files changed, 39 insertions(+), 23 deletions(-) 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(); From 4faa4ab77d37392c4e3ee0fad36e157dc41baf13 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 14 Mar 2024 17:57:30 +0100 Subject: [PATCH 4/4] [DURACOM-191] fix metadata-import-page.component tests --- .../metadata-import-page.component.spec.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts index b47bc7fea7..b345da2c06 100644 --- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts +++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts @@ -23,6 +23,7 @@ import { createSuccessfulRemoteDataObject$, } from '../../shared/remote-data.utils'; import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub'; +import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component'; import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive'; import { FileValidator } from '../../shared/utils/require-file.validator'; import { MetadataImportPageComponent } from './metadata-import-page.component'; @@ -67,7 +68,13 @@ describe('MetadataImportPageComponent', () => { { provide: Location, useValue: locationStub }, ], schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); + }) + .overrideComponent(MetadataImportPageComponent, { + remove: { + imports: [FileDropzoneNoUploaderComponent], + }, + }) + .compileComponents(); })); beforeEach(() => {