diff --git a/ui/apps/platform/cypress.config.js b/ui/apps/platform/cypress.config.js index ceaa82a87847a..3230e4f6745f4 100644 --- a/ui/apps/platform/cypress.config.js +++ b/ui/apps/platform/cypress.config.js @@ -10,6 +10,7 @@ module.exports = { blockHosts: ['*.*'], // Browser options chromeWebSecurity: false, // Browser options numTestsKeptInMemory: 0, // Global options + requestTimeout: 10000, // Timeouts options viewportHeight: 850, // Viewport options viewportWidth: 1440, // Viewport options diff --git a/ui/apps/platform/cypress/helpers/compliance.js b/ui/apps/platform/cypress/helpers/compliance.js index 22cd232b3c138..310d4b1e529e6 100644 --- a/ui/apps/platform/cypress/helpers/compliance.js +++ b/ui/apps/platform/cypress/helpers/compliance.js @@ -63,12 +63,7 @@ const opnameAliasesMap = { complianceStandards, }; -const waitOptions = { - requestTimeout: 10000, // because so many requests - responseTimeout: 20000, // for 6 complianceStandards responses -}; - -const requestConfig = { routeMatcherMap, opnameAliasesMap, waitOptions }; +const requestConfig = { routeMatcherMap, opnameAliasesMap }; export function visitComplianceDashboard() { visit(url.dashboard, requestConfig); diff --git a/ui/apps/platform/cypress/helpers/configWorkflowUtils.js b/ui/apps/platform/cypress/helpers/configWorkflowUtils.js index e36db98cf69d7..0a43fa3db4608 100644 --- a/ui/apps/platform/cypress/helpers/configWorkflowUtils.js +++ b/ui/apps/platform/cypress/helpers/configWorkflowUtils.js @@ -185,14 +185,6 @@ const requestConfigForDashboard = { routeMatcherMap: routeMatcherMapForDashboard, }; -const requestConfigForScan = { - routeMatcherMap: routeMatcherMapForDashboard, - waitOptions: { - requestTimeout: 10000, // because so many requests - responseTimeout: 20000, // for responses - }, -}; - export function visitConfigurationManagementDashboard() { visit(basePath, requestConfigForDashboard); @@ -265,7 +257,7 @@ export function interactAndWaitForConfigurationManagementSecondaryEntities( } export function interactAndWaitForConfigurationManagementScan(interactionCallback) { - interactAndWaitForResponses(interactionCallback, requestConfigForScan); + interactAndWaitForResponses(interactionCallback, requestConfigForDashboard); } // specifying an "entityName" will try to select that row in the table diff --git a/ui/apps/platform/scripts/cypress.sh b/ui/apps/platform/scripts/cypress.sh index 1f866e6ad8922..19077b68ea34f 100755 --- a/ui/apps/platform/scripts/cypress.sh +++ b/ui/apps/platform/scripts/cypress.sh @@ -33,5 +33,5 @@ if [ $2 == "--spec" ]; then fi cypress run --spec "cypress/integration/$3" else - DEBUG="*" cypress "$@" 2> /dev/null + DEBUG="*" NO_COLOR=1 cypress "$@" 2> /dev/null fi