Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/DSC-2281

Author: atarix83

config/config.example.yml

@@ -132,6 +132,8 @@ auth:
     # If the rest token expires in less than this amount of time, it will be refreshed automatically.
     # This is independent from the idle warning.
     timeLeftBeforeTokenRefresh: 120000 # 2 minutes
+  # Standard login enabled
+  isPasswordLoginEnabledForAdminsOnly: false
 
 # Form settings
 form:

cypress.config.ts

@@ -18,25 +18,25 @@ export default defineConfig({
     // (This is the data set used in our CI environment)
 
     // Admin account used for administrative tests
-    DSPACE_TEST_ADMIN_USER: 'dspacedemo+admin@gmail.com',
+    DSPACE_TEST_ADMIN_USER: 'admin@admin.com',
     DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda',
-    DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
+    DSPACE_TEST_ADMIN_PASSWORD: 'admin',
     // Community/collection/publication used for view/edit tests
-    DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
-    DSPACE_TEST_COLLECTION: '282164f5-d325-4740-8dd1-fa4d6d3e7200',
-    DSPACE_TEST_ENTITY_PUBLICATION: '6160810f-1e53-40db-81ef-f6621a727398',
+    DSPACE_TEST_COMMUNITY: 'a30b75e4-1682-4b4d-85fd-a47fc78dbcf6',
+    DSPACE_TEST_COLLECTION: 'caf04bfa-b2f6-40d3-90d2-aa0b86d92f8d',
+    DSPACE_TEST_ENTITY_PUBLICATION: '9d1efbce-4d55-446c-ac70-0ba8998d04d2',
     // Search term (should return results) used in search tests
     DSPACE_TEST_SEARCH_TERM: 'test',
     // Main Collection used for submission tests. Should be able to accept normal Item objects
-    DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Sample Collection',
-    DSPACE_TEST_SUBMIT_COLLECTION_UUID: '9d8334e9-25d3-4a67-9cea-3dffdef80144',
+    DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Equipments',
+    DSPACE_TEST_SUBMIT_COLLECTION_UUID: 'c1da6a21-451f-430d-ad28-0f16e5b38fa0',
     // Collection used for Person entity submission tests. MUST be configured with EntityType=Person.
-    DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People',
+    DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'Persons',
     // Account used to test basic submission process
-    DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
-    DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
+    DSPACE_TEST_SUBMIT_USER: 'admin@admin.com',
+    DSPACE_TEST_SUBMIT_USER_PASSWORD: 'admin',
     // Administrator users group
-    DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'
+    DSPACE_ADMINISTRATOR_GROUP: 'f8c90336-34c1-4ad6-ab63-ba4b9357f087'
   },
   e2e: {
     // Setup our plugins for e2e tests

cypress/e2e/admin-export-modals.cy.ts

@@ -16,10 +16,10 @@ describe('Admin Export Modals', () => {
     cy.get('#admin-menu-section-export-title').should('be.visible');
     cy.get('#admin-menu-section-export-title').click();
 
-    cy.get('a[data-test="menu.section.export_metadata"]').click();
+    cy.get('a[data-test="menu.section.export_metadata_csv"]').click();
 
     // Analyze <ds-export-metadata-selector> for accessibility
-    testA11y('ds-export-metadata-selector');
+    testA11y('ds-export-metadata-csv-selector');
   });
 
   it('Export batch modal should pass accessibility tests', () => {
@@ -34,6 +34,6 @@ describe('Admin Export Modals', () => {
     cy.get('a[data-test="menu.section.export_batch"]').click();
 
     // Analyze <ds-export-batch-selector> for accessibility
-    testA11y('ds-export-metadata-selector');
+    testA11y('ds-export-metadata-csv-selector');
   });
 });

cypress/e2e/breadcrumbs.cy.ts

@@ -1,7 +1,7 @@
 import { testA11y } from 'cypress/support/utils';
 import { Options } from 'cypress-axe';
 
-xdescribe('Breadcrumbs', () => {
+describe('Breadcrumbs', () => {
     it('should pass accessibility tests', () => {
         // Visit an Item, as those have more breadcrumbs
         cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));

cypress/e2e/collection-statistics.cy.ts

@@ -1,7 +1,7 @@
 import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
-xdescribe('Collection Statistics Page', () => {
+describe('Collection Statistics Page', () => {
     const COLLECTIONSTATISTICSPAGE = '/statistics/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION'));
 
     it('should load if you click on "Statistics" from a Collection page', () => {

cypress/e2e/community-statistics.cy.ts

@@ -1,7 +1,7 @@
 import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
-xdescribe('Community Statistics Page', () => {
+describe('Community Statistics Page', () => {
     const COMMUNITYSTATISTICSPAGE = '/statistics/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY'));
 
     it('should load if you click on "Statistics" from a Community page', () => {

cypress/e2e/footer.cy.ts

@@ -1,7 +1,7 @@
 import { testA11y } from 'cypress/support/utils';
 import { Options } from 'cypress-axe';
 
-xdescribe('Footer', () => {
+describe('Footer', () => {
     it('should pass accessibility tests', () => {
         cy.visit('/');
 

cypress/e2e/homepage-statistics.cy.ts

@@ -2,10 +2,13 @@ import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 import '../support/commands';
 
-xdescribe('Site Statistics Page', () => {
+describe('Site Statistics Page', () => {
     it('should load if you click on "Statistics" from homepage', () => {
         cy.visit('/');
-        cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click();
+
+        cy.get('#expandable-navbar-section-statistics > [data-test="navbar-section-toggler"]').trigger('keyup', { key: 'Enter' });
+
+        cy.get('a[data-test="link-menu-item.menu.section.statistics.site"]').click();
         cy.location('pathname').should('eq', '/statistics');
     });
 
@@ -19,13 +22,23 @@ xdescribe('Site Statistics Page', () => {
         // <ds-site-statistics-page> tag must be visable
         cy.get('ds-site-statistics-page').should('be.visible');
 
-        // Verify / wait until "Total Visits" table's *last* label is non-empty
+        // Click on "Most viewed" tab
+        cy.get('ds-statistics-chart li.nav-item').eq(2).click();
+
+        // Verify / wait until "Most Viewed" table's *last* label is non-empty
         // (This table loads these labels asynchronously, so we want to wait for them before analyzing page)
-        cy.get('table[data-test="TotalVisits"] th[data-test="statistics-label"]').last().contains(REGEX_MATCH_NON_EMPTY_TEXT);
-        // Wait an extra 500ms, just so all entries in Total Visits have loaded.
+        cy.get('table[data-test="TopItems"] th[data-test="statistics-label"]').last().contains(REGEX_MATCH_NON_EMPTY_TEXT);
+        // Wait an extra 500ms, just so all entries in Most Viewed have loaded.
         cy.wait(500);
 
         // Analyze <ds-site-statistics-page> for accessibility issues
-        testA11y('ds-site-statistics-page');
+        testA11y({
+          include: [
+            'ds-site-statistics-page',
+          ],
+          exclude: [
+            ['ul.nav-tabs'] // Tabs at top have several issues which seem to be caused by ng-bootstrap
+          ],
+        });
     });
 });

cypress/e2e/item-page.cy.ts

@@ -1,6 +1,6 @@
 import { testA11y } from 'cypress/support/utils';
 
-xdescribe('Item  Page', () => {
+describe('Item  Page', () => {
     const ITEMPAGE = '/items/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
     const ENTITYPAGE = '/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
 

cypress/e2e/item-statistics.cy.ts

@@ -1,12 +1,14 @@
 import { REGEX_MATCH_NON_EMPTY_TEXT } from 'cypress/support/e2e';
 import { testA11y } from 'cypress/support/utils';
 
-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');
+
     it('should load if you click on "Statistics" from an Item/Entity page', () => {
         cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
-        cy.get('a[data-test="link-menu-item.menu.section.statistics"]').click();
+        cy.get('button[data-test="statisticsButton"]').click();
         cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
     });
 
@@ -21,11 +23,6 @@ xdescribe('Item Statistics Page', () => {
         cy.get('table[data-test="TotalVisits"]').should('be.visible');
     });
 
-    it('should contain a "Total visits per month" section', () => {
-        cy.visit(ITEMSTATISTICSPAGE);
-        cy.get('table[data-test="TotalVisitsPerMonth"]').should('be.visible');
-    });
-
     it('should pass accessibility tests', () => {
         cy.visit(ITEMSTATISTICSPAGE);