From 1826a7a9e7c1deeee1bc6784bc2b4286629b8320 Mon Sep 17 00:00:00 2001 From: Jason Frey Date: Tue, 19 Aug 2025 15:30:44 -0400 Subject: [PATCH] Remove the double-counting of consts favoring just setting them directly --- .../edit_collect_logs.cy.js | 97 ++++------ .../Application-Settings/schedule.cy.js | 171 ++++++------------ 2 files changed, 96 insertions(+), 172 deletions(-) diff --git a/cypress/e2e/ui/Settings/Application-Settings/edit_collect_logs.cy.js b/cypress/e2e/ui/Settings/Application-Settings/edit_collect_logs.cy.js index 8bd1c03b505..021186e61a6 100644 --- a/cypress/e2e/ui/Settings/Application-Settings/edit_collect_logs.cy.js +++ b/cypress/e2e/ui/Settings/Application-Settings/edit_collect_logs.cy.js @@ -1,65 +1,41 @@ /* eslint-disable no-undef */ -const textConstants = { - // Menu options - settingsMenuOption: 'Settings', - appSettingsMenuOption: 'Application Settings', - - // List items - diagnosticsAccordionItem: 'Diagnostics', - diagnosticsAccordionItemId: 'diagnostics_accord', - manageIQRegionAccordItem: /^ManageIQ Region:/, - zoneAccordItem: /^Zone:/, - serverAccordItem: /^Server:/, - - // Buttons - saveButton: 'Save', - cancelButton: 'Cancel', - resetButton: 'Reset', - - // Dropdown values - dropdownBlankValue: 'BLANK_VALUE', - sambaDropdownValue: 'FileDepotSmb', - - // Common selectors - buttonSelector: (type) => `#main-content .bx--btn-set button[type="${type}"]`, - - // Button types - submitButtonType: 'submit', - normalButtonType: 'button', - - // Component route url - componentRouteUrl: '/ops/explorer', - - // Flash message types - flashTypeSuccess: 'success', - - // Flash message text snippets - flashMessageSettingsSaved: 'saved', - flashMessageOperationCanceled: 'cancel', -}; - -const { - diagnosticsAccordionItem, - dropdownBlankValue, - sambaDropdownValue, - saveButton, - cancelButton, - resetButton, - settingsMenuOption, - appSettingsMenuOption, - diagnosticsAccordionItemId, - manageIQRegionAccordItem, - zoneAccordItem, - serverAccordItem, - componentRouteUrl, - flashTypeSuccess, - flashMessageSettingsSaved, - flashMessageOperationCanceled, - buttonSelector, - submitButtonType, - normalButtonType, -} = textConstants; +// Menu options +const settingsMenuOption = 'Settings'; +const appSettingsMenuOption = 'Application Settings'; + +// List items +const diagnosticsAccordionItem = 'Diagnostics'; +const diagnosticsAccordionItemId = 'diagnostics_accord'; +const manageIQRegionAccordItem = /^ManageIQ Region:/; +const zoneAccordItem = /^Zone:/; +const serverAccordItem = /^Server:/; + +// Buttons +const saveButton = 'Save'; +const cancelButton = 'Cancel'; +const resetButton = 'Reset'; + +// Dropdown values +const dropdownBlankValue = 'BLANK_VALUE'; +const sambaDropdownValue = 'FileDepotSmb'; + +// Common selectors +const buttonSelector = (type) => `#main-content .bx--btn-set button[type="${type}"]`; + +// Button types +const submitButtonType = 'submit'; +const normalButtonType = 'button'; + +// Component route url +const componentRouteUrl = '/ops/explorer'; + +// Flash message types +const flashTypeSuccess = 'success'; + +// Flash message text snippets +const flashMessageSettingsSaved = 'saved'; +const flashMessageOperationCanceled = 'cancel'; function interceptAndAwaitApi({ alias, @@ -306,4 +282,3 @@ describe('Automate Collect logs Edit form operations', () => { }); }); }); - diff --git a/cypress/e2e/ui/Settings/Application-Settings/schedule.cy.js b/cypress/e2e/ui/Settings/Application-Settings/schedule.cy.js index ae7a932e724..27960ba5029 100644 --- a/cypress/e2e/ui/Settings/Application-Settings/schedule.cy.js +++ b/cypress/e2e/ui/Settings/Application-Settings/schedule.cy.js @@ -1,117 +1,66 @@ /* eslint-disable no-undef */ import { flashClassMap } from '../../../../support/assertions/assertion_constants'; -const textConstants = { - // List items - schedulesAccordionItem: 'Schedules', - - // Field values - initialScheduleName: 'Test-name', - editedScheduleName: 'Dummy-name', - initialDescription: 'Test description', - editedDescription: 'Dummy description', - actionTypeVmAnalysis: 'vm', - actionTypeTemplateAnalysis: 'miq_template', - actionTypeHostAnalysis: 'host', - actionTypeContainerAnalysis: 'container_image', - actionTypeClusterAnalysis: 'emscluster', - actionTypeDataStoreAnalysis: 'storage', - actionTypeVmCompilanceCheck: 'vm_check_compliance', - actionTypeHostCompilanceCheck: 'host_check_compliance', - actionTypeContainerCompilanceCheck: 'container_image_check_compliance', - actionTypeAutomationTasks: 'automation_request', - filterTypeVmCluster: 'cluster', - timerTypeOnce: 'Once', - timerTypeHourly: 'Hourly', - timerTypeDaily: 'Daily', - timerTypeWeekly: 'Weekly', - timerTypeMonthly: 'Monthly', - frequencyTypeHour: '1 Hour', - timezoneTypeHawaii: '(GMT-10:00) Hawaii', - initialStartDate: '06/30/2025', - editedStartDate: '07/21/2025', - startTime: '11:23', - - // Buttons - saveButton: 'Save', - cancelButton: 'Cancel', - resetButton: 'Reset', - - // Config options - configToolbarButton: 'Configuration', - addScheduleConfigOption: 'Add a new Schedule', - deleteScheduleConfigOption: 'Delete this Schedule from the Database', - editScheduleConfigOption: 'Edit this Schedule', - disableScheduleConfigOption: 'Disable this Schedule', - enableScheduleConfigOption: 'Enable this Schedule', - queueScheduleConfigOption: 'Queue up this Schedule to run now', - - // Menu options - settingsMenuOption: 'Settings', - appSettingsMenuOption: 'Application Settings', - - // Flash message text snippets - flashMessageScheduleQueued: 'queued to run', - flashMessageOperationCanceled: 'cancelled', - flashMessageScheduleDisabled: 'disabled', - flashMessageScheduleEnabled: 'enabled', - flashMessageScheduleSaved: 'saved', - flashMessageResetSchedule: 'reset', - flashMessageScheduleDeleted: 'delete successful', - flashMessageFailedToAddSchedule: 'failed', - - // Browser alert text snippets - browserAlertDeleteConfirmText: 'will be permanently removed', -}; - -const { - settingsMenuOption, - appSettingsMenuOption, - actionTypeVmAnalysis, - actionTypeTemplateAnalysis, - actionTypeHostAnalysis, - actionTypeContainerAnalysis, - actionTypeClusterAnalysis, - actionTypeDataStoreAnalysis, - actionTypeVmCompilanceCheck, - actionTypeHostCompilanceCheck, - actionTypeContainerCompilanceCheck, - actionTypeAutomationTasks, - timerTypeOnce, - timerTypeHourly, - timerTypeDaily, - timerTypeWeekly, - timerTypeMonthly, - cancelButton, - saveButton, - initialScheduleName, - editScheduleConfigOption, - editedScheduleName, - editedDescription, - editedStartDate, - resetButton, - initialDescription, - initialStartDate, - disableScheduleConfigOption, - enableScheduleConfigOption, - queueScheduleConfigOption, - addScheduleConfigOption, - frequencyTypeHour, - timezoneTypeHawaii, - startTime, - deleteScheduleConfigOption, - schedulesAccordionItem, - configToolbarButton, - flashMessageScheduleQueued, - flashMessageOperationCanceled, - flashMessageScheduleDisabled, - flashMessageScheduleEnabled, - flashMessageScheduleSaved, - flashMessageResetSchedule, - flashMessageScheduleDeleted, - flashMessageFailedToAddSchedule, - browserAlertDeleteConfirmText, -} = textConstants; +// List items +const schedulesAccordionItem = 'Schedules'; + +// Field values +const initialScheduleName = 'Test-name'; +const editedScheduleName = 'Dummy-name'; +const initialDescription = 'Test description'; +const editedDescription = 'Dummy description'; +const actionTypeVmAnalysis = 'vm'; +const actionTypeTemplateAnalysis = 'miq_template'; +const actionTypeHostAnalysis = 'host'; +const actionTypeContainerAnalysis = 'container_image'; +const actionTypeClusterAnalysis = 'emscluster'; +const actionTypeDataStoreAnalysis = 'storage'; +const actionTypeVmCompilanceCheck = 'vm_check_compliance'; +const actionTypeHostCompilanceCheck = 'host_check_compliance'; +const actionTypeContainerCompilanceCheck = 'container_image_check_compliance'; +const actionTypeAutomationTasks = 'automation_request'; +const filterTypeVmCluster = 'cluster'; +const timerTypeOnce = 'Once'; +const timerTypeHourly = 'Hourly'; +const timerTypeDaily = 'Daily'; +const timerTypeWeekly = 'Weekly'; +const timerTypeMonthly = 'Monthly'; +const frequencyTypeHour = '1 Hour'; +const timezoneTypeHawaii = '(GMT-10:00) Hawaii'; +const initialStartDate = '06/30/2025'; +const editedStartDate = '07/21/2025'; +const startTime = '11:23'; + +// Buttons +const saveButton = 'Save'; +const cancelButton = 'Cancel'; +const resetButton = 'Reset'; + +// Config options +const configToolbarButton = 'Configuration'; +const addScheduleConfigOption = 'Add a new Schedule'; +const deleteScheduleConfigOption = 'Delete this Schedule from the Database'; +const editScheduleConfigOption = 'Edit this Schedule'; +const disableScheduleConfigOption = 'Disable this Schedule'; +const enableScheduleConfigOption = 'Enable this Schedule'; +const queueScheduleConfigOption = 'Queue up this Schedule to run now'; + +// Menu options +const settingsMenuOption = 'Settings'; +const appSettingsMenuOption = 'Application Settings'; + +// Flash message text snippets +const flashMessageScheduleQueued = 'queued to run'; +const flashMessageOperationCanceled = 'cancelled'; +const flashMessageScheduleDisabled = 'disabled'; +const flashMessageScheduleEnabled = 'enabled'; +const flashMessageScheduleSaved = 'saved'; +const flashMessageResetSchedule = 'reset'; +const flashMessageScheduleDeleted = 'delete successful'; +const flashMessageFailedToAddSchedule = 'failed'; + +// Browser alert text snippets +const browserAlertDeleteConfirmText = 'will be permanently removed'; function selectConfigMenu(menuOption = addScheduleConfigOption) { return cy.toolbar(configToolbarButton, menuOption);