Update cypress tests

Author: GilbertCherrie

cypress/e2e/ui/settings.cy.js

@@ -10,7 +10,7 @@ describe('Settings > My Settings', () => {
       expect(value[0].value).to.be.oneOf(['', 'Overview / Dashboard']);
     });
     cy.changeSelect('display\\.startpage', 'Overview / Utilization');
-    cy.intercept('PATCH', '/api/users/1').as('settingsUpdate');
+    cy.intercept('PATCH', '/api/users/*').as('settingsUpdate');
     cy.contains('button', 'Save').click();
     cy.wait('@settingsUpdate').its('response.statusCode').should('eq', 200);
 
@@ -25,7 +25,7 @@ describe('Settings > My Settings', () => {
       expect(value[0].value).to.equal('Overview / Utilization');
     });
     cy.changeSelect('display\\.startpage', 'Overview / Dashboard');
-    cy.intercept('PATCH', '/api/users/1').as('settingsUpdate');
+    cy.intercept('PATCH', '/api/users/*').as('settingsUpdate');
     cy.contains('button', 'Save').click();
     cy.wait('@settingsUpdate').its('response.statusCode').should('eq', 200);
 

cypress/support/commands/select.js

@@ -3,14 +3,27 @@
 // selectId: String of the ID of the select element to interact with.
 // optionToSelect: String of the option to select from the dropdown.
 Cypress.Commands.add('changeSelect', (selectId, optionToSelect) => {
-  cy.get(`#${selectId}`).click();
-  cy.get('.bx--list-box__menu-item__option').then((options) => {
-    const optionArray = Cypress.$.makeArray(options);
-    const match = optionArray.find((el) => el.innerText.trim() === optionToSelect);
-    if (match) {
-      cy.wrap(match).click();
-    } else {
-      throw new Error('No match');
-    }
+  // First, get the select element and store its text
+  let selectElementText = '';
+  cy.get(`#${selectId}`).then((selectElement) => {
+    // Get the currently displayed text in the select element
+    selectElementText = selectElement.text().trim();
+    // Click to open the dropdown
+    cy.wrap(selectElement).click();
+  }).then(() => {
+    // Now find the options and try to select the requested one
+    cy.get('.bx--list-box__menu-item__option').then((options) => {
+      const optionArray = Cypress.$.makeArray(options);
+      const match = optionArray.find((el) => el.innerText.trim() === optionToSelect);
+
+      if (match) {
+        cy.wrap(match).click();
+      } else {
+        // Include both the requested option and the select element's text in the error
+        cy.logAndThrowError(
+          `Could not find "${optionToSelect}" in select element with text "${selectElementText}"`
+        );
+      }
+    });
   });
 });