Merged in task/dspace-cris-2025_02_x/DSC-2730 (pull request DSpace#4093)

Task/dspace cris 2025 02 x/DSC-2730

Approved-by: Francesco Molinaro

Author: Andrea Barbasso

cypress/e2e/admin-search-page.cy.ts

@@ -1,7 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('Admin Search Page', () => {
+describe('Admin Search Page', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/admin/search');

cypress/e2e/admin-workflow-page.cy.ts

@@ -1,7 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('Admin Workflow Page', () => {
+describe('Admin Workflow Page', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/admin/workflow');

cypress/e2e/bulk-access.cy.ts

@@ -1,8 +1,7 @@
 import { testA11y } from 'cypress/support/utils';
 import { Options } from 'cypress-axe';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('Bulk Access', () => {
+describe('Bulk Access', () => {
   beforeEach(() => {
     // Must login as an Admin to see the page
     cy.visit('/access-control/bulk-access');

cypress/e2e/homepage-statistics.cy.ts

@@ -3,8 +3,7 @@ import '../support/commands';
 import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('Site Statistics Page', () => {
+describe('Site Statistics Page', () => {
   it('should load if you click on "Statistics" from homepage', () => {
     cy.visit('/');
     cy.get('#expandable-navbar-section-statistics > [data-test="navbar-section-toggler"]').trigger('keyup', { key: 'Enter' });

cypress/e2e/homepage.cy.ts

@@ -2,7 +2,7 @@ import { testA11y } from 'cypress/support/utils';
 import { Options } from 'cypress-axe';
 
 // TODO: Enable these tests and fix them before the release
-xdescribe('Homepage', () => {
+describe('Homepage', () => {
   beforeEach(() => {
     // All tests start with visiting homepage
     cy.visit('/');

cypress/e2e/item-statistics.cy.ts

@@ -1,8 +1,7 @@
 import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('Item Statistics Page', () => {
+describe('Item Statistics Page', () => {
   const ITEMSTATISTICSPAGE = '/statistics/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
 
   const TOTALVISITSPERMONTHITEMSTATISTICSPAGE = ITEMSTATISTICSPAGE.concat('?reportType=TotalVisitsPerMonth');
@@ -27,7 +26,8 @@ xdescribe('Item Statistics Page', () => {
   it('should contain a "Total visits per month" section', () => {
     cy.visit(ITEMSTATISTICSPAGE);
     // Check just for existence because this table is empty in CI environment as it's historical data
-    cy.get('.'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('_TotalVisitsPerMonth')).should('exist');
+    cy.get('ul.nav > li.nav-item:nth-child(2) > a.nav-link:nth-child(1)').click();
+    cy.get('ds-statistics-chart-wrapper').should('exist');
   });
 
   it('should pass accessibility tests', () => {

cypress/e2e/my-dspace.cy.ts

@@ -1,7 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('My DSpace page', () => {
+describe('My DSpace page', () => {
   it('should display recent submissions and pass accessibility tests', () => {
     cy.visit('/mydspace');
 

cypress/e2e/submission.cy.ts

@@ -2,8 +2,7 @@ import { testA11y } from 'cypress/support/utils';
 //import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID, TEST_ADMIN_USER, TEST_ADMIN_PASSWORD } from 'cypress/support/e2e';
 import { Options } from 'cypress-axe';
 
-// TODO: Enable these tests and fix them before the release
-xdescribe('New Submission page', () => {
+describe('New Submission page', () => {
 
   // NOTE: We already test that new Item submissions can be started from MyDSpace in my-dspace.spec.ts
   it('should create a new submission when using /submit path & pass accessibility', () => {

cypress/support/e2e.ts

@@ -50,6 +50,13 @@ before(() => {
     cy.task('saveRestBaseDomain', baseDomain);
 
   });
+
+  // We might receive uncaught exceptions from external libraries (e.g. it happened before with a broken
+  // version of the addToAny plugin). These should not cause our tests to fail, so we catch them here.
+  Cypress.on('uncaught:exception', (err, runnable) => {
+    // returning false here prevents Cypress from failing the test
+    return false;
+  });
 });
 
 // Runs once before the first test in each "block"

src/app/core/shared/metadata.utils.spec.ts

@@ -54,7 +54,7 @@ const testMethod = (fn, resultKind, mapOrMaps, keyOrKeys, hitHighlights, expecte
   const keys = keyOrKeys instanceof Array ? keyOrKeys : [keyOrKeys];
   describe('and key' + (keys.length === 1 ? (' ' + keys[0]) : ('s ' + JSON.stringify(keys)))
     + ' with ' + (isUndefined(filter) ? 'no filter' : 'filter ' + JSON.stringify(filter)), () => {
-    const result = fn(mapOrMaps, keys, hitHighlights, filter, limit);
+    const result = fn(mapOrMaps, keys, hitHighlights, filter, false, limit);
     let shouldReturn;
     if (resultKind === 'boolean') {
       shouldReturn = expected;
@@ -304,10 +304,9 @@ describe('Metadata', () => {
 
   });
 
-  // TODO: check why limit seems not to be working (it returns 2 elements instead of 1)
-  xdescribe('all method with limit', () => {
+  describe('all method with limit', () => {
     const testAllWithLimit = (mapOrMaps, keyOrKeys, expected, limit) =>
-      testMethod(Metadata.all, 'value', mapOrMaps, keyOrKeys, expected, undefined, limit);
+      testMethod(Metadata.all, 'value', mapOrMaps, keyOrKeys, undefined, expected, undefined, limit);
 
     describe('with multiMap and limit', () => {
       testAllWithLimit(multiMap, 'dc.title', [dcTitle1], 1);