Chore: remove scenario wrapping in cypress tests (#74674)

* remove scenario wrapping in cypress tests

* remove more hardcoded logins

* don't forget the various suite!

* make sure we log in for every test

* fix afterAll revert

* stability

e2e/utils/flows/importDashboards.ts

@@ -1,5 +1,3 @@
-import { e2e } from '../index';
-
 import { importDashboard, Dashboard } from './importDashboard';
 
 /**

e2e/utils/index.ts

@@ -3,7 +3,6 @@ import { E2ESelectors, Selectors, selectors } from '@grafana/e2e-selectors';
 import * as flows from './flows';
 import { e2eFactory } from './support';
 import { benchmark } from './support/benchmark';
-import { e2eScenario, ScenarioArguments } from './support/scenario';
 import { getScenarioContext, setScenarioContext } from './support/scenarioContext';
 import * as typings from './typings';
 
@@ -12,7 +11,6 @@ export const e2e = {
   config: () => Cypress.config(),
   blobToBase64String: (blob: Blob) => Cypress.Blob.blobToBase64String(blob),
   imgSrcToBlob: (url: string) => Cypress.Blob.imgSrcToBlob(url),
-  scenario: (args: ScenarioArguments) => e2eScenario(args),
   benchmark,
   pages: e2eFactory({ selectors: selectors.pages }),
   typings,

e2e/utils/support/localStorage.ts

@@ -1,5 +1,3 @@
-import { e2e } from '../index';
-
 // @todo this actually returns type `Cypress.Chainable`
 const get = (key: string): any =>
   cy.wrap({ getLocalStorage: () => localStorage.getItem(key) }, { log: false }).invoke('getLocalStorage');

e2e/utils/support/scenario.ts

@@ -1,53 +0,0 @@
-import { e2e } from '../';
-
-export interface ScenarioArguments {
-  describeName: string;
-  itName: string;
-  scenario: Function;
-  skipScenario?: boolean;
-  addScenarioDataSource?: boolean;
-  addScenarioDashBoard?: boolean;
-  loginViaApi?: boolean;
-}
-
-export const e2eScenario = ({
-  describeName,
-  itName,
-  scenario,
-  skipScenario = false,
-  addScenarioDataSource = false,
-  addScenarioDashBoard = false,
-  loginViaApi = true,
-}: ScenarioArguments) => {
-  describe(describeName, () => {
-    if (skipScenario) {
-      it.skip(itName, () => scenario());
-    } else {
-      before(() => {
-        cy.session(
-          'login',
-          () => {
-            e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'), loginViaApi);
-          },
-          {
-            cacheAcrossSpecs: true,
-          }
-        );
-        e2e.flows.setDefaultUserPreferences();
-      });
-
-      beforeEach(() => {
-        if (addScenarioDataSource) {
-          e2e.flows.addDataSource();
-        }
-        if (addScenarioDashBoard) {
-          e2e.flows.addDashboard();
-        }
-      });
-
-      afterEach(() => e2e.flows.revertAllChanges());
-
-      it(itName, () => scenario());
-    }
-  });
-};

e2e/utils/support/scenarioContext.ts

@@ -1,6 +1,5 @@
 import { DeleteDashboardConfig } from '../flows/deleteDashboard';
 import { DeleteDataSourceConfig } from '../flows/deleteDataSource';
-import { e2e } from '../index';
 
 export interface ScenarioContext {
   addedDashboards: DeleteDashboardConfig[];