From 0f6ae272e9bc3089ef19fe288e9245ea93269e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 24 Nov 2021 15:16:51 +0100 Subject: [PATCH] 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 --- .../{specs => }/dashboard-templating.spec.ts | 0 .../{specs => }/dashboard-time-zone.spec.ts | 0 .../{specs => }/import-dashboard.spec.ts | 0 ...emplating-dashboard-links-and-variables.ts | 0 .../dashboards/TestDashboard.json | 0 .../{specs => }/panelEdit_base.spec.ts | 0 .../{specs => }/panelEdit_queries.spec.ts | 2 +- .../{specs => }/panelEdit_transforms.spec.ts | 0 e2e/run-suite | 33 ++++++++++++------- .../{specs => }/1-smoketests.spec.ts | 2 +- .../variables/load-options-from-url.ts | 0 .../variables/new-query-variable.ts | 0 .../variables/set-options-from-ui.ts | 0 .../variables/textbox-variables.ts | 0 .../{specs => }/bar-gauge.spec.ts | 0 .../{specs => }/exemplars.spec.ts | 0 e2e/various-suite/{specs => }/explore.spec.ts | 0 e2e/various-suite/{specs => }/gauge.spec.ts | 0 .../{specs => }/inspect-drawer.spec.ts | 0 .../{specs => }/pie-chart.spec.ts | 0 .../{specs => }/query-editor.spec.ts | 0 .../{specs => }/select-focus.spec.ts | 0 .../{specs => }/solo-route.spec.ts | 0 .../{specs => }/trace-view-scrolling.spec.ts | 0 ...s.ts => visualization-suggestions.spec.ts} | 0 25 files changed, 23 insertions(+), 14 deletions(-) rename e2e/dashboards-suite/{specs => }/dashboard-templating.spec.ts (100%) rename e2e/dashboards-suite/{specs => }/dashboard-time-zone.spec.ts (100%) rename e2e/dashboards-suite/{specs => }/import-dashboard.spec.ts (100%) rename e2e/dashboards-suite/{specs => }/templating-dashboard-links-and-variables.ts (100%) rename e2e/{dashboards-suite => }/dashboards/TestDashboard.json (100%) rename e2e/panels-suite/{specs => }/panelEdit_base.spec.ts (100%) rename e2e/panels-suite/{specs => }/panelEdit_queries.spec.ts (98%) rename e2e/panels-suite/{specs => }/panelEdit_transforms.spec.ts (100%) rename e2e/smoke-tests-suite/{specs => }/1-smoketests.spec.ts (50%) rename e2e/smoke-tests-suite/{specs => }/variables/load-options-from-url.ts (100%) rename e2e/smoke-tests-suite/{specs => }/variables/new-query-variable.ts (100%) rename e2e/smoke-tests-suite/{specs => }/variables/set-options-from-ui.ts (100%) rename e2e/smoke-tests-suite/{specs => }/variables/textbox-variables.ts (100%) rename e2e/various-suite/{specs => }/bar-gauge.spec.ts (100%) rename e2e/various-suite/{specs => }/exemplars.spec.ts (100%) rename e2e/various-suite/{specs => }/explore.spec.ts (100%) rename e2e/various-suite/{specs => }/gauge.spec.ts (100%) rename e2e/various-suite/{specs => }/inspect-drawer.spec.ts (100%) rename e2e/various-suite/{specs => }/pie-chart.spec.ts (100%) rename e2e/various-suite/{specs => }/query-editor.spec.ts (100%) rename e2e/various-suite/{specs => }/select-focus.spec.ts (100%) rename e2e/various-suite/{specs => }/solo-route.spec.ts (100%) rename e2e/various-suite/{specs => }/trace-view-scrolling.spec.ts (100%) rename e2e/various-suite/{specs/visualization-suggestions.ts => visualization-suggestions.spec.ts} (100%) diff --git a/e2e/dashboards-suite/specs/dashboard-templating.spec.ts b/e2e/dashboards-suite/dashboard-templating.spec.ts similarity index 100% rename from e2e/dashboards-suite/specs/dashboard-templating.spec.ts rename to e2e/dashboards-suite/dashboard-templating.spec.ts diff --git a/e2e/dashboards-suite/specs/dashboard-time-zone.spec.ts b/e2e/dashboards-suite/dashboard-time-zone.spec.ts similarity index 100% rename from e2e/dashboards-suite/specs/dashboard-time-zone.spec.ts rename to e2e/dashboards-suite/dashboard-time-zone.spec.ts diff --git a/e2e/dashboards-suite/specs/import-dashboard.spec.ts b/e2e/dashboards-suite/import-dashboard.spec.ts similarity index 100% rename from e2e/dashboards-suite/specs/import-dashboard.spec.ts rename to e2e/dashboards-suite/import-dashboard.spec.ts diff --git a/e2e/dashboards-suite/specs/templating-dashboard-links-and-variables.ts b/e2e/dashboards-suite/templating-dashboard-links-and-variables.ts similarity index 100% rename from e2e/dashboards-suite/specs/templating-dashboard-links-and-variables.ts rename to e2e/dashboards-suite/templating-dashboard-links-and-variables.ts diff --git a/e2e/dashboards-suite/dashboards/TestDashboard.json b/e2e/dashboards/TestDashboard.json similarity index 100% rename from e2e/dashboards-suite/dashboards/TestDashboard.json rename to e2e/dashboards/TestDashboard.json diff --git a/e2e/panels-suite/specs/panelEdit_base.spec.ts b/e2e/panels-suite/panelEdit_base.spec.ts similarity index 100% rename from e2e/panels-suite/specs/panelEdit_base.spec.ts rename to e2e/panels-suite/panelEdit_base.spec.ts diff --git a/e2e/panels-suite/specs/panelEdit_queries.spec.ts b/e2e/panels-suite/panelEdit_queries.spec.ts similarity index 98% rename from e2e/panels-suite/specs/panelEdit_queries.spec.ts rename to e2e/panels-suite/panelEdit_queries.spec.ts index 8694905d78f..0276011ae2f 100644 --- a/e2e/panels-suite/specs/panelEdit_queries.spec.ts +++ b/e2e/panels-suite/panelEdit_queries.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; diff --git a/e2e/panels-suite/specs/panelEdit_transforms.spec.ts b/e2e/panels-suite/panelEdit_transforms.spec.ts similarity index 100% rename from e2e/panels-suite/specs/panelEdit_transforms.spec.ts rename to e2e/panels-suite/panelEdit_transforms.spec.ts diff --git a/e2e/run-suite b/e2e/run-suite index bd172850cdc..2c6715562ba 100755 --- a/e2e/run-suite +++ b/e2e/run-suite @@ -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 diff --git a/e2e/smoke-tests-suite/specs/1-smoketests.spec.ts b/e2e/smoke-tests-suite/1-smoketests.spec.ts similarity index 50% rename from e2e/smoke-tests-suite/specs/1-smoketests.spec.ts rename to e2e/smoke-tests-suite/1-smoketests.spec.ts index 185eb389e0f..2049b329695 100644 --- a/e2e/smoke-tests-suite/specs/1-smoketests.spec.ts +++ b/e2e/smoke-tests-suite/1-smoketests.spec.ts @@ -1,4 +1,4 @@ import { e2e } from '@grafana/e2e'; -import { smokeTestScenario } from '../../shared/smokeTestScenario'; +import { smokeTestScenario } from '../shared/smokeTestScenario'; e2e.scenario(smokeTestScenario); diff --git a/e2e/smoke-tests-suite/specs/variables/load-options-from-url.ts b/e2e/smoke-tests-suite/variables/load-options-from-url.ts similarity index 100% rename from e2e/smoke-tests-suite/specs/variables/load-options-from-url.ts rename to e2e/smoke-tests-suite/variables/load-options-from-url.ts diff --git a/e2e/smoke-tests-suite/specs/variables/new-query-variable.ts b/e2e/smoke-tests-suite/variables/new-query-variable.ts similarity index 100% rename from e2e/smoke-tests-suite/specs/variables/new-query-variable.ts rename to e2e/smoke-tests-suite/variables/new-query-variable.ts diff --git a/e2e/smoke-tests-suite/specs/variables/set-options-from-ui.ts b/e2e/smoke-tests-suite/variables/set-options-from-ui.ts similarity index 100% rename from e2e/smoke-tests-suite/specs/variables/set-options-from-ui.ts rename to e2e/smoke-tests-suite/variables/set-options-from-ui.ts diff --git a/e2e/smoke-tests-suite/specs/variables/textbox-variables.ts b/e2e/smoke-tests-suite/variables/textbox-variables.ts similarity index 100% rename from e2e/smoke-tests-suite/specs/variables/textbox-variables.ts rename to e2e/smoke-tests-suite/variables/textbox-variables.ts diff --git a/e2e/various-suite/specs/bar-gauge.spec.ts b/e2e/various-suite/bar-gauge.spec.ts similarity index 100% rename from e2e/various-suite/specs/bar-gauge.spec.ts rename to e2e/various-suite/bar-gauge.spec.ts diff --git a/e2e/various-suite/specs/exemplars.spec.ts b/e2e/various-suite/exemplars.spec.ts similarity index 100% rename from e2e/various-suite/specs/exemplars.spec.ts rename to e2e/various-suite/exemplars.spec.ts diff --git a/e2e/various-suite/specs/explore.spec.ts b/e2e/various-suite/explore.spec.ts similarity index 100% rename from e2e/various-suite/specs/explore.spec.ts rename to e2e/various-suite/explore.spec.ts diff --git a/e2e/various-suite/specs/gauge.spec.ts b/e2e/various-suite/gauge.spec.ts similarity index 100% rename from e2e/various-suite/specs/gauge.spec.ts rename to e2e/various-suite/gauge.spec.ts diff --git a/e2e/various-suite/specs/inspect-drawer.spec.ts b/e2e/various-suite/inspect-drawer.spec.ts similarity index 100% rename from e2e/various-suite/specs/inspect-drawer.spec.ts rename to e2e/various-suite/inspect-drawer.spec.ts diff --git a/e2e/various-suite/specs/pie-chart.spec.ts b/e2e/various-suite/pie-chart.spec.ts similarity index 100% rename from e2e/various-suite/specs/pie-chart.spec.ts rename to e2e/various-suite/pie-chart.spec.ts diff --git a/e2e/various-suite/specs/query-editor.spec.ts b/e2e/various-suite/query-editor.spec.ts similarity index 100% rename from e2e/various-suite/specs/query-editor.spec.ts rename to e2e/various-suite/query-editor.spec.ts diff --git a/e2e/various-suite/specs/select-focus.spec.ts b/e2e/various-suite/select-focus.spec.ts similarity index 100% rename from e2e/various-suite/specs/select-focus.spec.ts rename to e2e/various-suite/select-focus.spec.ts diff --git a/e2e/various-suite/specs/solo-route.spec.ts b/e2e/various-suite/solo-route.spec.ts similarity index 100% rename from e2e/various-suite/specs/solo-route.spec.ts rename to e2e/various-suite/solo-route.spec.ts diff --git a/e2e/various-suite/specs/trace-view-scrolling.spec.ts b/e2e/various-suite/trace-view-scrolling.spec.ts similarity index 100% rename from e2e/various-suite/specs/trace-view-scrolling.spec.ts rename to e2e/various-suite/trace-view-scrolling.spec.ts diff --git a/e2e/various-suite/specs/visualization-suggestions.ts b/e2e/various-suite/visualization-suggestions.spec.ts similarity index 100% rename from e2e/various-suite/specs/visualization-suggestions.ts rename to e2e/various-suite/visualization-suggestions.spec.ts