Fix pre-existing test failures across datashare customizations

milanmajchrak · milanmajchrak · commit 2a91ebfd54d1 · 2026-04-08T16:45:36.000+02:00
diff --git a/karma.conf.js b/karma.conf.js
@@ -35,6 +35,8 @@ module.exports = function (config) {
     logLevel: config.LOG_INFO,
     autoWatch: true,
     browsers: ['Chrome'],
+    browserDisconnectTimeout: 60000,
+    browserNoActivityTimeout: 120000,
     singleRun: false,
     restartOnFileChange: true
   });
diff --git a/src/app/datashare/datashare-submission.service.spec.ts b/src/app/datashare/datashare-submission.service.spec.ts
@@ -1,12 +1,20 @@
 import { TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
 
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
 import { DatashareSubmissionService } from './datashare-submission.service';
 
 describe('DatashareSubmissionService', () => {
   let service: DatashareSubmissionService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      providers: [
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+      ],
+    });
     service = TestBed.inject(DatashareSubmissionService);
   });
 
diff --git a/src/app/datashare/download-link.service.spec.ts b/src/app/datashare/download-link.service.spec.ts
@@ -1,3 +1,4 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
 import { DownloadLinkService } from './download-link.service';
@@ -6,7 +7,9 @@ describe('DownloadLinkService', () => {
   let service: DownloadLinkService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
+    TestBed.configureTestingModule({
+      imports: [HttpClientTestingModule],
+    });
     service = TestBed.inject(DownloadLinkService);
   });
 
diff --git a/src/app/info/about/about.component.spec.ts b/src/app/info/about/about.component.spec.ts
@@ -14,8 +14,7 @@ describe('AboutComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [AboutComponent],
+      imports: [TranslateModule.forRoot(), AboutComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
diff --git a/src/app/info/copyright/copyright.component.spec.ts b/src/app/info/copyright/copyright.component.spec.ts
@@ -14,8 +14,7 @@ describe('CopyrightComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [CopyrightComponent],
+      imports: [TranslateModule.forRoot(), CopyrightComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
diff --git a/src/app/info/organised/organised.component.spec.ts b/src/app/info/organised/organised.component.spec.ts
@@ -14,8 +14,7 @@ describe('OrganisedComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
-      declarations: [OrganisedComponent],
+      imports: [TranslateModule.forRoot(), OrganisedComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
@@ -27,11 +27,11 @@ let fixture: ComponentFixture<MetadataUriValuesComponent>;
 const mockMetadata = [
   {
     language: 'en_US',
-    value: 'http://fakelink.org',
+    value: 'https://doi.org/10.1234/fakelink',
   },
   {
     language: 'en_US',
-    value: 'http://another.fakelink.org',
+    value: 'https://doi.org/10.5678/another-fakelink',
   },
 ] as MetadataValue[];
 const mockSeperator = '<br/>';
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
@@ -169,7 +169,8 @@ describe('FileSectionComponent', () => {
       });
       it('should contain another bitstream', () => {
         const fileDownloadLink = fixture.debugElement.queryAll(By.css('ds-file-download-link'));
-        expect(fileDownloadLink.length).toEqual(2);
+        // DATASHARE: getNextPage() fetches both ORIGINAL and CC-LICENSE bundles
+        expect(fileDownloadLink.length).toEqual(3);
       });
     });
   });
diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
@@ -28,7 +28,7 @@ import { ItemPageDateFieldComponent } from './item-page-date-field.component';
 let comp: ItemPageDateFieldComponent;
 let fixture: ComponentFixture<ItemPageDateFieldComponent>;
 
-const mockField = 'dc.date.issued';
+const mockField = 'dc.date.available';
 const mockValue = 'test value';
 
 describe('ItemPageDateFieldComponent', () => {
diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
@@ -27,7 +27,7 @@ let comp: ItemPageUriFieldComponent;
 let fixture: ComponentFixture<ItemPageUriFieldComponent>;
 
 const mockField = 'dc.identifier.uri';
-const mockValue = 'test value';
+const mockValue = 'https://doi.org/10.1234/test';
 const mockLabel = 'test label';
 
 describe('ItemPageUriFieldComponent', () => {
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts
@@ -60,7 +60,7 @@ describe('DsoEditMenuExpandableSectionComponent', () => {
   });
 
   it('should show a button with the icon', () => {
-    const button = fixture.debugElement.query(By.css('.btn-dark'));
+    const button = fixture.debugElement.query(By.css('.btn-secondary'));
     expect(button.nativeElement.innerHTML).toContain('fa-' + iconString);
   });
 });
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
@@ -105,7 +105,7 @@ describe('DsoEditMenuSectionComponent', () => {
     });
 
     it('should show a button with the icon', () => {
-      const button = fixture.debugElement.query(By.css('.btn-dark'));
+      const button = fixture.debugElement.query(By.css('.btn-secondary'));
       expect(button.nativeElement.innerHTML).toContain('fa-' + iconString);
     });
 
@@ -130,7 +130,7 @@ describe('DsoEditMenuSectionComponent', () => {
       it('should call the activate method when clicking the button', () => {
         spyOn(component, 'activate');
 
-        const button = fixture.debugElement.query(By.css('.btn-dark'));
+        const button = fixture.debugElement.query(By.css('.btn-secondary'));
         button.triggerEventHandler('click', null);
 
         expect(component.activate).toHaveBeenCalled();
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -2,6 +2,7 @@ import {
   ChangeDetectorRef,
   Component,
   CUSTOM_ELEMENTS_SCHEMA,
+  signal,
   SimpleChange,
 } from '@angular/core';
 import {
@@ -25,6 +26,7 @@ import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
+import { DatashareSubmissionService } from '../../../datashare/datashare-submission.service';
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { mockSubmissionId } from '../../../shared/mocks/submission.mock';
 import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub';
@@ -37,6 +39,10 @@ const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub()
 
 const submissionId = mockSubmissionId;
 
+const mockDatashareSubmissionService = {
+  hasUploadFilesErrorsSignal: signal(true),
+};
+
 describe('SubmissionFormFooterComponent', () => {
 
   let comp: SubmissionFormFooterComponent;
@@ -57,6 +63,7 @@ describe('SubmissionFormFooterComponent', () => {
       providers: [
         { provide: SubmissionService, useValue: submissionServiceStub },
         { provide: SubmissionRestService, useClass: SubmissionRestServiceStub },
+        { provide: DatashareSubmissionService, useValue: mockDatashareSubmissionService },
         ChangeDetectorRef,
         NgbModal,
         SubmissionFormFooterComponent,
diff --git a/src/app/submission/sections/container/section-container.component.spec.ts b/src/app/submission/sections/container/section-container.component.spec.ts
@@ -2,6 +2,7 @@
 import {
   Component,
   CUSTOM_ELEMENTS_SCHEMA,
+  signal,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -14,6 +15,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
+import { DatashareSubmissionFormSectionContainerService } from '../../../datashare/datashare-submission-form-section-container.service';
 import {
   mockSubmissionCollectionId,
   mockSubmissionId,
@@ -86,6 +88,11 @@ describe('SubmissionSectionContainerComponent test suite', () => {
       providers: [
         { provide: SectionsService, useValue: sectionsServiceStub },
         { provide: SubmissionService, useValue: submissionServiceStub },
+        { provide: DatashareSubmissionFormSectionContainerService, useValue: {
+          openPanelId: signal('traditionalpageone'),
+          sectionPanelIds: signal([]),
+          setOpenPanelId: jasmine.createSpy('setOpenPanelId'),
+        }},
         SubmissionSectionContainerComponent,
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts
@@ -3,6 +3,7 @@ import {
   ChangeDetectorRef,
   Component,
   NO_ERRORS_SCHEMA,
+  signal,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -51,6 +52,18 @@ import { SectionsService } from '../sections.service';
 import { SectionsType } from '../sections-type';
 import { SubmissionSectionUploadComponent } from './section-upload.component';
 import { SectionUploadService } from './section-upload.service';
+import { DatashareSubmissionService } from '../../../datashare/datashare-submission.service';
+
+const mockDatashareSubmissionService = {
+  hasUploadFilesErrorsSignal: signal(false),
+  updatehasUploadFilesErrors: jasmine.createSpy('updatehasUploadFilesErrors'),
+  calculateTotalUploadedFilesSize: jasmine.createSpy('calculateTotalUploadedFilesSize').and.returnValue(0),
+  isTotalUploadedFilesSizeExceeded: jasmine.createSpy('isTotalUploadedFilesSizeExceeded').and.returnValue(false),
+  formatBytes: jasmine.createSpy('formatBytes').and.returnValue('0 Bytes'),
+  getDuplicateFileNames: jasmine.createSpy('getDuplicateFileNames').and.returnValue([]),
+  createDuplicateFileNameDetector: jasmine.createSpy('createDuplicateFileNameDetector').and.returnValue({ detect: jasmine.createSpy('detect') }),
+  sendCannotSubmitNotification: jasmine.createSpy('sendCannotSubmitNotification'),
+};
 
 function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SubmissionUploadsConfigService', {
@@ -190,6 +203,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
         { provide: SectionsService, useClass: SectionsServiceStub },
         { provide: SubmissionService, useValue: submissionServiceStub },
         { provide: SectionUploadService, useValue: bitstreamService },
+        { provide: DatashareSubmissionService, useValue: mockDatashareSubmissionService },
         { provide: 'sectionDataProvider', useValue: sectionObject },
         { provide: 'submissionIdProvider', useValue: submissionId },
         { provide: ThemeService, useValue: getMockThemeService() },
diff --git a/src/themes/datashare/app/datashare/deposit-button/deposit-button.component.spec.ts b/src/themes/datashare/app/datashare/deposit-button/deposit-button.component.spec.ts
@@ -2,16 +2,29 @@ import {
   ComponentFixture,
   TestBed,
 } from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { of as observableOf } from 'rxjs';
 
+import { AuthorizationDataService } from '../../../../../app/core/data/feature-authorization/authorization-data.service';
 import { DepositButtonComponent } from './deposit-button.component';
 
 describe('DepositButtonComponent', () => {
   let component: DepositButtonComponent;
   let fixture: ComponentFixture<DepositButtonComponent>;
 
+  const mockAuthorizationService = {
+    isAuthorized: () => observableOf(true),
+  };
+
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports: [DepositButtonComponent],
+      providers: [
+        { provide: AuthorizationDataService, useValue: mockAuthorizationService },
+        { provide: NgbModal, useValue: {} },
+        { provide: Router, useValue: { navigate: () => {} } },
+      ],
     })
       .compileComponents();
 

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ let fixture: ComponentFixture<MetadataUriValuesComponent>;`
`27`	`27`	`const mockMetadata = [`
`28`	`28`	`{`
`29`	`29`	`language: 'en_US',`
`30`		`- value: 'http://fakelink.org',`
	`30`	`+ value: 'https://doi.org/10.1234/fakelink',`
`31`	`31`	`},`
`32`	`32`	`{`
`33`	`33`	`language: 'en_US',`
`34`		`- value: 'http://another.fakelink.org',`
	`34`	`+ value: 'https://doi.org/10.5678/another-fakelink',`
`35`	`35`	`},`
`36`	`36`	`] as MetadataValue[];`
`37`	`37`	`const mockSeperator = '<br/>';`