E2E: Fix running any suite locally (#42210)

* e2e: Fix running any suite locally

* Fixed issue with testFiles filter when specifying suite name

* unrelated

* fixed import paths to shared

* Moving dashboards to root
pull/42228/head
Torkel Ödegaard 4 years ago committed by GitHub
parent 2346d5a3f3
commit 0f6ae272e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 0
      e2e/dashboards-suite/dashboard-templating.spec.ts
  2. 0
      e2e/dashboards-suite/dashboard-time-zone.spec.ts
  3. 0
      e2e/dashboards-suite/import-dashboard.spec.ts
  4. 0
      e2e/dashboards-suite/templating-dashboard-links-and-variables.ts
  5. 0
      e2e/dashboards/TestDashboard.json
  6. 0
      e2e/panels-suite/panelEdit_base.spec.ts
  7. 2
      e2e/panels-suite/panelEdit_queries.spec.ts
  8. 0
      e2e/panels-suite/panelEdit_transforms.spec.ts
  9. 33
      e2e/run-suite
  10. 2
      e2e/smoke-tests-suite/1-smoketests.spec.ts
  11. 0
      e2e/smoke-tests-suite/variables/load-options-from-url.ts
  12. 0
      e2e/smoke-tests-suite/variables/new-query-variable.ts
  13. 0
      e2e/smoke-tests-suite/variables/set-options-from-ui.ts
  14. 0
      e2e/smoke-tests-suite/variables/textbox-variables.ts
  15. 0
      e2e/various-suite/bar-gauge.spec.ts
  16. 0
      e2e/various-suite/exemplars.spec.ts
  17. 0
      e2e/various-suite/explore.spec.ts
  18. 0
      e2e/various-suite/gauge.spec.ts
  19. 0
      e2e/various-suite/inspect-drawer.spec.ts
  20. 0
      e2e/various-suite/pie-chart.spec.ts
  21. 0
      e2e/various-suite/query-editor.spec.ts
  22. 0
      e2e/various-suite/select-focus.spec.ts
  23. 0
      e2e/various-suite/solo-route.spec.ts
  24. 0
      e2e/various-suite/trace-view-scrolling.spec.ts
  25. 0
      e2e/various-suite/visualization-suggestions.spec.ts

@ -1,5 +1,5 @@
import { e2e } from '@grafana/e2e';
import { expect } from '../../../public/test/lib/common';
import { expect } from '../../public/test/lib/common';
const flakyTimeout = 10000;

@ -14,20 +14,29 @@ CMD="start"
PARAMS=""
SLOWMO=0
URL=${BASE_URL:-"http://$HOST:$PORT"}
if [ "$1" == "debug" ]; then
echo -e "Debug mode"
SLOWMO=1
PARAMS="--no-exit"
fi
if [ "$1" == "dev" ]; then
echo "Dev mode"
CMD="open"
fi
integrationFolder=../../e2e
testFiles=*-suite/*spec.ts
cd packages/grafana-e2e
case "$1" in
"debug")
echo -e "Debug mode"
SLOWMO=1
PARAMS="--no-exit"
;;
"dev")
echo "Dev mode"
CMD="open"
;;
"")
;;
*)
integrationFolder=../../e2e/"${args[0]}"
testFiles="*.spec.ts"
;;
esac
yarn $CMD --env BASE_URL=$URL,SLOWMO=$SLOWMO \
--config defaultCommandTimeout=30000,integrationFolder=../../e2e/"${args[0]}"/specs,screenshotsFolder=../../e2e"${args[0]}"/screenshots,videosFolder=../../e2e/"${args[0]}"/videos,fileServerFolder=./cypress,viewportWidth=1920,viewportHeight=1080,trashAssetsBeforeRuns=false,videoUploadOnPasses=false \
--config defaultCommandTimeout=30000,testFiles=$testFiles,integrationFolder=$integrationFolder,screenshotsFolder=../../e2e/"${args[0]}"/screenshots,videosFolder=../../e2e/"${args[0]}"/videos,fileServerFolder=./cypress,viewportWidth=1920,viewportHeight=1080,trashAssetsBeforeRuns=false,videoUploadOnPasses=false \
$PARAMS

@ -1,4 +1,4 @@
import { e2e } from '@grafana/e2e';
import { smokeTestScenario } from '../../shared/smokeTestScenario';
import { smokeTestScenario } from '../shared/smokeTestScenario';
e2e.scenario(smokeTestScenario);
Loading…
Cancel
Save