From f7f784157dfd337cb8ac1bb87589fdb505532b50 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 8 Dec 2020 14:51:40 +0100
Subject: [PATCH] 74647: Add Generator meta tag on all pages

---
 src/app/core/metadata/metadata.service.spec.ts | 12 +++---------
 src/app/core/metadata/metadata.service.ts      |  4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index f961f22560..2952e665d3 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -232,24 +232,18 @@ describe('MetadataService', () => {
     expect(tagStore.get('citation_technical_report_institution')[0].content).toEqual('Mock Publisher');
   }));
 
-  it('items page should set meta tag for Generator containing the current DSpace version', fakeAsync(() => {
-    spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
-    router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
-    tick();
-    expect(tagStore.get('Generator')[0].content).toEqual('mock-dspace-version');
-  }));
-
-  it('other navigation should title and description', fakeAsync(() => {
+  it('other navigation should add title, description and Generator', fakeAsync(() => {
     spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
     router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
     tick();
     expect(tagStore.size).toBeGreaterThan(0);
     router.navigate(['/other']);
     tick();
-    expect(tagStore.size).toEqual(2);
+    expect(tagStore.size).toEqual(3);
     expect(title.getTitle()).toEqual('Dummy Title');
     expect(tagStore.get('title')[0].content).toEqual('Dummy Title');
     expect(tagStore.get('description')[0].content).toEqual('This is a dummy item component for testing!');
+    expect(tagStore.get('Generator')[0].content).toEqual('mock-dspace-version');
   }));
 
   describe('when the item has no bitstreams', () => {
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index c44c4fbb15..414fb13a88 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -93,6 +93,8 @@ export class MetadataService {
         this.addMetaTag('description', translatedDescription);
       });
     }
+
+    this.setGenerator();
   }
 
   private initialize(dspaceObject: DSpaceObject): void {
@@ -138,8 +140,6 @@ export class MetadataService {
       this.setCitationTechReportInstitutionTag();
     }
 
-    this.setGenerator();
-
     // this.setCitationJournalTitleTag();
     // this.setCitationVolumeTag();
     // this.setCitationIssueTag();