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
This commit is contained in:
Torkel Ödegaard 2021-11-24 15:16:51 +01:00 committed by GitHub
parent 2346d5a3f3
commit 0f6ae272e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 23 additions and 14 deletions

View File

@ -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;

View File

@ -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

View File

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