Skip to content

ROX-12956: Increase requestTimeout and disable colors for integration tests #3307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedrottimark merged 2 commits into from
Oct 5, 2022
Merged

ROX-12956: Increase requestTimeout and disable colors for integration tests #3307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be4c00d
ROX-12956: Increase requestTimeout and disable colors for integration…
Oct 4, 2022
05adf5c
Delete redundant waitOptions from compliance helpers
Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/apps/platform/cypress.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 1 addition & 6 deletions ui/apps/platform/cypress/helpers/compliance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 1 addition & 9 deletions ui/apps/platform/cypress/helpers/configWorkflowUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ui/apps/platform/scripts/cypress.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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