Skip to content
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

[APM] Improve e2e tests #66373

Merged
merged 2 commits into from
May 13, 2020
Merged

[APM] Improve e2e tests #66373

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
f42d29d
Bump dependencies
sorenlouv May 13, 2020
9acd632
Update snapshot
sorenlouv May 13, 2020
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
20 changes: 7 additions & 13 deletions x-pack/plugins/apm/e2e/cypress/integration/snapshots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

module.exports = {
APM: {
'Transaction duration charts': {
'1': '500 ms',
'2': '250 ms',
'3': '0 ms'
"APM": {
"Transaction duration charts": {
"1": "350 ms",
"2": "175 ms",
"3": "0 ms"
}
},
__version: '4.2.0'
};
"__version": "4.5.0"
}
3 changes: 3 additions & 0 deletions x-pack/plugins/apm/e2e/cypress/support/step_definitions/apm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ Then(`should have correct y-axis ticks`, () => {
const yAxisTick =
'[data-cy=transaction-duration-charts] .rv-xy-plot__axis--vertical .rv-xy-plot__axis__tick__text';

// wait for all loading to finish
cy.get('kbnLoadingIndicator').should('not.be.visible');

cy.get(yAxisTick)
.eq(2)
.invoke('text')
Expand Down
24 changes: 11 additions & 13 deletions x-pack/plugins/apm/e2e/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,19 @@
},
"dependencies": {
"@cypress/snapshot": "^2.1.3",
"@cypress/webpack-preprocessor": "^4.1.3",
"@cypress/webpack-preprocessor": "^5.2.0",
"@types/cypress-cucumber-preprocessor": "^1.14.1",
"@types/js-yaml": "^3.12.1",
"@types/node": "^10.12.11",
"@types/node": "^14.0.1",
"axios": "^0.19.2",
"cypress": "^4.2.0",
"cypress-cucumber-preprocessor": "^2.0.1",
"js-yaml": "^3.13.1",
"ora": "^4.0.3",
"p-limit": "^2.2.1",
"cypress": "^4.5.0",
"cypress-cucumber-preprocessor": "^2.3.1",
"ora": "^4.0.4",
"p-limit": "^2.3.0",
"p-retry": "^4.2.0",
"ts-loader": "^6.2.2",
"typescript": "3.8.3",
"yargs": "^15.3.1",
"wait-on": "^4.0.1",
"webpack": "^4.42.1"
"ts-loader": "^7.0.4",
"typescript": "3.9.2",
"wait-on": "^5.0.0",
"webpack": "^4.43.0",
"yargs": "^15.3.1"
}
}
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/e2e/run-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ fi
##################################################
echo "\n${bold}Waiting for Kibana to start...${normal}"
echo "Note: you need to start Kibana manually. Find the instructions at the top."
yarn wait-on -i 500 -w 500 http://localhost:$KIBANA_PORT > /dev/null
yarn wait-on -i 500 -w 500 http-get://admin:changeme@localhost:$KIBANA_PORT/api/status > /dev/null

echo "\n✅ Setup completed successfully. Running tests...\n"

Expand Down
Loading