fix(tests): updated unit tests

Author: nsemets

jest.config.js

@@ -50,10 +50,10 @@ module.exports = {
   extensionsToTreatAsEsm: ['.ts'],
   coverageThreshold: {
     global: {
-      branches: 24.1,
-      functions: 28.73,
-      lines: 56.52,
-      statements: 56.82,
+      branches: 29.01,
+      functions: 32.75,
+      lines: 60.28,
+      statements: 60.77,
     },
   },
   watchPathIgnorePatterns: [

src/app/features/metadata/metadata.component.ts

@@ -125,7 +125,7 @@ export class MetadataComponent implements OnInit {
   metadata = select(MetadataSelectors.getResourceMetadata);
   isMetadataLoading = select(MetadataSelectors.getLoading);
   customItemMetadata = select(MetadataSelectors.getCustomItemMetadata);
-  bibliographicContributors = select(ContributorsSelectors.getBibliographicContributorsList);
+  bibliographicContributors = select(ContributorsSelectors.getBibliographicContributors);
   isContributorsLoading = select(ContributorsSelectors.isBibliographicContributorsLoading);
   hasMoreContributors = select(ContributorsSelectors.hasMoreBibliographicContributors);
   cedarRecords = select(MetadataSelectors.getCedarRecords);

src/app/features/preprints/components/preprint-details/general-information/general-information.component.spec.ts

@@ -47,9 +47,7 @@ describe('GeneralInformationComponent', () => {
         ),
       ],
       providers: [
-        MockProvider(ENVIRONMENT, {
-          webUrl: mockWebUrl,
-        }),
+        MockProvider(ENVIRONMENT, { webUrl: mockWebUrl }),
         provideMockStore({
           signals: [
             {
@@ -61,11 +59,15 @@ describe('GeneralInformationComponent', () => {
               value: false,
             },
             {
-              selector: ContributorsSelectors.getContributors,
+              selector: ContributorsSelectors.getBibliographicContributors,
               value: mockContributors,
             },
             {
-              selector: ContributorsSelectors.isContributorsLoading,
+              selector: ContributorsSelectors.isBibliographicContributorsLoading,
+              value: false,
+            },
+            {
+              selector: ContributorsSelectors.hasMoreBibliographicContributors,
               value: false,
             },
             {
@@ -83,26 +85,16 @@ describe('GeneralInformationComponent', () => {
     fixture.componentRef.setInput('preprintProvider', mockPreprintProvider);
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
   it('should return preprint from store', () => {
     const preprint = component.preprint();
     expect(preprint).toBe(mockPreprint);
   });
 
   it('should return contributors from store', () => {
-    const contributors = component.contributors();
+    const contributors = component.bibliographicContributors();
     expect(contributors).toBe(mockContributors);
   });
 
-  it('should filter bibliographic contributors', () => {
-    const bibliographicContributors = component.bibliographicContributors();
-    expect(bibliographicContributors).toHaveLength(1);
-    expect(bibliographicContributors.every((contributor) => contributor.isBibliographic)).toBe(true);
-  });
-
   it('should return affiliated institutions from store', () => {
     const institutions = component.affiliatedInstitutions();
     expect(institutions).toBe(mockInstitutions);

src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts

@@ -69,7 +69,7 @@ export class GeneralInformationComponent implements OnDestroy {
 
   affiliatedInstitutions = select(InstitutionsSelectors.getResourceInstitutions);
 
-  bibliographicContributors = select(ContributorsSelectors.getBibliographicContributorsList);
+  bibliographicContributors = select(ContributorsSelectors.getBibliographicContributors);
   areContributorsLoading = select(ContributorsSelectors.isBibliographicContributorsLoading);
   hasMoreBibliographicContributors = select(ContributorsSelectors.hasMoreBibliographicContributors);
 

src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.spec.ts

@@ -50,11 +50,15 @@ describe('PreprintTombstoneComponent', () => {
               value: false,
             },
             {
-              selector: ContributorsSelectors.getContributors,
+              selector: ContributorsSelectors.getBibliographicContributors,
               value: mockContributors,
             },
             {
-              selector: ContributorsSelectors.isContributorsLoading,
+              selector: ContributorsSelectors.isBibliographicContributorsLoading,
+              value: false,
+            },
+            {
+              selector: ContributorsSelectors.hasMoreBibliographicContributors,
               value: false,
             },
             {
@@ -76,16 +80,6 @@ describe('PreprintTombstoneComponent', () => {
     fixture.componentRef.setInput('preprintProvider', mockProvider);
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('should compute bibliographic contributors', () => {
-    const bibliographicContributors = component.bibliographicContributors();
-    expect(bibliographicContributors).toHaveLength(1);
-    expect(bibliographicContributors[0].isBibliographic).toBe(true);
-  });
-
   it('should compute license from preprint', () => {
     const license = component.license();
     expect(license).toBe(mockPreprint.embeddedLicense);

src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.ts

@@ -69,7 +69,7 @@ export class PreprintTombstoneComponent implements OnDestroy {
   preprint = select(PreprintSelectors.getPreprint);
   isPreprintLoading = select(PreprintSelectors.isPreprintLoading);
 
-  bibliographicContributors = select(ContributorsSelectors.getBibliographicContributorsList);
+  bibliographicContributors = select(ContributorsSelectors.getBibliographicContributors);
   areContributorsLoading = select(ContributorsSelectors.isBibliographicContributorsLoading);
   hasMoreBibliographicContributors = select(ContributorsSelectors.hasMoreBibliographicContributors);
   subjects = select(SubjectsSelectors.getSelectedSubjects);

src/app/features/preprints/components/stepper/review-step/review-step.component.spec.ts

@@ -52,7 +52,9 @@ describe('ReviewStepComponent', () => {
             { selector: PreprintStepperSelectors.isPreprintSubmitting, value: false },
             { selector: PreprintStepperSelectors.getPreprintLicense, value: mockLicense },
             { selector: PreprintStepperSelectors.getPreprintProject, value: mockPreprintProject },
-            { selector: ContributorsSelectors.getContributors, value: mockContributors },
+            { selector: ContributorsSelectors.getBibliographicContributors, value: mockContributors },
+            { selector: ContributorsSelectors.isBibliographicContributorsLoading, value: false },
+            { selector: ContributorsSelectors.hasMoreBibliographicContributors, value: false },
             { selector: SubjectsSelectors.getSelectedSubjects, value: mockSubjects },
             { selector: InstitutionsSelectors.getResourceInstitutions, value: mockInstitutions },
           ],
@@ -68,20 +70,10 @@ describe('ReviewStepComponent', () => {
     fixture.componentRef.setInput('provider', mockProvider);
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
   it('should have required provider input', () => {
     expect(component.provider()).toEqual(mockProvider);
   });
 
-  it('should filter bibliographic contributors', () => {
-    const bibliographicContributors = component.bibliographicContributors();
-    expect(bibliographicContributors).toHaveLength(1);
-    expect(bibliographicContributors.every((c) => c.isBibliographic)).toBe(true);
-  });
-
   it('should create license options record', () => {
     const licenseOptionsRecord = component.licenseOptionsRecord();
     expect(licenseOptionsRecord).toEqual({ copyrightHolders: 'John Doe', year: '2023' });

src/app/features/preprints/components/stepper/review-step/review-step.component.ts

@@ -83,7 +83,7 @@ export class ReviewStepComponent implements OnInit {
   preprintFile = select(PreprintStepperSelectors.getPreprintFile);
   isPreprintSubmitting = select(PreprintStepperSelectors.isPreprintSubmitting);
 
-  bibliographicContributors = select(ContributorsSelectors.getBibliographicContributorsList);
+  bibliographicContributors = select(ContributorsSelectors.getBibliographicContributors);
   areContributorsLoading = select(ContributorsSelectors.isBibliographicContributorsLoading);
   hasMoreBibliographicContributors = select(ContributorsSelectors.hasMoreBibliographicContributors);
   subjects = select(SubjectsSelectors.getSelectedSubjects);

src/app/features/project/overview/project-overview.component.ts

@@ -143,7 +143,7 @@ export class ProjectOverviewComponent implements OnInit {
   isWikiEnabled = select(ProjectOverviewSelectors.isWikiEnabled);
   parentProject = select(ProjectOverviewSelectors.getParentProject);
   isParentProjectLoading = select(ProjectOverviewSelectors.getParentProjectLoading);
-  bibliographicContributors = select(ContributorsSelectors.getBibliographicContributorsList);
+  bibliographicContributors = select(ContributorsSelectors.getBibliographicContributors);
   isBibliographicContributorsLoading = select(ContributorsSelectors.isBibliographicContributorsLoading);
   hasMoreBibliographicContributors = select(ContributorsSelectors.hasMoreBibliographicContributors);
   addonsResourceReference = select(AddonsSelectors.getAddonsResourceReference);

src/app/features/registries/components/registries-metadata-step/registries-contributors/registries-contributors.component.spec.ts

@@ -9,8 +9,8 @@ import { ActivatedRoute } from '@angular/router';
 import { UserSelectors } from '@core/store/user';
 import { ResourceType } from '@osf/shared/enums';
 import { CustomConfirmationService, CustomDialogService, ToastService } from '@osf/shared/services';
-import { ContributorsSelectors } from '@osf/shared/stores';
-import { ContributorsTableComponent } from '@shared/components/contributors';
+import { ContributorsSelectors } from '@osf/shared/stores/contributors/contributors.selectors';
+import { ContributorsTableComponent } from '@shared/components/contributors/contributors-table/contributors-table.component';
 
 import { RegistriesContributorsComponent } from './registries-contributors.component';
 
@@ -77,15 +77,12 @@ describe('RegistriesContributorsComponent', () => {
       deleteContributor: jest.fn().mockReturnValue(of({})),
       bulkUpdateContributors: jest.fn().mockReturnValue(of({})),
       bulkAddContributors: jest.fn().mockReturnValue(of({})),
+      resetContributorsState: jest.fn().mockRejectedValue(of({})),
     } as any;
     Object.defineProperty(component, 'actions', { value: mockActions });
     fixture.detectChanges();
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
   it('should request contributors on init', () => {
     const actions = (component as any).actions;
     expect(actions.getContributors).toHaveBeenCalledWith('draft-1', ResourceType.DraftRegistration);