VSB-TUO/e2e tests fix (#1015)

* Highlight actual option in dropdown menu

* Removed discojuice from test

* Removed forgotten commit

* Removed discojuice from tombstone

* Updated system wide alert test

* Implemented suggested changes from copilot in order to pass e2e

---------

Co-authored-by: Matus Kasak <matus.kasak@dataquest.sk>

Author: Kasinhou

cypress/e2e/system-wide-alert.cy.ts

@@ -1,16 +1,19 @@
+/// <reference types="cypress" />
 import { testA11y } from 'cypress/support/utils';
 
 describe('System Wide Alert', () => {
   beforeEach(() => {
-    // Must login as an Admin to see the page
-    cy.visit('/admin/system-wide-alert');
+    // Login first to ensure access to admin routes, then visit the target page
+    cy.visit('/login');
     cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
+    cy.visit('/admin/system-wide-alert');
   });
 
   it('should pass accessibility tests', () => {
-    // Page must first be visible
-    cy.get('ds-system-wide-alert-form').should('be.visible');
-    // Analyze <ds-system-wide-alert-form> for accessibility issues
-    testA11y('ds-system-wide-alert-form');
+    // Ensure the page component is present and visible
+    cy.get('ds-system-wide-alert-form').should('be.visible').then(($el) => {
+      // Analyze <ds-system-wide-alert-form> for accessibility issues
+      testA11y($el);
+    });
   });
 });

cypress/e2e/tombstone.cy.ts

@@ -61,9 +61,7 @@ const TOMBSTONED_ITEM_MESSAGE = 'This item has been withdrawn';
 describe('Admin Tombstone  Page', () => {
   beforeEach(() => {
     cy.visit('/login');
-    // Cancel discojuice login - only if it is popped up
     cy.wait(500);
-    cy.get('.discojuice_close').should('exist').click();
     // Login as admin
     cy.loginViaForm(TEST_ADMIN_USER, TEST_ADMIN_PASSWORD);
     cy.visit('/');

cypress/support/commands.ts

@@ -98,9 +98,7 @@ function loginViaForm(
   email: string,
   password: string
 ): void {
-  // Optionally close the DiscoJuice popup if present
   cy.wait(500);
-  cy.get('.discojuice_close').should('exist').click();
 
   // Fill in credentials
   cy.get('[data-test="email"]').should('be.visible').type(email);

cypress/support/utils.ts

@@ -40,5 +40,35 @@ export const testA11y = (context?: any, options?: Options) => {
             { id: 'color-contrast', enabled: false },
         ]
     });
-    cy.checkA11y(context, options, terminalLog);
+
+    // If a selector string was provided, ensure it exists and is visible first
+    if (typeof context === 'string') {
+        cy.get(context, { timeout: 15000 }).should('be.visible');
+        cy.checkA11y(context, options, terminalLog);
+        return;
+    }
+
+    // If a concrete element/JQuery is provided, ensure it exists first
+    if (context) {
+        cy.wrap(context).should('exist').then(($el) => {
+            const node = ($el && ($el as any).get) ? ($el as any).get(0) : $el;
+            cy.checkA11y(node as any, options, terminalLog);
+        });
+        return;
+    }
+
+    // Fallback: run against the whole page after ensuring body is visible
+    cy.get('body', { timeout: 15000 }).should('be.visible');
+    cy.checkA11y(undefined, options, terminalLog);
+};
+
+// Optional helper: only run a11y if selector exists in the page (useful for empty tabs/pages)
+export const testA11yIfExists = (selector: string, options?: Options) => {
+    cy.get('body').then(($body) => {
+        if ($body.find(selector).length > 0) {
+            testA11y(selector, options);
+        } else {
+            cy.task('log', `Skipping a11y: no content for selector "${selector}"`);
+        }
+    });
 };