From 7ef3a914f9b1e85ddef29bbe9ff50af610c397e1 Mon Sep 17 00:00:00 2001 From: Alexandre Vryghem Date: Sat, 1 Jul 2023 13:23:02 +0200 Subject: [PATCH] Fix ItemComponent no expectation tests - renamed `showBackButton` to `showBackButton$` because it's an observable - `showBackButton$` only emits `true` when the back button should be shown, it does not emit `false` when it should be hidden, it just did nothing --- .../journal-issue/journal-issue.component.html | 2 +- .../journal-volume/journal-volume.component.html | 2 +- .../item-pages/journal/journal.component.html | 2 +- .../item-pages/org-unit/org-unit.component.html | 2 +- .../item-pages/person/person.component.html | 2 +- .../item-pages/project/project.component.html | 2 +- .../item-types/publication/publication.component.html | 2 +- .../simple/item-types/shared/item.component.spec.ts | 11 ++++++----- .../simple/item-types/shared/item.component.ts | 9 ++++----- .../untyped-item/untyped-item.component.html | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html index 75f4587a3d..3648b53b51 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html @@ -1,4 +1,4 @@ - +
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html index 213581a519..b906905b47 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html @@ -1,4 +1,4 @@ - +
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html index 3b2cce061b..e8a6904242 100644 --- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html +++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html @@ -1,4 +1,4 @@ - +
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html index c79d19e267..aa3188bc1d 100644 --- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html +++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html @@ -1,4 +1,4 @@ - +
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html index 83a2e76dd8..ec99c845be 100644 --- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html +++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html @@ -1,4 +1,4 @@ - +
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html index 0d9679ef1e..944766b6f7 100644 --- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html +++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html @@ -1,4 +1,4 @@ - +
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html index 3749f63964..84754df5e4 100644 --- a/src/app/item-page/simple/item-types/publication/publication.component.html +++ b/src/app/item-page/simple/item-types/publication/publication.component.html @@ -1,4 +1,4 @@ - +
{ fixture.detectChanges(); })); - it('should hide back button',() => { + it('should hide back button', () => { spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf('/item')); - comp.showBackButton.subscribe((val) => { + comp.ngOnInit(); + comp.showBackButton$.subscribe((val) => { expect(val).toBeFalse(); }); }); it('should show back button for search', () => { spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl)); comp.ngOnInit(); - comp.showBackButton.subscribe((val) => { + comp.showBackButton$.subscribe((val) => { expect(val).toBeTrue(); }); }); it('should show back button for browse', () => { spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(browseUrl)); comp.ngOnInit(); - comp.showBackButton.subscribe((val) => { + comp.showBackButton$.subscribe((val) => { expect(val).toBeTrue(); }); }); it('should show back button for recent submissions', () => { spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(recentSubmissionsUrl)); comp.ngOnInit(); - comp.showBackButton.subscribe((val) => { + comp.showBackButton$.subscribe((val) => { expect(val).toBeTrue(); }); }); diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts index 93e6a0b346..edcfd57a69 100644 --- a/src/app/item-page/simple/item-types/shared/item.component.ts +++ b/src/app/item-page/simple/item-types/shared/item.component.ts @@ -5,7 +5,7 @@ import { getItemPageRoute } from '../../../item-page-routing-paths'; import { RouteService } from '../../../../core/services/route.service'; import { Observable } from 'rxjs'; import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils'; -import { filter, map, take } from 'rxjs/operators'; +import { map, take } from 'rxjs/operators'; import { Router } from '@angular/router'; @Component({ @@ -27,7 +27,7 @@ export class ItemComponent implements OnInit { /** * Used to show or hide the back to results button in the view. */ - showBackButton: Observable; + showBackButton$: Observable; /** * Route to the item page @@ -73,10 +73,9 @@ export class ItemComponent implements OnInit { this.itemPageRoute = getItemPageRoute(this.object); // hide/show the back button - this.showBackButton = this.routeService.getPreviousUrl().pipe( - filter(url => this.previousRoute.test(url)), + this.showBackButton$ = this.routeService.getPreviousUrl().pipe( + map((url: string) => this.previousRoute.test(url)), take(1), - map(() => true) ); // check to see if iiif viewer is required. this.iiifEnabled = isIiifEnabled(this.object); diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html index 904b7e039c..064f8a7764 100644 --- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html +++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html @@ -1,4 +1,4 @@ - +