From c8ae35274078724a1d56b0a1a5fadaaf2291c4bc Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 14 Mar 2024 15:22:25 +0100 Subject: [PATCH] [DURACOM-191] fix some tests --- .../ldn-services-directory.component.spec.ts | 4 ++-- ...admin-notify-logs-result.component.spec.ts | 6 ++++-- .../admin-notify-outgoing.component.spec.ts | 2 ++ ...arch-result-list-element.component.spec.ts | 6 ++++++ .../notify-info/notify-info.component.spec.ts | 3 +++ ...arch-result-list-element.component.spec.ts | 6 ++++++ ...arch-result-list-element.component.spec.ts | 7 +++---- src/app/init.service.ts | 2 +- .../profile-page.component.spec.ts | 14 +++++++++----- .../register-email-form.module.ts | 2 -- .../comcol-browse-by.component.spec.ts | 8 +++++++- ...ch-result-detail-element.component.spec.ts | 5 +++++ .../community-grid-element.component.spec.ts | 2 +- ...arch-result-list-element.component.spec.ts | 5 ++--- ...-list-element-submission.component.spec.ts | 5 +++++ ...arch-result-list-element.component.spec.ts | 5 +++++ ...arch-result-list-element.component.spec.ts | 6 ++++++ ...arch-result-list-element.component.spec.ts | 6 ++++++ .../object-table.component.spec.ts | 19 +++++++++++++++++++ .../resource-policy-form.component.spec.ts | 2 +- 20 files changed, 93 insertions(+), 22 deletions(-) diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts index 9ac117d7ef..fff3331e9c 100644 --- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts +++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts @@ -9,6 +9,7 @@ import { TestBed, tick, } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; import { TranslateModule, @@ -22,6 +23,7 @@ import { PaginationService } from '../../../core/pagination/pagination.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; import { PaginationComponent } from '../../../shared/pagination/pagination.component'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; +import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub'; import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub'; import { createPaginatedList } from '../../../shared/testing/utils.test'; @@ -30,8 +32,6 @@ import { TruncatablePartComponent } from '../../../shared/truncatable/truncatabl import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service'; import { LdnService } from '../ldn-services-model/ldn-services.model'; import { LdnServicesOverviewComponent } from './ldn-services-directory.component'; -import { ActivatedRoute } from '@angular/router'; -import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; describe('LdnServicesOverviewComponent', () => { let component: LdnServicesOverviewComponent; diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts index 1221d7a013..985e58bfcb 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts @@ -9,17 +9,18 @@ import { 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 { ObjectCacheService } from '../../../../core/cache/object-cache.service'; import { RequestService } from '../../../../core/data/request.service'; import { RouteService } from '../../../../core/services/route.service'; import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service'; import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock'; +import { SearchLabelsComponent } from '../../../../shared/search/search-labels/search-labels.component'; +import { ThemedSearchComponent } from '../../../../shared/search/themed-search.component'; import { routeServiceStub } from '../../../../shared/testing/route-service.stub'; import { RouterStub } from '../../../../shared/testing/router.stub'; import { AdminNotifyLogsResultComponent } from './admin-notify-logs-result.component'; -import { SearchLabelsComponent } from '../../../../shared/search/search-labels/search-labels.component'; -import { ThemedSearchComponent } from '../../../../shared/search/themed-search.component'; describe('AdminNotifyLogsResultComponent', () => { let component: AdminNotifyLogsResultComponent; @@ -39,6 +40,7 @@ describe('AdminNotifyLogsResultComponent', () => { { provide: HALEndpointService, useValue: halService }, { provide: ObjectCacheService, useValue: objectCache }, { provide: RequestService, useValue: requestService }, + { provide: APP_DATA_SERVICES_MAP, useValue: {} }, { provide: RemoteDataBuildService, useValue: rdbService }, provideMockStore({}), ], diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts index 60e6c91cf1..0cdb87ac17 100644 --- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts +++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.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'; @@ -39,6 +40,7 @@ describe('AdminNotifyOutgoingComponent', () => { imports: [TranslateModule.forRoot()], providers: [ { provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService }, + { provide: APP_DATA_SERVICES_MAP, useValue: {} }, { provide: RouteService, useValue: routeServiceStub }, { provide: ActivatedRoute, useValue: new MockActivatedRoute() }, { provide: HALEndpointService, useValue: halService }, diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts index 660b8af1d4..04077bf590 100644 --- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts +++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts @@ -18,6 +18,7 @@ import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service'; import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model'; +import { CommunitySearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component'; import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service'; import { CommunityAdminSearchResultListElementComponent } from './community-admin-search-result-list-element.component'; @@ -49,6 +50,11 @@ describe('CommunityAdminSearchResultListElementComponent', () => { ], schemas: [NO_ERRORS_SCHEMA], }) + .overrideComponent(CommunityAdminSearchResultListElementComponent, { + remove: { + imports: [CommunitySearchResultListElementComponent], + }, + }) .compileComponents(); })); diff --git a/src/app/core/coar-notify/notify-info/notify-info.component.spec.ts b/src/app/core/coar-notify/notify-info/notify-info.component.spec.ts index 9661ebab6e..337a874866 100644 --- a/src/app/core/coar-notify/notify-info/notify-info.component.spec.ts +++ b/src/app/core/coar-notify/notify-info/notify-info.component.spec.ts @@ -2,9 +2,11 @@ import { ComponentFixture, TestBed, } from '@angular/core/testing'; +import { ActivatedRoute } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; import { of } from 'rxjs'; +import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub'; import { NotifyInfoComponent } from './notify-info.component'; import { NotifyInfoService } from './notify-info.service'; @@ -20,6 +22,7 @@ describe('NotifyInfoComponent', () => { imports: [TranslateModule.forRoot(), NotifyInfoComponent], providers: [ { provide: NotifyInfoService, useValue: notifyInfoServiceSpy }, + { provide: ActivatedRoute, useValue: new ActivatedRouteStub() }, ], }) .compileComponents(); diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts index 71ddc947a2..e2fa79b151 100644 --- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts @@ -1,3 +1,4 @@ +import { NgClass } from '@angular/common'; import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA, @@ -100,6 +101,11 @@ describe('JournalVolumeSearchResultListElementComponent', () => { schemas: [NO_ERRORS_SCHEMA], }).overrideComponent(JournalVolumeSearchResultListElementComponent, { add: { changeDetection: ChangeDetectionStrategy.Default }, + remove: { + imports: [ + ThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, + ], + }, }).compileComponents(); })); diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts index 4bd65fd3a3..c4fa157dcb 100644 --- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts @@ -17,16 +17,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 { TruncatePipe } from '../../../../../shared/utils/truncate.pipe'; -import { ProjectSearchResultListElementComponent } from './project-search-result-list-element.component'; import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component'; -import { NgClass } from '@angular/common'; -import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component'; -import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component'; +import { ProjectSearchResultListElementComponent } from './project-search-result-list-element.component'; let projectListElementComponent: ProjectSearchResultListElementComponent; let fixture: ComponentFixture; diff --git a/src/app/init.service.ts b/src/app/init.service.ts index ede118429c..afa547e678 100644 --- a/src/app/init.service.ts +++ b/src/app/init.service.ts @@ -15,6 +15,7 @@ import { makeStateKey, TransferState, } from '@angular/platform-browser'; +import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core'; import { select, Store, @@ -45,7 +46,6 @@ import { dsDynamicFormControlMapFn } from './shared/form/builder/ds-dynamic-form import { MenuService } from './shared/menu/menu.service'; import { ThemeService } from './shared/theme-support/theme.service'; import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider'; -import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core'; /** * Performs the initialization of the app. diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts index debecc14cb..9f7f1f1d16 100644 --- a/src/app/profile-page/profile-page.component.spec.ts +++ b/src/app/profile-page/profile-page.component.spec.ts @@ -28,6 +28,7 @@ import { AuthorizationDataService } from '../core/data/feature-authorization/aut import { EPersonDataService } from '../core/eperson/eperson-data.service'; import { EPerson } from '../core/eperson/models/eperson.model'; import { ConfigurationProperty } from '../core/shared/configuration-property.model'; +import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component'; import { NotificationsService } from '../shared/notifications/notifications.service'; import { createFailedRemoteDataObject$, @@ -126,11 +127,14 @@ describe('ProfilePageComponent', () => { schemas: [NO_ERRORS_SCHEMA], }) .overrideComponent(ProfilePageComponent, { - remove: { imports: [ - ProfilePageMetadataFormComponent, - ProfilePageSecurityFormComponent, - ProfilePageResearcherFormComponent, - ] }, + remove: { + imports: [ + ProfilePageMetadataFormComponent, + ProfilePageSecurityFormComponent, + ProfilePageResearcherFormComponent, + SuggestionsNotificationComponent, + ], + }, }) .compileComponents(); })); diff --git a/src/app/register-email-form/register-email-form.module.ts b/src/app/register-email-form/register-email-form.module.ts index 5dfe11ba78..38a5a03361 100644 --- a/src/app/register-email-form/register-email-form.module.ts +++ b/src/app/register-email-form/register-email-form.module.ts @@ -1,5 +1,3 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; import { RegisterEmailFormComponent } from './register-email-form.component'; import { ThemedRegisterEmailFormComponent } from './themed-registry-email-form.component'; diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts index 4459b7262c..eb8a75980d 100644 --- a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts +++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts @@ -48,7 +48,13 @@ describe('ComcolBrowseByComponent', () => { { provide: ActivatedRoute, useValue: activatedRoute }, { provide: ThemeService, useValue: themeService }, ], - }).compileComponents(); + }) + .overrideComponent(ComcolBrowseByComponent, { + remove: { + imports: [BrowseBySwitcherComponent], + }, + }) + .compileComponents(); fixture = TestBed.createComponent(ComcolBrowseByComponent); component = fixture.componentInstance; diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts index 87de14c7aa..50d70943fd 100644 --- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts +++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts @@ -17,8 +17,10 @@ import { Item } from '../../../../core/shared/item.model'; import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; +import { WorkflowitemActionsComponent } from '../../../mydspace-actions/workflowitem/workflowitem-actions.component'; import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; +import { ItemDetailPreviewComponent } from '../item-detail-preview/item-detail-preview.component'; import { WorkflowItemSearchResultDetailElementComponent } from './workflow-item-search-result-detail-element.component'; let component: WorkflowItemSearchResultDetailElementComponent; @@ -75,6 +77,9 @@ describe('WorkflowItemSearchResultDetailElementComponent', () => { schemas: [NO_ERRORS_SCHEMA], }).overrideComponent(WorkflowItemSearchResultDetailElementComponent, { add: { changeDetection: ChangeDetectionStrategy.Default }, + remove: { + imports: [ItemDetailPreviewComponent, WorkflowitemActionsComponent], + }, }).compileComponents(); })); diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts index 95eb3f8381..cf2b383de8 100644 --- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts +++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts @@ -13,9 +13,9 @@ import { TranslateModule } from '@ngx-translate/core'; import { LinkService } from '../../../core/cache/builders/link.service'; import { Community } from '../../../core/shared/community.model'; +import { ThemedThumbnailComponent } from '../../../thumbnail/themed-thumbnail.component'; import { ActivatedRouteStub } from '../../testing/active-router.stub'; import { CommunityGridElementComponent } from './community-grid-element.component'; -import { ThemedThumbnailComponent } from '../../../thumbnail/themed-thumbnail.component'; let communityGridElementComponent: CommunityGridElementComponent; let fixture: ComponentFixture; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts index cf6757bd05..669c9ab55b 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts @@ -32,6 +32,7 @@ import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { mockTruncatableService } from '../../../mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../mocks/theme-service.mock'; +import { ClaimedTaskActionsComponent } from '../../../mydspace-actions/claimed-task/claimed-task-actions.component'; import { NotificationsService } from '../../../notifications/notifications.service'; import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model'; import { @@ -44,10 +45,8 @@ import { createPaginatedList } from '../../../testing/utils.test'; import { ThemeService } from '../../../theme-support/theme.service'; import { TruncatableService } from '../../../truncatable/truncatable.service'; import { VarDirective } from '../../../utils/var.directive'; -import { ClaimedSearchResultListElementComponent } from './claimed-search-result-list-element.component'; -import { AsyncPipe, NgClass, NgIf } from '@angular/common'; import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item-list-preview.component'; -import { ClaimedTaskActionsComponent } from '../../../mydspace-actions/claimed-task/claimed-task-actions.component'; +import { ClaimedSearchResultListElementComponent } from './claimed-search-result-list-element.component'; let component: ClaimedSearchResultListElementComponent; let fixture: ComponentFixture; diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts index 4955255de2..4093544ebb 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts @@ -21,9 +21,11 @@ import { Context } from '../../../../core/shared/context.model'; import { Item } from '../../../../core/shared/item.model'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { mockTruncatableService } from '../../../mocks/mock-trucatable.service'; +import { ItemActionsComponent } from '../../../mydspace-actions/item/item-actions.component'; import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model'; import { ThemeService } from '../../../theme-support/theme.service'; import { TruncatableService } from '../../../truncatable/truncatable.service'; +import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item-list-preview.component'; import { ItemSearchResultListElementSubmissionComponent } from './item-search-result-list-element-submission.component'; let component: ItemSearchResultListElementSubmissionComponent; @@ -75,6 +77,9 @@ describe('ItemMyDSpaceResultListElementComponent', () => { schemas: [NO_ERRORS_SCHEMA], }).overrideComponent(ItemSearchResultListElementSubmissionComponent, { add: { changeDetection: ChangeDetectionStrategy.Default }, + remove: { + imports: [ThemedItemListPreviewComponent, ItemActionsComponent], + }, }).compileComponents(); })); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts index 260db236bd..3456e2317a 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts @@ -28,6 +28,7 @@ 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 { getMockThemeService } from '../../../mocks/theme-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, @@ -37,6 +38,7 @@ import { createPaginatedList } from '../../../testing/utils.test'; import { ThemeService } from '../../../theme-support/theme.service'; import { TruncatableService } from '../../../truncatable/truncatable.service'; import { VarDirective } from '../../../utils/var.directive'; +import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item-list-preview.component'; import { PoolSearchResultListElementComponent } from './pool-search-result-list-element.component'; let component: PoolSearchResultListElementComponent; @@ -123,6 +125,9 @@ describe('PoolSearchResultListElementComponent', () => { schemas: [NO_ERRORS_SCHEMA], }).overrideComponent(PoolSearchResultListElementComponent, { add: { changeDetection: ChangeDetectionStrategy.Default }, + remove: { + imports: [ThemedItemListPreviewComponent, PoolTaskActionsComponent], + }, }).compileComponents(); })); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts index 96d7035b23..19d8cf5f65 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts @@ -21,9 +21,12 @@ import { ItemDataService } from '../../../../core/data/item-data.service'; import { Context } from '../../../../core/shared/context.model'; import { Item } from '../../../../core/shared/item.model'; import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model'; +import { ThemedLoadingComponent } from '../../../loading/themed-loading.component'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { mockTruncatableService } from '../../../mocks/mock-trucatable.service'; +import { WorkflowitemActionsComponent } from '../../../mydspace-actions/workflowitem/workflowitem-actions.component'; +import { ListableObjectComponentLoaderComponent } from '../../../object-collection/shared/listable-object/listable-object-component-loader.component'; import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { TruncatableService } from '../../../truncatable/truncatable.service'; @@ -92,6 +95,9 @@ describe('WorkflowItemSearchResultListElementComponent', () => { schemas: [NO_ERRORS_SCHEMA], }).overrideComponent(WorkflowItemSearchResultListElementComponent, { add: { changeDetection: ChangeDetectionStrategy.Default }, + remove: { + imports: [ListableObjectComponentLoaderComponent, WorkflowitemActionsComponent, ThemedLoadingComponent], + }, }).compileComponents(); })); diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts index 939e814372..5b87fe24a7 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts @@ -21,10 +21,13 @@ import { ItemDataService } from '../../../../core/data/item-data.service'; import { Context } from '../../../../core/shared/context.model'; import { Item } from '../../../../core/shared/item.model'; import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model'; +import { ThemedLoadingComponent } from '../../../loading/themed-loading.component'; import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock'; import { getMockLinkService } from '../../../mocks/link-service.mock'; import { mockTruncatableService } from '../../../mocks/mock-trucatable.service'; import { getMockThemeService } from '../../../mocks/theme-service.mock'; +import { WorkspaceitemActionsComponent } from '../../../mydspace-actions/workspaceitem/workspaceitem-actions.component'; +import { ListableObjectComponentLoaderComponent } from '../../../object-collection/shared/listable-object/listable-object-component-loader.component'; import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model'; import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils'; import { ThemeService } from '../../../theme-support/theme.service'; @@ -94,6 +97,9 @@ describe('WorkspaceItemSearchResultListElementComponent', () => { schemas: [NO_ERRORS_SCHEMA], }).overrideComponent(WorkspaceItemSearchResultListElementComponent, { add: { changeDetection: ChangeDetectionStrategy.Default }, + remove: { + imports: [ListableObjectComponentLoaderComponent, WorkspaceitemActionsComponent, ThemedLoadingComponent], + }, }).compileComponents(); })); diff --git a/src/app/shared/object-table/object-table.component.spec.ts b/src/app/shared/object-table/object-table.component.spec.ts index 667c2019f4..d835c03444 100644 --- a/src/app/shared/object-table/object-table.component.spec.ts +++ b/src/app/shared/object-table/object-table.component.spec.ts @@ -5,7 +5,13 @@ import { tick, } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; +import { ActivatedRoute } from '@angular/router'; +import { ErrorComponent } from '../error/error.component'; +import { ThemedLoadingComponent } from '../loading/themed-loading.component'; +import { TabulatableObjectsLoaderComponent } from '../object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component'; +import { PaginationComponent } from '../pagination/pagination.component'; +import { ActivatedRouteStub } from '../testing/active-router.stub'; import { ObjectTableComponent } from './object-table.component'; describe('ObjectTableComponent', () => { @@ -17,7 +23,20 @@ describe('ObjectTableComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ imports: [ObjectTableComponent], + providers: [ + { provide: ActivatedRoute, useValue: new ActivatedRouteStub() }, + ], }) + .overrideComponent(ObjectTableComponent, { + remove: { + imports: [ + PaginationComponent, + ThemedLoadingComponent, + ErrorComponent, + TabulatableObjectsLoaderComponent, + ], + }, + }) .compileComponents(); fixture = TestBed.createComponent(ObjectTableComponent); diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts index 02df8b8b78..4820941c9f 100644 --- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts +++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts @@ -20,6 +20,7 @@ import { Router, } from '@angular/router'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core'; import { provideMockStore } from '@ngrx/store/testing'; import { TranslateModule } from '@ngx-translate/core'; import { getTestScheduler } from 'jasmine-marbles'; @@ -67,7 +68,6 @@ import { ResourcePolicyEvent, ResourcePolicyFormComponent, } from './resource-policy-form.component'; -import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core'; export const mockResourcePolicyFormData = { name: [