Enhance form element selectors

cypress/README.md

@@ -70,10 +70,10 @@ ManageIQ implements the following cypress extensions:
 
 ##### element_selectors
 
-* `cy.getFormFooterButtonByType(name, type)` - retrieves form footer button by its name and type. `name` is the name or text content of the button. `type` is the HTML button type (e.g., 'button', 'submit', 'reset'). Defaults to 'button'. e.g. `cy.getFormFooterButtonByType('Save');`, `cy.getFormFooterButtonByType('Reset', 'reset');`
-* `cy.getFormInputFieldById(inputId, type)` - retrieves a form input field by its ID and type. `inputId` is the ID of the input field. `type` is the HTML input type (e.g., 'text', 'email', 'password'). Defaults to 'text'. e.g. `cy.getFormInputFieldById('name');`, `cy.getFormInputFieldById('name', 'text');`
-* `getFormLabelByInputId(inputId)` - retrieves a form label associated with a specific input field by its ID. `inputId` is the ID of the input field. e.g. `cy.getFormLabelByInputId('name');`
-* `cy.getFormSelectFieldById(selectId)` - retrieves a form select field by its ID. `selectId` is the ID of the select field. e.g. `cy.getFormSelectFieldById('select-scan-limit');`
+* `cy.getFormFooterButtonByTypeWithText({ buttonType, buttonText })` - retrieves form footer button by its name and type. `buttonText` is the name or text content of the button. `buttonType` is the HTML button type (e.g., 'button', 'submit', 'reset'). Defaults to 'button'. e.g. `cy.getFormFooterButtonByType({buttonType: 'Reset', buttonText: 'reset'});`, `cy.getFormFooterButtonByTypeWithText({buttonText: 'Cancel'});`
+* `cy.getFormInputFieldByIdAndType({ inputId, inputType })` - retrieves a form input field by its ID and type. `inputId` is the ID of the input field. `inputType` is the HTML input type (e.g., 'text', 'email', 'password'). Defaults to 'text'. e.g. `cy.getFormInputFieldByIdAndType({inputId: 'name'});`, `cy.getFormInputFieldByIdAndType({inputId: 'name', inputType: 'text'});`
+* `cy.getFormLabelByForAttribute({ forValue })` - retrieves a form label associated with a specific input field by its 'for' attribute. `forValue` is the value of the 'for' attribute that matches the input field's ID. e.g. `cy.getFormLabelByForAttribute({forValue: 'name'});`
+* `cy.getFormSelectFieldById({ selectId })` - retrieves a form select field by its ID. `selectId` is the ID of the select field. e.g. `cy.getFormSelectFieldById({selectId: 'select-scan-limit'});`
 
 #### Assertions
 

cypress/e2e/ui/Settings/Application-Settings/edit_collect_logs.cy.js

@@ -71,16 +71,21 @@ function resetProtocolDropdown({ selectServerListItem = true } = {}) {
   selectToolbarEditButton();
 
   // Resetting Protocol dropdown value
-  cy.getFormSelectFieldById('log_protocol').then((selectField) => {
-    const currentValue = selectField.val();
-    // If the value is not default one(BLANK_VALUE), then setting it to blank
-    if (currentValue !== DROPDOWN_BLANK_VALUE) {
-      cy.wrap(selectField).select(DROPDOWN_BLANK_VALUE);
-      cy.getFormFooterButtonByType(SAVE_BUTTON_TEXT, 'submit').click();
-      // Validating confirmation flash message
-      cy.expect_flash(flashClassMap.success, FLASH_MESSAGE_SETTINGS_SAVED);
+  cy.getFormSelectFieldById({ selectId: 'log_protocol' }).then(
+    (selectField) => {
+      const currentValue = selectField.val();
+      // If the value is not default one(BLANK_VALUE), then setting it to blank
+      if (currentValue !== DROPDOWN_BLANK_VALUE) {
+        cy.wrap(selectField).select(DROPDOWN_BLANK_VALUE);
+        cy.getFormFooterButtonByTypeWithText({
+          buttonText: SAVE_BUTTON_TEXT,
+          buttonType: 'submit',
+        }).click();
+        // Validating confirmation flash message
+        cy.expect_flash(flashClassMap.success, FLASH_MESSAGE_SETTINGS_SAVED);
+      }
     }
-  });
+  );
 }
 
 function goToCollectLogsTabAndOpenEditForm() {
@@ -98,49 +103,71 @@ function validateFormElements() {
     'be.visible'
   );
   // Assert protocol field label is visible
-  cy.getFormLabelByInputId('log_protocol').should('be.visible');
+  cy.getFormLabelByForAttribute({ forValue: 'log_protocol' }).should(
+    'be.visible'
+  );
   // Assert protocol field is visible and enabled
-  cy.getFormSelectFieldById('log_protocol')
+  cy.getFormSelectFieldById({ selectId: 'log_protocol' })
     .should('be.visible')
     .and('be.enabled');
   // Assert cancel button is visible and enabled
-  cy.getFormFooterButtonByType(CANCEL_BUTTON_TEXT)
+  cy.getFormFooterButtonByTypeWithText({
+    buttonText: CANCEL_BUTTON_TEXT,
+  })
     .should('be.visible')
     .and('be.enabled');
   // Assert save button is visible and disabled
-  cy.getFormFooterButtonByType(SAVE_BUTTON_TEXT, 'submit')
+  cy.getFormFooterButtonByTypeWithText({
+    buttonText: SAVE_BUTTON_TEXT,
+    buttonType: 'submit',
+  })
     .should('be.visible')
     .and('be.disabled');
   // Assert reset button is visible and disabled
-  cy.getFormFooterButtonByType(RESET_BUTTON_TEXT)
+  cy.getFormFooterButtonByTypeWithText({
+    buttonText: RESET_BUTTON_TEXT,
+  })
     .should('be.visible')
     .and('be.disabled');
 }
 
 function cancelButtonValidation() {
   // Click cancel button in the form
-  cy.getFormFooterButtonByType(CANCEL_BUTTON_TEXT).click();
+  cy.getFormFooterButtonByTypeWithText({
+    buttonText: CANCEL_BUTTON_TEXT,
+  }).click();
   // Validating confirmation flash message
   cy.expect_flash(flashClassMap.success, FLASH_MESSAGE_OPERATION_CANCELLED);
 }
 
 function resetButtonValidation() {
   // Selecting Samba option from dropdown
-  cy.getFormSelectFieldById('log_protocol').select(SAMBA_DROPDOWN_VALUE);
+  cy.getFormSelectFieldById({ selectId: 'log_protocol' }).select(
+    SAMBA_DROPDOWN_VALUE
+  );
   // Confirm Reset button is enabled once dropdown value is changed and then click on Reset
-  cy.getFormFooterButtonByType(RESET_BUTTON_TEXT).should('be.enabled').click();
+  cy.getFormFooterButtonByTypeWithText({
+    buttonText: RESET_BUTTON_TEXT,
+  })
+    .should('be.enabled')
+    .click();
   // Confirm dropdown has the old value
-  cy.getFormSelectFieldById('log_protocol').should(
+  cy.getFormSelectFieldById({ selectId: 'log_protocol' }).should(
     'have.value',
     DROPDOWN_BLANK_VALUE
   );
 }
 
 function saveButtonValidation() {
   // Selecting Samba option from dropdown
-  cy.getFormSelectFieldById('log_protocol').select(SAMBA_DROPDOWN_VALUE);
+  cy.getFormSelectFieldById({ selectId: 'log_protocol' }).select(
+    SAMBA_DROPDOWN_VALUE
+  );
   // Confirm Save button is enabled once dropdown value is changed and then click on Save
-  cy.getFormFooterButtonByType(SAVE_BUTTON_TEXT, 'submit')
+  cy.getFormFooterButtonByTypeWithText({
+    buttonText: SAVE_BUTTON_TEXT,
+    buttonType: 'submit',
+  })
     .should('be.enabled')
     .click();
   // Validating confirmation flash message

cypress/e2e/ui/Settings/Application-Settings/settings_access_control.cy.js

@@ -31,9 +31,16 @@ describe('Settings > Application Settings > Access Control', () => {
     ]);
 
     cy.toolbar(TOOLBAR_MENU, 'Add child Tenant to this Tenant');
-    cy.getFormInputFieldById('name').type(INITIAL_TENANT_NAME);
-    cy.getFormInputFieldById('description').type(INITIAL_TENANT_DESCRIPTION);
-    cy.getFormFooterButtonByType('Add', 'submit').click();
+    cy.getFormInputFieldByIdAndType({ inputId: 'name' }).type(
+      INITIAL_TENANT_NAME
+    );
+    cy.getFormInputFieldByIdAndType({ inputId: 'description' }).type(
+      INITIAL_TENANT_DESCRIPTION
+    );
+    cy.getFormFooterButtonByTypeWithText({
+      buttonText: 'Add',
+      buttonType: 'submit',
+    }).click();
     cy.expect_flash(flashClassMap.success, FLASH_MESSAGE_OPERATION_ADDED);
     cy.selectAccordionItem([
        /^ManageIQ Region/,

cypress/support/commands/element_selectors.js

@@ -1,57 +1,86 @@
-/* eslint-disable no-undef */
-
 /**
- * Retrieves a form footer button by its name and type.
+ * Retrieves a form footer button by its text content and type using an object parameter.
  *
- * @param {string} name - The name or text content of the button.
- * @param {string} [type='button'] - The HTML button type (e.g., 'button', 'submit', 'reset'). Defaults to 'button'.
+ * @param {Object} options - The options object.
+ * @param {string} options.buttonText - The text content of the button (required).
+ * @param {string} [options.buttonType='button'] - The HTML button type (e.g., 'button', 'submit', 'reset'). Defaults to 'button'.
  * @returns {Element} The matched button element.
+ * @throws {Error} If buttonName is not provided.
  *
  * Example:
- *   cy.getFormFooterButtonByType('Save Changes');
- *   cy.getFormFooterButtonByType('Reset', 'reset');
+ *   cy.getFormFooterButtonByTypeWithText({ buttonText: 'Save Changes' });
+ *   cy.getFormFooterButtonByTypeWithText({ buttonText: 'Submit', buttonType: 'submit' });
  */
-Cypress.Commands.add('getFormFooterButtonByType', (name, type = 'button') =>
-  cy.contains(`#main-content .bx--btn-set button[type="${type}"]`, name)
+Cypress.Commands.add(
+  'getFormFooterButtonByTypeWithText',
+  ({ buttonType = 'button', buttonText } = {}) => {
+    if (buttonText) {
+      return cy.contains(
+        `#main-content .bx--btn-set button[type="${buttonType}"]`,
+        buttonText
+      );
+    }
+    cy.logAndThrowError('buttonName is required');
+  }
 );
 
 /**
- * Retrieves a form input field by its ID and type.
+ * Retrieves a form input field by its ID and type using an object parameter.
  *
- * @param {string} inputId - The ID of the input field.
- * @param {string} [type='text'] - The HTML input type (e.g., 'text', 'email', 'password'). Defaults to 'text'.
+ * @param {Object} options - The options object.
+ * @param {string} options.inputId - The ID of the input field (required).
+ * @param {string} [options.inputType='text'] - The HTML input inputType (e.g., 'text', 'email', 'password'). Defaults to 'text'.
  * @returns {Element} The matched input field element.
+ * @throws {Error} If inputId is not provided.
  *
  * Example:
- *   cy.getFormInputFieldById('name');
- *   cy.getFormInputFieldById('name', 'text');
+ *   cy.getFormInputFieldByIdAndType({ inputId: 'name' });
+ *   cy.getFormInputFieldByIdAndType({ inputId: 'email', inputType: 'email' });
  */
-Cypress.Commands.add('getFormInputFieldById', (inputId, type = 'text') =>
-  cy.get(`#main-content .bx--form input#${inputId}[type="${type}"]`)
+Cypress.Commands.add(
+  'getFormInputFieldByIdAndType',
+  ({ inputId, inputType = 'text' }) => {
+    if (inputId) {
+      return cy.get(
+        `#main-content .bx--form input#${inputId}[type="${inputType}"]`
+      );
+    }
+    cy.logAndThrowError('inputId is required');
+  }
 );
 
 /**
- * Retrieves a form label associated with a specific input field by its ID.
+ * Retrieves a form label associated with a specific input field by its 'for' attribute.
  *
- * @param {string} inputId - The ID of the input field.
+ * @param {Object} options - The options object.
+ * @param {string} options.forValue - The value of the 'for' attribute that matches the input field's ID (required).
  * @returns {Element} The matched label element.
+ * @throws {Error} If forValue is not provided.
  *
  * Example:
- *   cy.getFormLabelByInputId('name');
+ *   cy.getFormLabelByForAttribute({ forValue: 'name' });
  */
-Cypress.Commands.add('getFormLabelByInputId', (inputId) =>
-  cy.get(`#main-content .bx--form label[for="${inputId}"]`)
-);
+Cypress.Commands.add('getFormLabelByForAttribute', ({ forValue }) => {
+  if (forValue) {
+    return cy.get(`#main-content .bx--form label[for="${forValue}"]`);
+  }
+  cy.logAndThrowError('forValue is required');
+});
 
 /**
- * Retrieves a form select field by its ID.
+ * Retrieves a form select field by its ID using an object parameter.
  *
- * @param {string} selectId - The ID of the select field.
+ * @param {Object} options - The options object.
+ * @param {string} options.selectId - The ID of the select field (required).
  * @returns {Element} The matched select field element.
+ * @throws {Error} If selectId is not provided.
  *
  * Example:
- *   cy.getFormSelectFieldById('select-scan-limit');
+ *   cy.getFormSelectFieldById({ selectId: 'select-scan-limit' });
  */
-Cypress.Commands.add('getFormSelectFieldById', (selectId) =>
-  cy.get(`#main-content .bx--form select#${selectId}`)
-);
+Cypress.Commands.add('getFormSelectFieldById', ({ selectId }) => {
+  if (selectId) {
+    return cy.get(`#main-content .bx--form select#${selectId}`);
+  }
+  cy.logAndThrowError('selectId is required');
+});