94481: Fixed tests

Author: alexandrevryghem

src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts

@@ -8,6 +8,11 @@ const object = Object.assign(new ItemSearchResult(), {
   indexableObject: Object.assign(new Item(), {
     id: 'test-item',
     metadata: {
+      'dspace.entity.type': [
+        {
+          value: 'OrgUnit'
+        }
+      ],
       'organization.legalName': [
         {
           value: 'title'

src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts

@@ -3,12 +3,16 @@ import { Collection } from '../../../../../core/shared/collection.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { PersonSidebarSearchListElementComponent } from './person-sidebar-search-list-element.component';
-import { TranslateService } from '@ngx-translate/core';
 
 const object = Object.assign(new ItemSearchResult(), {
   indexableObject: Object.assign(new Item(), {
     id: 'test-item',
     metadata: {
+      'dspace.entity.type': [
+        {
+          value: 'Person',
+        }
+      ],
       'person.familyName': [
         {
           value: 'family name'
@@ -40,6 +44,5 @@ const parent = Object.assign(new Collection(), {
 
 describe('PersonSidebarSearchListElementComponent',
   createSidebarSearchListElementTests(PersonSidebarSearchListElementComponent, object, parent, 'parent title', 'family name, given name', 'job title', [
-    { provide: TranslateService, useValue: jasmine.createSpyObj('translate', { instant: '' }) }
   ])
 );

src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts

@@ -24,6 +24,7 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils
 import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { ItemSearchResultGridElementComponent } from './item-search-result-grid-element.component';
+import { TranslateModule } from '@ngx-translate/core';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -99,7 +100,10 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
 
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [NoopAnimationsModule],
+        imports: [
+          NoopAnimationsModule,
+          TranslateModule.forRoot(),
+        ],
         declarations: [component, TruncatePipe],
         providers: [
           { provide: TruncatableService, useValue: truncatableServiceStub },

src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html

@@ -2,10 +2,10 @@
   <div [ngClass]="isCurrent() ? 'text-light' : 'text-body'"
        [innerHTML]="(parentTitle$ && parentTitle$ | async) ? (parentTitle$ | async) : ('home.breadcrumbs' | translate)"></div>
 </ds-truncatable-part>
-<ds-truncatable-part *ngIf="title" [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'">
+<ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'">
   <div class="font-weight-bold"
        [ngClass]="isCurrent() ? 'text-light' : 'text-primary'"
-       [innerHTML]="title"></div>
+       [innerHTML]="dsoTitle"></div>
 </ds-truncatable-part>
 <ds-truncatable-part *ngIf="description" [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'">
   <div class="text-secondary"

src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts

@@ -40,7 +40,7 @@ export function createSidebarSearchListElementTests(
         providers: [
           { provide: TruncatableService, useValue: {} },
           { provide: LinkService, useValue: linkService },
-          { provide: DSONameService, useClass: DSONameServiceMock },
+          DSONameService,
           ...extraProviders
         ],
         schemas: [NO_ERRORS_SCHEMA]
@@ -51,6 +51,7 @@ export function createSidebarSearchListElementTests(
       fixture = TestBed.createComponent(componentClass);
       component = fixture.componentInstance;
       component.object = object;
+      component.ngOnInit();
       fixture.detectChanges();
     });
 
@@ -62,7 +63,7 @@ export function createSidebarSearchListElementTests(
     });
 
     it('should contain the correct title', () => {
-      expect(component.title).toEqual(expectedTitle);
+      expect(component.dsoTitle).toEqual(expectedTitle);
     });
 
     it('should contain the correct description', () => {

src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts

@@ -28,11 +28,6 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
    */
   parentTitle$: Observable<string>;
 
-  /**
-   * The title for the object to display
-   */
-  title: string;
-
   /**
    * A description to display below the title
    */
@@ -52,7 +47,6 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
     super.ngOnInit();
     if (hasValue(this.dso)) {
       this.parentTitle$ = this.getParentTitle();
-      this.title = this.getTitle();
       this.description = this.getDescription();
     }
   }
@@ -89,14 +83,6 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
     return observableOf(undefined);
   }
 
-  /**
-   * Get the title of the object
-   * Default: defined by {@link DSONameService}
-   */
-  getTitle(): string {
-    return this.dsoNameService.getName(this.dso);
-  }
-
   /**
    * Get the description of the object
    * Default: "(dc.publisher, dc.date.issued) authors"