From a3fefc20a76dd4eee03cf8a648d3230e74e6c28f Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Thu, 11 Jan 2024 09:46:44 +0100 Subject: [PATCH] fix tests --- ...n-search-result-list-submission-element.component.spec.ts | 5 ++--- .../item-edit-bitstream.component.spec.ts | 2 -- .../my-dspace-new-external-dropdown.component.spec.ts | 3 --- .../my-dspace-new-submission-dropdown.component.spec.ts | 3 --- src/app/search-navbar/search-navbar.component.spec.ts | 2 -- src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts | 2 -- src/app/shared/browse-by/browse-by.component.spec.ts | 4 ---- .../methods/password/log-in-password.component.spec.ts | 2 -- src/app/shared/log-out/log-out.component.spec.ts | 2 -- src/app/shared/search-form/search-form.component.spec.ts | 2 -- .../search-filter/search-filter.component.spec.ts | 2 -- .../view-mode-switch/view-mode-switch.component.spec.ts | 2 -- .../form/footer/submission-form-footer.component.spec.ts | 2 -- 13 files changed, 2 insertions(+), 31 deletions(-) diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts index 385ce60302..e95282d872 100644 --- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts +++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts @@ -30,7 +30,6 @@ import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type'; import { AuthService } from '../../../../../core/auth/auth.service'; import { REQUEST } from '@nguniversal/express-engine/tokens'; -import { BrowseByRoutingModule } from '../../../../../browse-by/browse-by-routing.module'; import { ThemeService } from '../../../../../shared/theme-support/theme.service'; import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock'; @@ -111,7 +110,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => { beforeEach(waitForAsync(async () => { init(); await TestBed.configureTestingModule({ - imports: [PersonSearchResultListSubmissionElementComponent, TruncatePipe, BrowseByRoutingModule], + imports: [PersonSearchResultListSubmissionElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, { provide: RelationshipDataService, useValue: mockRelationshipService }, @@ -210,7 +209,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => { beforeEach(waitForAsync(() => { init(); TestBed.configureTestingModule({ - imports: [PersonSearchResultListSubmissionElementComponent, TruncatePipe, BrowseByRoutingModule], + imports: [PersonSearchResultListSubmissionElementComponent, TruncatePipe], providers: [ { provide: TruncatableService, useValue: {} }, { provide: RelationshipDataService, useValue: mockRelationshipService }, diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts index a7271206fd..2f2869b4a2 100644 --- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts +++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts @@ -12,7 +12,6 @@ import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils'; import { getBitstreamDownloadRoute } from '../../../../app-routing-paths'; import { By } from '@angular/platform-browser'; -import { BrowserOnlyMockPipe } from '../../../../shared/testing/browser-only-mock.pipe'; import { ActivatedRoute } from '@angular/router'; import { ActivatedRouteStub } from '../../../../shared/testing/active-router.stub'; import { RouterTestingModule } from '@angular/router/testing'; @@ -81,7 +80,6 @@ describe('ItemEditBitstreamComponent', () => { ItemEditBitstreamComponent, VarDirective ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: ObjectUpdatesService, useValue: objectUpdatesService }, { provide: ActivatedRoute, useValue: new ActivatedRouteStub() } diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts index 99553580fd..6b14e08bd9 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts @@ -13,7 +13,6 @@ import { ResourceType } from '../../../core/shared/resource-type'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { PageInfo } from '../../../core/shared/page-info.model'; import { RouterStub } from '../../../shared/testing/router.stub'; -import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe'; export function getMockEntityTypeService(): EntityTypeDataService { const pageInfo = { elementsPerPage: 20, totalElements: 4, totalPages: 1, currentPage: 0 } as PageInfo; @@ -84,7 +83,6 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => { MyDSpaceNewExternalDropdownComponent, TestComponent ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: EntityTypeDataService, useValue: getMockEmptyEntityTypeService() }, { provide: Router, useValue: new RouterStub() }, @@ -134,7 +132,6 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => { MyDSpaceNewExternalDropdownComponent, TestComponent ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: EntityTypeDataService, useValue: getMockEntityTypeService() }, { provide: Router, useValue: new RouterStub() }, diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts index c32e01f7ff..beb82df4f2 100644 --- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts +++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts @@ -12,7 +12,6 @@ import { ItemType } from '../../../core/shared/item-relationships/item-type.mode import { ResourceType } from '../../../core/shared/resource-type'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { PageInfo } from '../../../core/shared/page-info.model'; -import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe'; export function getMockEntityTypeService(): EntityTypeDataService { const type1: ItemType = { @@ -88,7 +87,6 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => { MyDSpaceNewSubmissionDropdownComponent, TestComponent ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: EntityTypeDataService, useValue: getMockEmptyEntityTypeService() }, { provide: NgbModal, useValue: modalStub }, @@ -138,7 +136,6 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => { MyDSpaceNewSubmissionDropdownComponent, TestComponent ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: EntityTypeDataService, useValue: getMockEntityTypeService() }, { provide: NgbModal, useValue: modalStub }, diff --git a/src/app/search-navbar/search-navbar.component.spec.ts b/src/app/search-navbar/search-navbar.component.spec.ts index d8e2fb8d4a..236b97cc91 100644 --- a/src/app/search-navbar/search-navbar.component.spec.ts +++ b/src/app/search-navbar/search-navbar.component.spec.ts @@ -9,7 +9,6 @@ import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock'; import { SearchNavbarComponent } from './search-navbar.component'; import { RouterTestingModule } from '@angular/router/testing'; -import { BrowserOnlyMockPipe } from '../shared/testing/browser-only-mock.pipe'; describe('SearchNavbarComponent', () => { let component: SearchNavbarComponent; @@ -38,7 +37,6 @@ describe('SearchNavbarComponent', () => { }), SearchNavbarComponent ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: SearchService, useValue: mockSearchService } ] diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts index 62f9f782ec..e42cc42c7a 100644 --- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts +++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts @@ -15,7 +15,6 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model'; import { AuthService } from '../../core/auth/auth.service'; import { of } from 'rxjs'; -import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe'; import { ActivatedRoute } from '@angular/router'; import { ActivatedRouteStub } from '../testing/active-router.stub'; @@ -80,7 +79,6 @@ describe('AuthNavMenuComponent', () => { TranslateModule.forRoot(), AuthNavMenuComponent ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: HostWindowService, useValue: window }, { provide: AuthService, useValue: authService }, diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts index 34c4607850..a3b84671ea 100644 --- a/src/app/shared/browse-by/browse-by.component.spec.ts +++ b/src/app/shared/browse-by/browse-by.component.spec.ts @@ -44,8 +44,6 @@ import { ConfigurationProperty } from '../../core/shared/configuration-property. import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub'; import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service'; import { getMockThemeService } from '../mocks/theme-service.mock'; -import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module'; -import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module'; @listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'custom') @Component({ @@ -115,8 +113,6 @@ describe('BrowseByComponent', () => { themeService = getMockThemeService('dspace'); TestBed.configureTestingModule({ imports: [ - BrowseByRoutingModule, - AccessControlRoutingModule, CommonModule, NgbModule, TranslateModule.forRoot({ diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts index 2fd434d3db..23d778f73f 100644 --- a/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts +++ b/src/app/shared/log-in/methods/password/log-in-password.component.spec.ts @@ -15,7 +15,6 @@ import { storeModuleConfig } from '../../../../app.reducer'; import { AuthMethod } from '../../../../core/auth/models/auth.method'; import { AuthMethodType } from '../../../../core/auth/models/auth.method-type'; import { HardRedirectService } from '../../../../core/services/hard-redirect.service'; -import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe'; import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service'; import { AuthorizationDataServiceStub } from '../../../testing/authorization-service.stub'; import { ActivatedRouteStub } from '../../../testing/active-router.stub'; @@ -60,7 +59,6 @@ describe('LogInPasswordComponent', () => { TranslateModule.forRoot(), LogInPasswordComponent ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: AuthService, useClass: AuthServiceStub }, { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub }, diff --git a/src/app/shared/log-out/log-out.component.spec.ts b/src/app/shared/log-out/log-out.component.spec.ts index cbd5ed9ed3..077cfd3571 100644 --- a/src/app/shared/log-out/log-out.component.spec.ts +++ b/src/app/shared/log-out/log-out.component.spec.ts @@ -12,7 +12,6 @@ import { Router } from '@angular/router'; import { AppState } from '../../app.reducer'; import { LogOutComponent } from './log-out.component'; import { RouterStub } from '../testing/router.stub'; -import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe'; describe('LogOutComponent', () => { @@ -47,7 +46,6 @@ describe('LogOutComponent', () => { TranslateModule.forRoot(), LogOutComponent ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: Router, useValue: routerStub }, ], diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts index e231863778..4e9c4e9132 100644 --- a/src/app/shared/search-form/search-form.component.spec.ts +++ b/src/app/shared/search-form/search-form.component.spec.ts @@ -13,7 +13,6 @@ import { SearchConfigurationService } from '../../core/shared/search/search-conf import { PaginationServiceStub } from '../testing/pagination-service.stub'; import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service'; import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils'; -import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe'; import { SearchServiceStub } from '../testing/search-service.stub'; import { Router } from '@angular/router'; import { RouterStub } from '../testing/router.stub'; @@ -43,7 +42,6 @@ describe('SearchFormComponent', () => { { provide: SearchConfigurationService, useValue: searchConfigService }, { provide: DSpaceObjectDataService, useValue: dspaceObjectService }, ], - declarations: [BrowserOnlyMockPipe] }).compileComponents(); })); diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts index 02a1ca73da..e60c304bce 100644 --- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts +++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts @@ -13,7 +13,6 @@ import { FilterType } from '../../models/filter-type.model'; import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub'; import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component'; import { SequenceService } from '../../../../core/shared/sequence.service'; -import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe'; import { SearchFacetFilterWrapperComponent } from './search-facet-filter-wrapper/search-facet-filter-wrapper.component'; describe('SearchFilterComponent', () => { @@ -64,7 +63,6 @@ describe('SearchFilterComponent', () => { TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, SearchFilterComponent], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: SearchService, useValue: searchServiceStub }, { diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts index 5c090c1d67..109994dd00 100644 --- a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts +++ b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts @@ -9,7 +9,6 @@ import { SearchService } from '../../core/shared/search/search.service'; import { ViewModeSwitchComponent } from './view-mode-switch.component'; import { SearchServiceStub } from '../testing/search-service.stub'; import { ViewMode } from '../../core/shared/view-mode.model'; -import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe'; @Component({ template: '', @@ -40,7 +39,6 @@ describe('ViewModeSwitchComponent', () => { ViewModeSwitchComponent, DummyComponent ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: SearchService, useValue: searchService }, ] diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts index 6773c1cdcb..a6123ec2f7 100644 --- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts +++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts @@ -15,7 +15,6 @@ import { SubmissionRestServiceStub } from '../../../shared/testing/submission-re import { SubmissionFormFooterComponent } from './submission-form-footer.component'; import { SubmissionRestService } from '../../../core/submission/submission-rest.service'; import { createTestComponent } from '../../../shared/testing/utils.test'; -import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe'; const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub(); @@ -37,7 +36,6 @@ describe('SubmissionFormFooterComponent', () => { SubmissionFormFooterComponent, TestComponent ], - declarations: [BrowserOnlyMockPipe], providers: [ { provide: SubmissionService, useValue: submissionServiceStub }, { provide: SubmissionRestService, useClass: SubmissionRestServiceStub },