From 3fdf96d241ff18e618e21138a1ea2225c2300ba4 Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Thu, 14 Sep 2023 15:00:29 +0100
Subject: [PATCH] Chore: consolidate e2e scripts in package.json (#74906)

consolidate e2e scripts in package.json + almost fix benchmarking tests
---
 cypress.config.js                         |  2 +-
 e2e/benchmarks/live/4-20hz-panels.spec.ts |  2 +-
 e2e/run-suite                             | 11 +++++------
 e2e/utils/support/benchmark.ts            |  7 +------
 package.json                              |  5 +----
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/cypress.config.js b/cypress.config.js
index 7423588e46c..856fb85f022 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -34,7 +34,7 @@ module.exports = defineConfig({
       });
 
       on('task', {
-        getJSONFilesFromDir: async (relativePath) => {
+        getJSONFilesFromDir: async ({ relativePath }) => {
           // CWD is set for plugins in the cli but not for the main grafana repo: https://github.com/grafana/grafana/blob/main/packages/grafana-e2e/cli.js#L12
           const projectPath = config.env.CWD || config.fileServerFolder || process.cwd();
           const directoryPath = path.join(projectPath, relativePath);
diff --git a/e2e/benchmarks/live/4-20hz-panels.spec.ts b/e2e/benchmarks/live/4-20hz-panels.spec.ts
index 8f719ed8ada..994fe0aad71 100644
--- a/e2e/benchmarks/live/4-20hz-panels.spec.ts
+++ b/e2e/benchmarks/live/4-20hz-panels.spec.ts
@@ -16,7 +16,7 @@ const hasGrafanaRuntime = <T>(obj: T): obj is WithGrafanaRuntime<T> => {
 e2e.benchmark({
   name: 'Live performance benchmarking - 4x20hz panels',
   dashboard: {
-    folder: '/dashboards/live',
+    folder: '../benchmarks/dashboards/live',
     delayAfterOpening: 1000,
     skipPanelValidation: true,
   },
diff --git a/e2e/run-suite b/e2e/run-suite
index f8ecc6e103b..a607baa533b 100755
--- a/e2e/run-suite
+++ b/e2e/run-suite
@@ -16,7 +16,7 @@ echo -e "Starting Cypress scenarios"
 
 args=("$@")
 
-CMD="cy:run"
+CMD="cypress run --browser=chrome"
 PARAMS=""
 CLEANUP=""
 
@@ -51,12 +51,11 @@ case "$1" in
         ;;
     "dev")
         echo "Dev mode"
-        CMD="cy:open"
+        CMD="cypress open"
         ;;
     "benchmark")
         echo "Benchmark"
-        PARAMS="--headed"
-        CMD="cy:benchmark"
+        PARAMS="--headed --no-runner-ui"
         env[BENCHMARK_PLUGIN_ENABLED]=true
         env[BENCHMARK_PLUGIN_RESULTS_FOLDER]=./e2e/benchmarks/"${args[1]}"/results
         cypressConfig[video]=false
@@ -77,7 +76,7 @@ case "$1" in
                 ;;
             "dev")
                 echo "Dev mode"
-                CMD="cy:open"
+                CMD="cypress open"
                 enterpriseSuite=$(basename "${args[2]}")
                 ;;
         esac
@@ -113,7 +112,7 @@ function join () {
 
 export TZ="Pacific/Honolulu"
 
-yarn $CMD --env "$(join env)" \
+yarn run $CMD --env "$(join env)" \
   --config "$(join cypressConfig)" \
   $PARAMS
 
diff --git a/e2e/utils/support/benchmark.ts b/e2e/utils/support/benchmark.ts
index 52210ae7d5c..8dbf53dd4c1 100644
--- a/e2e/utils/support/benchmark.ts
+++ b/e2e/utils/support/benchmark.ts
@@ -30,13 +30,8 @@ export const benchmark = ({
     });
   } else {
     describe(name, () => {
-      before(() => {
-        cy.session('login', () => e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'), true), {
-          cacheAcrossSpecs: true,
-        });
-      });
-
       beforeEach(() => {
+        e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
         e2e.flows.importDashboards(dashboard.folder, 1000, dashboard.skipPanelValidation);
       });
 
diff --git a/package.json b/package.json
index 2b8176bdb06..051c432e3b8 100644
--- a/package.json
+++ b/package.json
@@ -52,10 +52,7 @@
     "betterer": "betterer",
     "betterer:merge": "betterer merge",
     "betterer:stats": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/reportBettererStats.ts",
-    "betterer:issues": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/generateBettererIssues.ts",
-    "cy:run": "cypress run --browser=chrome",
-    "cy:open": "cypress open",
-    "cy:benchmark": "CYPRESS_NO_COMMAND_LOG=1 cypress run --browser=chrome"
+    "betterer:issues": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/generateBettererIssues.ts"
   },
   "grafana": {
     "whatsNewUrl": "https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v10-1/",