tests: fix tests to match new external products

Author: shiftmed

angular/src/app/search/filters/filters.component.spec.ts

@@ -55,7 +55,7 @@ describe("FiltersComponent", () => {
   it("onSuccess", () => {
     component.onSuccess(searchResult);
     // Basic assertions adapted to minimal fixture
-    expect(component.keywords).toContain("Advanced Functional Materials");
+    expect(component.keywords).toContain("advanced functional materials");
     expect(component.keywords.length).toBeGreaterThanOrEqual(1);
     expect(component.themesWithCount[0].label.startsWith("Nanotechnology")).toBeTruthy();
     expect(component.resourceTypesWithCount[0].label.startsWith("Public Data Resource")).toBeTruthy();

angular/src/app/shared/search-service/search-service.service.real.ts

@@ -514,10 +514,23 @@ export class RealSearchService implements SearchService {
       item.languages
     );
     const contactName =
+      (item.contactPoint && (item.contactPoint.fn || item.contactPoint.name)) ||
       (item.contact && (item.contact.fn || item.contact.name)) ||
       item.organization ||
       item.contact?.email ||
       "";
+    const rawContactPoint =
+      item.contactPoint ||
+      item.contact ||
+      (contactName ? { fn: contactName } : {});
+    const contactPoint =
+      contactName &&
+      rawContactPoint &&
+      typeof rawContactPoint === "object" &&
+      !Array.isArray(rawContactPoint) &&
+      !rawContactPoint.fn
+        ? { ...rawContactPoint, fn: contactName }
+        : rawContactPoint;
     const typeArray = this.normalizeCodeTypes(item["@type"], item.vcs);
     const topic = Array.isArray(item.topic) ? item.topic : [];
     return {
@@ -542,10 +555,7 @@ export class RealSearchService implements SearchService {
             item.dates.updated ||
             item.dates.lastModified)) ||
         null,
-      contactPoint:
-        item.contactPoint ||
-        item.contact ||
-        (contactName ? { fn: contactName } : {}),
+      contactPoint,
     };
   }
 

angular/src/app/shared/search-service/search-service.service.spec.ts

@@ -41,8 +41,8 @@ describe('SearchService', () => {
     const sub = service.watchExternalProducts().subscribe((v) => {
       seen.push(v);
       if (seen.length === 2) {
-        expect(seen[0]).toBeFalse();
-        expect(seen[1]).toBeTrue();
+        expect(seen[0]).toBe(false);
+        expect(seen[1]).toBe(true);
         sub.unsubscribe();
         done();
       }
@@ -67,11 +67,10 @@ describe('SearchService', () => {
     expect(merged.total).toBe(2);
     expect(merged.ResultData.length).toBe(2);
     const external = merged.ResultData[1];
-    expect(external.external).toBeTrue();
+    expect(external.external).toBe(true);
     expect(external.title).toBe('RepoOne');
     expect(external['@type']).toContain('CodeRepository');
     expect(external.keyword).toContain('science');
-    expect(external.keyword).toContain('Python');
     expect(external.contactPoint.fn).toBe('NIST DevOps');
     // Keywords are normalized to lowercase
     expect(external.keyword).toContain('python');