From 2af9984ace28e83377fafce16c65fee14ee17789 Mon Sep 17 00:00:00 2001 From: Samuel Cambien Date: Thu, 29 Sep 2022 10:44:23 +0200 Subject: [PATCH] repair tests --- .../metadata-values/metadata-values.component.html | 2 +- .../metadata-values/metadata-values.component.ts | 13 ++++++++++--- .../item-page-field.component.spec.ts | 8 ++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html index 5e146ebf48..824265c5c8 100644 --- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html +++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html @@ -1,6 +1,6 @@ - + diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts index 2652e75c12..bc408f805b 100644 --- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts +++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts @@ -1,4 +1,4 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { MetadataValue } from '../../../core/shared/metadata.models'; import { environment } from '../../../../environments/environment'; @@ -11,7 +11,7 @@ import { environment } from '../../../../environments/environment'; styleUrls: ['./metadata-values.component.scss'], templateUrl: './metadata-values.component.html' }) -export class MetadataValuesComponent { +export class MetadataValuesComponent implements OnChanges { /** * The metadata values to display @@ -35,5 +35,12 @@ export class MetadataValuesComponent { */ @Input() enableMarkdown = false; - env = environment; + /** + * This variable will be true if both {@link environment.markdown.enabled} and {@link enableMarkdown} are true. + */ + renderMarkdown; + + ngOnChanges(changes: SimpleChanges): void { + this.renderMarkdown = !!environment.markdown.enabled && this.enableMarkdown; + } } diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts index 385520882a..05856a1f89 100644 --- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts @@ -11,6 +11,7 @@ import { createPaginatedList } from '../../../../shared/testing/utils.test'; import { environment } from '../../../../../environments/environment'; import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe'; import { SharedModule } from '../../../../shared/shared.module'; +import { APP_CONFIG } from '../../../../../config/app-config.interface'; let comp: ItemPageFieldComponent; let fixture: ComponentFixture; @@ -33,6 +34,9 @@ describe('ItemPageFieldComponent', () => { }), SharedModule, ], + providers: [ + { provide: APP_CONFIG, useValue: Object.assign({}, environment) }, + ], declarations: [ItemPageFieldComponent, MetadataValuesComponent], schemas: [NO_ERRORS_SCHEMA] }).overrideComponent(ItemPageFieldComponent, { @@ -57,7 +61,7 @@ describe('ItemPageFieldComponent', () => { describe('when markdown is disabled in the environment config', () => { beforeEach(() => { - environment.markdown.enabled = false; + TestBed.inject(APP_CONFIG).markdown.enabled = false; }); describe('and markdown is disabled in this component', () => { @@ -88,7 +92,7 @@ describe('ItemPageFieldComponent', () => { describe('when markdown is enabled in the environment config', () => { beforeEach(() => { - environment.markdown.enabled = true; + TestBed.inject(APP_CONFIG).markdown.enabled = true; }); describe('and markdown is disabled in this component', () => {