From 98b15658b0e9bb559a4da351fce9ab4a941d5ff8 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Wed, 13 Mar 2024 12:02:01 +0100 Subject: [PATCH] [DURACOM-191] fix some test errors --- .../browse-by-date.component.spec.ts | 31 +++++++++++++++++-- .../browse-by-page.component.spec.ts | 2 -- .../browse-by-decorator.spec.ts | 14 ++++----- .../browse-by-switcher.component.spec.ts | 2 -- .../comcol-browse-by.component.spec.ts | 2 -- .../browse-by-date.component.ts | 4 --- .../browse-by-metadata.component.ts | 4 --- .../browse-by-taxonomy.component.ts | 4 --- .../browse-by-title.component.ts | 4 --- 9 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts index 7f1922f98e..7cdb083c10 100644 --- a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts +++ b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts @@ -28,6 +28,14 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv import { PaginationService } from '../../core/pagination/pagination.service'; import { Community } from '../../core/shared/community.model'; import { Item } from '../../core/shared/item.model'; +import { BrowseByComponent } from '../../shared/browse-by/browse-by.component'; +import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component'; +import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; +import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/comcol-page-content.component'; +import { ThemedComcolPageHandleComponent } from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component'; +import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component'; +import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component'; +import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component'; import { RouterMock } from '../../shared/mocks/router.mock'; import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; @@ -98,13 +106,15 @@ describe('BrowseByDateComponent', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [CommonModule, + imports: [ + CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule, BrowseByDateComponent, EnumKeysPipe, - VarDirective], + VarDirective, + ], providers: [ { provide: ActivatedRoute, useValue: activatedRouteStub }, { provide: BrowseService, useValue: mockBrowseService }, @@ -116,7 +126,22 @@ describe('BrowseByDateComponent', () => { { provide: APP_CONFIG, useValue: environment }, ], schemas: [NO_ERRORS_SCHEMA], - }).compileComponents(); + }) + .overrideComponent(BrowseByDateComponent, { + remove: { + imports: [ + ComcolPageHeaderComponent, + ComcolPageLogoComponent, + ThemedComcolPageHandleComponent, + ComcolPageContentComponent, + ThemedComcolPageBrowseByComponent, + BrowseByComponent, + ThemedLoadingComponent, + ThemedBrowseByComponent, + ], + }, + }) + .compileComponents(); })); beforeEach(() => { diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts index 44d9ccef3f..a7bcd192b1 100644 --- a/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts +++ b/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts @@ -13,11 +13,9 @@ import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { ActivatedRouteStub } from '../../shared/testing/active-router.stub'; import { ThemeService } from '../../shared/theme-support/theme.service'; import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type'; -import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator'; import { BrowseBySwitcherComponent } from '../browse-by-switcher/browse-by-switcher.component'; import { BrowseByPageComponent } from './browse-by-page.component'; -@rendersBrowseBy('BrowseByPageComponent' as BrowseByDataType) @Component({ // eslint-disable-next-line @angular-eslint/component-selector selector: '', diff --git a/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts index 64604cdc04..25ddea1233 100644 --- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts +++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts @@ -1,13 +1,13 @@ import { BrowseByDataType } from './browse-by-data-type'; -import { rendersBrowseBy } from './browse-by-decorator'; +import { BROWSE_BY_DECORATOR_MAP } from './browse-by-decorator'; describe('BrowseByDecorator', () => { - const titleDecorator = rendersBrowseBy(BrowseByDataType.Title); - const dateDecorator = rendersBrowseBy(BrowseByDataType.Date); - const metadataDecorator = rendersBrowseBy(BrowseByDataType.Metadata); + const titleDecorator = BROWSE_BY_DECORATOR_MAP.get(BrowseByDataType.Title); + const dateDecorator = BROWSE_BY_DECORATOR_MAP.get(BrowseByDataType.Date); + const metadataDecorator = BROWSE_BY_DECORATOR_MAP.get(BrowseByDataType.Metadata); it('should have a decorator for all types', () => { - expect(titleDecorator.length).not.toEqual(0); - expect(dateDecorator.length).not.toEqual(0); - expect(metadataDecorator.length).not.toEqual(0); + expect(titleDecorator).toBeTruthy(); + expect(dateDecorator).toBeTruthy(); + expect(metadataDecorator).toBeTruthy(); }); }); diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts index f5349b5a65..d56671577e 100644 --- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts +++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts @@ -15,10 +15,8 @@ import { DynamicComponentLoaderDirective } from '../../shared/abstract-component import { getMockThemeService } from '../../shared/mocks/theme-service.mock'; import { ThemeService } from '../../shared/theme-support/theme.service'; import { BrowseByDataType } from './browse-by-data-type'; -import { rendersBrowseBy } from './browse-by-decorator'; import { BrowseBySwitcherComponent } from './browse-by-switcher.component'; -@rendersBrowseBy('BrowseBySwitcherComponent' as BrowseByDataType) @Component({ // eslint-disable-next-line @angular-eslint/component-selector selector: '', 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 dd0b18ecce..4459b7262c 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 @@ -8,7 +8,6 @@ import { By } from '@angular/platform-browser'; import { ActivatedRoute } from '@angular/router'; import { BrowseByDataType } from '../../../../browse-by/browse-by-switcher/browse-by-data-type'; -import { rendersBrowseBy } from '../../../../browse-by/browse-by-switcher/browse-by-decorator'; import { BrowseBySwitcherComponent } from '../../../../browse-by/browse-by-switcher/browse-by-switcher.component'; import { BrowseDefinition } from '../../../../core/shared/browse-definition.model'; import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive'; @@ -17,7 +16,6 @@ import { ActivatedRouteStub } from '../../../testing/active-router.stub'; import { ThemeService } from '../../../theme-support/theme.service'; import { ComcolBrowseByComponent } from './comcol-browse-by.component'; -@rendersBrowseBy('ComcolBrowseByComponent' as BrowseByDataType) @Component({ // eslint-disable-next-line @angular-eslint/component-selector selector: '', diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts index d931765689..128e059fd3 100644 --- a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts @@ -6,9 +6,6 @@ import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { BrowseByDateComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date/browse-by-date.component'; -import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type'; -import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator'; -import { Context } from '../../../../../app/core/shared/context.model'; import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component'; import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; @@ -43,6 +40,5 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; ThemedBrowseByComponent, ], }) -@rendersBrowseBy(BrowseByDataType.Date, Context.Any, 'custom') export class BrowseByDateComponent extends BaseComponent { } diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts index 52fe28bef6..c1d5e66583 100644 --- a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts @@ -6,9 +6,6 @@ import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component'; -import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type'; -import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator'; -import { Context } from '../../../../../app/core/shared/context.model'; import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component'; import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; @@ -43,6 +40,5 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; ThemedBrowseByComponent, ], }) -@rendersBrowseBy(BrowseByDataType.Metadata, Context.Any, 'custom') export class BrowseByMetadataComponent extends BaseComponent { } diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts index 51461f1e31..80190b92cf 100644 --- a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts @@ -6,10 +6,7 @@ import { Component } from '@angular/core'; import { RouterModule } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type'; -import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator'; import { BrowseByTaxonomyComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component'; -import { Context } from '../../../../../app/core/shared/context.model'; import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component'; import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; @@ -47,6 +44,5 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; ThemedBrowseByComponent, ], }) -@rendersBrowseBy(BrowseByDataType.Hierarchy, Context.Any, 'custom') export class BrowseByTaxonomyComponent extends BaseComponent { } diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts index 4c687547b3..84b8d4bc36 100644 --- a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts +++ b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts @@ -5,10 +5,7 @@ import { import { Component } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; -import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type'; -import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator'; import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component'; -import { Context } from '../../../../../app/core/shared/context.model'; import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component'; import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component'; import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component'; @@ -43,6 +40,5 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive'; ThemedBrowseByComponent, ], }) -@rendersBrowseBy(BrowseByDataType.Title, Context.Any, 'custom') export class BrowseByTitleComponent extends BaseComponent { }