[DURACOM-191] fix some tests and remaining decorator to be removed

This commit is contained in:
Andrea Barbasso
2024-03-14 16:51:05 +01:00
parent f0a0e38302
commit e73e95ebaf
14 changed files with 72 additions and 22 deletions

View File

@@ -2,12 +2,14 @@ import {
ComponentFixture, ComponentFixture,
TestBed, TestBed,
} from '@angular/core/testing'; } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'; import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { buildPaginatedList } from '../../core/data/paginated-list.model'; import { buildPaginatedList } from '../../core/data/paginated-list.model';
import { SearchService } from '../../core/shared/search/search.service'; import { SearchService } from '../../core/shared/search/search.service';
import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component'; import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
import { AdminNotifyMessage } from './models/admin-notify-message.model'; import { AdminNotifyMessage } from './models/admin-notify-message.model';
import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model'; import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';
@@ -40,7 +42,10 @@ describe('AdminNotifyDashboardComponent', () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), NgbNavModule, AdminNotifyDashboardComponent], 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(); .compileComponents();

View File

@@ -6,6 +6,7 @@ import { ActivatedRoute } from '@angular/router';
import { provideMockStore } from '@ngrx/store/testing'; import { provideMockStore } from '@ngrx/store/testing';
import { TranslateModule } from '@ngx-translate/core'; 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 { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
import { RequestService } from '../../../../core/data/request.service'; import { RequestService } from '../../../../core/data/request.service';
import { RouteService } from '../../../../core/services/route.service'; import { RouteService } from '../../../../core/services/route.service';
@@ -44,6 +45,7 @@ describe('AdminNotifyIncomingComponent', () => {
{ provide: HALEndpointService, useValue: halService }, { provide: HALEndpointService, useValue: halService },
{ provide: RequestService, useValue: requestService }, { provide: RequestService, useValue: requestService },
{ provide: RemoteDataBuildService, useValue: rdbService }, { provide: RemoteDataBuildService, useValue: rdbService },
{ provide: APP_DATA_SERVICES_MAP, useValue: {} },
provideMockStore({}), provideMockStore({}),
], ],
}) })

View File

@@ -21,9 +21,8 @@ describe('AdminNotifyMetricsComponent', () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [TranslateModule.forRoot()], imports: [TranslateModule.forRoot(), AdminNotifyMetricsComponent],
declarations: [AdminNotifyMetricsComponent], providers: [{ provide: Router, useValue: router }]
providers: [{ provide: Router, useValue: router }],
}) })
.compileComponents(); .compileComponents();

View File

@@ -128,8 +128,7 @@ describe('AdminNotifySearchResultComponent', () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
imports: [TranslateModule.forRoot()], imports: [TranslateModule.forRoot(), AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent],
declarations: [AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent],
providers: [ providers: [
{ provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService }, { provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService },
{ provide: RouteService, useValue: routeServiceStub }, { provide: RouteService, useValue: routeServiceStub },
@@ -141,7 +140,7 @@ describe('AdminNotifySearchResultComponent', () => {
{ provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService }, { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
DatePipe, DatePipe,
], ],
schemas: [NO_ERRORS_SCHEMA], schemas: [NO_ERRORS_SCHEMA]
}) })
.compileComponents(); .compileComponents();

View File

@@ -18,6 +18,7 @@ import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mo
import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
import { TruncatableService } from '../../../../shared/truncatable/truncatable.service'; import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
import { TruncatePipe } from '../../../../shared/utils/truncate.pipe'; 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'; import { JournalIssueGridElementComponent } from './journal-issue-grid-element.component';
@@ -64,6 +65,9 @@ describe('JournalIssueGridElementComponent', () => {
schemas: [NO_ERRORS_SCHEMA], schemas: [NO_ERRORS_SCHEMA],
}).overrideComponent(JournalIssueGridElementComponent, { }).overrideComponent(JournalIssueGridElementComponent, {
add: { changeDetection: ChangeDetectionStrategy.Default }, add: { changeDetection: ChangeDetectionStrategy.Default },
remove: {
providers: [JournalIssueSearchResultGridElementComponent],
},
}).compileComponents(); }).compileComponents();
})); }));

View File

@@ -22,7 +22,10 @@ import {
of, of,
} from 'rxjs'; } 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 { environment } from '../../../../../environments/environment.test';
import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service'; import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
@@ -115,6 +118,7 @@ describe('PublicationComponent', () => {
{ provide: RouteService, useValue: mockRouteService }, { provide: RouteService, useValue: mockRouteService },
{ provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub }, { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
{ provide: APP_CONFIG, useValue: environment }, { provide: APP_CONFIG, useValue: environment },
{ provide: APP_DATA_SERVICES_MAP, useValue: {} },
], ],
schemas: [NO_ERRORS_SCHEMA], schemas: [NO_ERRORS_SCHEMA],
}).overrideComponent(PublicationComponent, { }).overrideComponent(PublicationComponent, {

View File

@@ -28,6 +28,12 @@ import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-
import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component'; import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component';
import { MyDSpacePageComponent } from './my-dspace-page.component'; import { MyDSpacePageComponent } from './my-dspace-page.component';
import SpyObj = jasmine.SpyObj; 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', () => { describe('MyDSpacePageComponent', () => {
let comp: MyDSpacePageComponent; let comp: MyDSpacePageComponent;
@@ -97,7 +103,12 @@ describe('MyDSpacePageComponent', () => {
}) })
.overrideComponent(MyDSpacePageComponent, { .overrideComponent(MyDSpacePageComponent, {
remove: { remove: {
imports: [ThemedSearchComponent, MyDSpaceNewSubmissionComponent], imports: [
ThemedSearchComponent,
MyDSpaceNewSubmissionComponent,
SuggestionsNotificationComponent,
MyDspaceQaEventsNotificationsComponent,
],
}, },
}) })
.compileComponents(); .compileComponents();

View File

@@ -9,8 +9,11 @@ import { TranslateModule } from '@ngx-translate/core';
import { getTestScheduler } from 'jasmine-marbles'; import { getTestScheduler } from 'jasmine-marbles';
import { TestScheduler } from 'rxjs/testing'; 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 { Item } from '../../core/shared/item.model';
import { mockSuggestionPublicationOne } from '../../shared/mocks/publication-claim.mock'; 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'; import { SuggestionListElementComponent } from './suggestion-list-element.component';
describe('SuggestionListElementComponent', () => { describe('SuggestionListElementComponent', () => {
@@ -29,7 +32,17 @@ describe('SuggestionListElementComponent', () => {
NgbModal, NgbModal,
], ],
schemas: [NO_ERRORS_SCHEMA], schemas: [NO_ERRORS_SCHEMA],
}).compileComponents().then(); })
.overrideComponent(SuggestionListElementComponent, {
remove: {
imports: [
ItemSearchResultListElementComponent,
SuggestionActionsComponent,
SuggestionEvidencesComponent,
],
},
})
.compileComponents().then();
})); }));
beforeEach(() => { beforeEach(() => {

View File

@@ -4,10 +4,12 @@ import {
ComponentFixture, ComponentFixture,
TestBed, TestBed,
} from '@angular/core/testing'; } from '@angular/core/testing';
import { ActivatedRoute } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { of as observableOf } from 'rxjs'; import { of as observableOf } from 'rxjs';
import { mockSuggestionTargetsObjectOne } from '../../shared/mocks/publication-claim-targets.mock'; 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 { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
import { SuggestionsService } from '../suggestions.service'; import { SuggestionsService } from '../suggestions.service';
import { SuggestionsPopupComponent } from './suggestions-popup.component'; import { SuggestionsPopupComponent } from './suggestions-popup.component';
@@ -35,6 +37,7 @@ describe('SuggestionsPopupComponent', () => {
providers: [ providers: [
{ provide: SuggestionTargetsStateService, useValue: suggestionStateService }, { provide: SuggestionTargetsStateService, useValue: suggestionStateService },
{ provide: SuggestionsService, useValue: suggestionService }, { provide: SuggestionsService, useValue: suggestionService },
{ provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
], ],
schemas: [NO_ERRORS_SCHEMA], schemas: [NO_ERRORS_SCHEMA],
}) })

View File

@@ -142,7 +142,7 @@ describe('ProcessOverviewTableComponent', () => {
{ provide: NgbModal, useValue: modalService }, { provide: NgbModal, useValue: modalService },
{ provide: AuthService, useValue: authService }, { provide: AuthService, useValue: authService },
{ provide: RouteService, useValue: routeService }, { provide: RouteService, useValue: routeService },
], ]
}).compileComponents(); }).compileComponents();
})); }));

View File

@@ -9,6 +9,7 @@ import { ActivatedRoute } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { AdminNotificationsPublicationClaimPageComponent } from '../../admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component'; 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 { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page.component'; import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page.component';
@@ -28,6 +29,11 @@ describe('NotificationsSuggestionTargetsPageComponent', () => {
{ provide: ActivatedRoute, useValue: new ActivatedRouteStub() }, { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
], ],
schemas: [NO_ERRORS_SCHEMA], schemas: [NO_ERRORS_SCHEMA],
})
.overrideComponent(NotificationsSuggestionTargetsPageComponent, {
remove: {
providers: [PublicationClaimComponent],
},
}) })
.compileComponents(); .compileComponents();
})); }));

View File

@@ -23,9 +23,11 @@ import { WorkflowItem } from '../../../../core/submission/models/workflowitem.mo
import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model'; import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
import { getMockLinkService } from '../../../mocks/link-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 { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
import { VarDirective } from '../../../utils/var.directive'; 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'; import { PoolSearchResultDetailElementComponent } from './pool-search-result-detail-element.component';
let component: PoolSearchResultDetailElementComponent; let component: PoolSearchResultDetailElementComponent;
@@ -88,6 +90,9 @@ describe('PoolSearchResultDetailElementComponent', () => {
schemas: [NO_ERRORS_SCHEMA], schemas: [NO_ERRORS_SCHEMA],
}).overrideComponent(PoolSearchResultDetailElementComponent, { }).overrideComponent(PoolSearchResultDetailElementComponent, {
add: { changeDetection: ChangeDetectionStrategy.Default }, add: { changeDetection: ChangeDetectionStrategy.Default },
remove: {
imports: [ItemDetailPreviewComponent, PoolTaskActionsComponent],
},
}).compileComponents(); }).compileComponents();
})); }));

View File

@@ -28,8 +28,6 @@ import { SubmissionService } from '../../submission.service';
import { SectionModelComponent } from '../models/section.model'; import { SectionModelComponent } from '../models/section.model';
import { SectionDataObject } from '../models/section-data.model'; import { SectionDataObject } from '../models/section-data.model';
import { SectionsService } from '../sections.service'; import { SectionsService } from '../sections.service';
import { renderSectionFor } from '../sections-decorator';
import { SectionsType } from '../sections-type';
/** /**
* Detect duplicates step * Detect duplicates step
@@ -50,7 +48,6 @@ import { SectionsType } from '../sections-type';
standalone: true, standalone: true,
}) })
@renderSectionFor(SectionsType.Duplicates)
export class SubmissionSectionDuplicatesComponent extends SectionModelComponent { export class SubmissionSectionDuplicatesComponent extends SectionModelComponent {
protected readonly Metadata = Metadata; protected readonly Metadata = Metadata;
/** /**

View File

@@ -7,6 +7,7 @@ import { SubmissionSectionCoarNotifyComponent } from './section-coar-notify/sect
import { SectionsType } from './sections-type'; import { SectionsType } from './sections-type';
import { SubmissionSectionSherpaPoliciesComponent } from './sherpa-policies/section-sherpa-policies.component'; import { SubmissionSectionSherpaPoliciesComponent } from './sherpa-policies/section-sherpa-policies.component';
import { SubmissionSectionUploadComponent } from './upload/section-upload.component'; import { SubmissionSectionUploadComponent } from './upload/section-upload.component';
import { SubmissionSectionDuplicatesComponent } from './duplicates/section-duplicates.component';
const submissionSectionsMap = new Map(); const submissionSectionsMap = new Map();
@@ -18,6 +19,7 @@ submissionSectionsMap.set(SectionsType.Upload, SubmissionSectionUploadComponent)
submissionSectionsMap.set(SectionsType.SubmissionForm, SubmissionSectionFormComponent); submissionSectionsMap.set(SectionsType.SubmissionForm, SubmissionSectionFormComponent);
submissionSectionsMap.set(SectionsType.Identifiers, SubmissionSectionIdentifiersComponent); submissionSectionsMap.set(SectionsType.Identifiers, SubmissionSectionIdentifiersComponent);
submissionSectionsMap.set(SectionsType.CoarNotify, SubmissionSectionCoarNotifyComponent); submissionSectionsMap.set(SectionsType.CoarNotify, SubmissionSectionCoarNotifyComponent);
submissionSectionsMap.set(SectionsType.Duplicates, SubmissionSectionDuplicatesComponent);
/** /**
* @deprecated * @deprecated