Chore: Remove more stuff from the e2e object (#75513)

* cut down the e2e object more :) * undo changes in grafana-e2e * couple more things to undo in grafana-e2e
2025-02-25 18:55:37 -06:00 · 2023-09-27 11:33:00 +01:00 · 2023-09-27 11:33:00 +01:00 · d8e99e2bb5
commit d8e99e2bb5
parent 2a9ef4cce5
54 changed files with 75 additions and 77 deletions
--- a/e2e/cloud-plugins-suite/azure-monitor.spec.ts
+++ b/e2e/cloud-plugins-suite/azure-monitor.spec.ts
@ -157,11 +157,11 @@ const applicationInsightsName = 'az-mon-test-ai-a';

 describe('Azure monitor datasource', () => {
  before(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));

    // Add datasource
    // This variable will be set in CI
-    const CI = e2e.env('CI');
+    const CI = Cypress.env('CI');
    if (CI) {
      cy.readFile('outputs.json').then((outputs) => {
        provisionAzureMonitorDatasources([
@ -190,11 +190,11 @@ describe('Azure monitor datasource', () => {
  });

  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  after(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
    e2e.flows.revertAllChanges();
  });

--- a/e2e/dashboards-suite/Repeating_a_panel_horizontally.spec.ts
+++ b/e2e/dashboards-suite/Repeating_a_panel_horizontally.spec.ts
@ -3,7 +3,7 @@ const PAGE_UNDER_TEST = 'WVpf2jp7z/repeating-a-panel-horizontally';

 describe('Repeating a panel horizontally', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('should be able to repeat a panel horizontally', () => {
--- a/e2e/dashboards-suite/Repeating_a_panel_vertically.spec.ts
+++ b/e2e/dashboards-suite/Repeating_a_panel_vertically.spec.ts
@ -3,7 +3,7 @@ const PAGE_UNDER_TEST = 'OY8Ghjt7k/repeating-a-panel-vertically';

 describe('Repeating a panel vertically', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('should be able to repeat a panel vertically', () => {
--- a/e2e/dashboards-suite/Repeating_an_empty_row.spec.ts
+++ b/e2e/dashboards-suite/Repeating_an_empty_row.spec.ts
@ -3,7 +3,7 @@ const PAGE_UNDER_TEST = 'dtpl2Ctnk/repeating-an-empty-row';

 describe('Repeating empty rows', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('should be able to repeat empty rows vertically', () => {
--- a/e2e/dashboards-suite/dashboard-browse-nested.spec.ts
+++ b/e2e/dashboards-suite/dashboard-browse-nested.spec.ts
@ -14,7 +14,7 @@ describe.skip('Dashboard browse (nested)', () => {

  // Add nested folder structure
  before(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'), false);
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), false);

    // Add root folders
    for (let i = 0; i < NUM_ROOT_FOLDERS; i++) {
--- a/e2e/dashboards-suite/dashboard-browse.spec.ts
+++ b/e2e/dashboards-suite/dashboard-browse.spec.ts
@ -3,7 +3,7 @@ import { e2e } from '../utils';

 describe('Dashboard browse', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Basic folder view test', () => {
--- a/e2e/dashboards-suite/dashboard-public-create.spec.ts
+++ b/e2e/dashboards-suite/dashboard-public-create.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Public dashboards', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Create a public dashboard', () => {
--- a/e2e/dashboards-suite/dashboard-public-templating.spec.ts
+++ b/e2e/dashboards-suite/dashboard-public-templating.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Create a public dashboard with template variables shows a template variable warning', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Create a public dashboard with template variables shows a template variable warning', () => {
--- a/e2e/dashboards-suite/dashboard-templating.spec.ts
+++ b/e2e/dashboards-suite/dashboard-templating.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Dashboard templating', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Verify variable interpolation works', () => {
--- a/e2e/dashboards-suite/dashboard-time-zone.spec.ts
+++ b/e2e/dashboards-suite/dashboard-time-zone.spec.ts
@ -13,7 +13,7 @@ import { e2e } from '../utils';

 describe('Dashboard time zone support', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests dashboard time zone scenarios', () => {
--- a/e2e/dashboards-suite/dashboard-timepicker.spec.ts
+++ b/e2e/dashboards-suite/dashboard-timepicker.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Dashboard timepicker', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Shows the correct calendar days with custom timezone set via preferences', () => {
--- a/e2e/dashboards-suite/import-dashboard.spec.ts
+++ b/e2e/dashboards-suite/import-dashboard.spec.ts
@ -3,7 +3,7 @@ import { e2e } from '../utils';

 describe('Import Dashboards Test', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Ensure you can import a number of json test dashboards from a specific test directory', () => {
--- a/e2e/dashboards-suite/load-options-from-url.spec.ts
+++ b/e2e/dashboards-suite/load-options-from-url.spec.ts
@ -4,7 +4,7 @@ const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';

 describe('Variables - Load options from Url', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('default options should be correct', () => {
--- a/e2e/dashboards-suite/new-constant-variable.spec.ts
+++ b/e2e/dashboards-suite/new-constant-variable.spec.ts
@ -5,7 +5,7 @@ const DASHBOARD_NAME = 'Test variable output';

 describe('Variables - Constant', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('can add a new constant variable', () => {
--- a/e2e/dashboards-suite/new-custom-variable.spec.ts
+++ b/e2e/dashboards-suite/new-custom-variable.spec.ts
@ -21,7 +21,7 @@ function assertPreviewValues(expectedValues: string[]) {

 describe('Variables - Custom', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('can add a custom template variable', () => {
--- a/e2e/dashboards-suite/new-datasource-variable.spec.ts
+++ b/e2e/dashboards-suite/new-datasource-variable.spec.ts
@ -5,7 +5,7 @@ const DASHBOARD_NAME = 'Test variable output';

 describe('Variables - Datasource', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('can add a new datasource variable', () => {
--- a/e2e/dashboards-suite/new-interval-variable.spec.ts
+++ b/e2e/dashboards-suite/new-interval-variable.spec.ts
@ -12,7 +12,7 @@ function assertPreviewValues(expectedValues: string[]) {

 describe('Variables - Interval', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('can add a new interval variable', () => {
--- a/e2e/dashboards-suite/new-query-variable.spec.ts
+++ b/e2e/dashboards-suite/new-query-variable.spec.ts
@ -5,7 +5,7 @@ const DASHBOARD_NAME = 'Templating - Nested Template Variables';

 describe('Variables - Query - Add variable', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('query variable should be default and default fields should be correct', () => {
--- a/e2e/dashboards-suite/new-text-box-variable.spec.ts
+++ b/e2e/dashboards-suite/new-text-box-variable.spec.ts
@ -5,7 +5,7 @@ const DASHBOARD_NAME = 'Test variable output';

 describe('Variables - Text box', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('can add a new text box variable', () => {
--- a/e2e/dashboards-suite/set-options-from-ui.spec.ts
+++ b/e2e/dashboards-suite/set-options-from-ui.spec.ts
@ -4,7 +4,7 @@ const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';

 describe('Variables - Set options from ui', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('clicking a value that is not part of dependents options should change these to All', () => {
--- a/e2e/dashboards-suite/templating-dashboard-links-and-variables.spec.ts
+++ b/e2e/dashboards-suite/templating-dashboard-links-and-variables.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Templating', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests dashboard links and variables in links', () => {
--- a/e2e/dashboards-suite/textbox-variables.spec.ts
+++ b/e2e/dashboards-suite/textbox-variables.spec.ts
@ -4,7 +4,7 @@ const PAGE_UNDER_TEST = 'AejrN1AMz';

 describe('TextBox - load options scenarios', function () {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('default options should be correct', function () {
@ -24,7 +24,7 @@ describe('TextBox - load options scenarios', function () {

 describe.skip('TextBox - change query scenarios', function () {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('when changing the query value and not saving current as default should revert query value', function () {
@ -78,7 +78,7 @@ describe.skip('TextBox - change query scenarios', function () {

 describe.skip('TextBox - change picker value scenarios', function () {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('when changing the input value and not saving current as default should revert query value', function () {
--- a/e2e/datagrid-suite/datagrid-data-change.spec.ts
+++ b/e2e/datagrid-suite/datagrid-data-change.spec.ts
@ -5,7 +5,7 @@ const DATAGRID_SELECT_SERIES = 'Datagrid Select series';

 describe('Datagrid data changes', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests changing data in the grid', () => {
--- a/e2e/datagrid-suite/datagrid-editing-features.spec.ts
+++ b/e2e/datagrid-suite/datagrid-editing-features.spec.ts
@ -5,7 +5,7 @@ const DATAGRID_CANVAS = 'data-grid-canvas';

 describe('Datagrid data changes', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests changing data in the grid', () => {
--- a/e2e/panels-suite/frontend-sandbox-panel.spec.ts
+++ b/e2e/panels-suite/frontend-sandbox-panel.spec.ts
@ -5,7 +5,7 @@ const DASHBOARD_ID = 'c46b2460-16b7-42a5-82d1-b07fbf431950';

 describe('Panel sandbox', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'), true);
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), true);
    return e2e.flows.importDashboard(panelSandboxDashboard, 1000, true);
  });

--- a/e2e/panels-suite/geomap-layer-types.spec.ts
+++ b/e2e/panels-suite/geomap-layer-types.spec.ts
@ -8,7 +8,7 @@ const MAP_LAYERS_GEOJSON = 'Map layers GeoJSON URL';

 describe('Geomap layer types', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests changing the layer type', () => {
--- a/e2e/panels-suite/geomap-map-controls.spec.ts
+++ b/e2e/panels-suite/geomap-map-controls.spec.ts
@ -3,7 +3,7 @@ const DASHBOARD_ID = 'P2jR04WVk';

 describe('Geomap layer controls options', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests map controls options', () => {
--- a/e2e/panels-suite/geomap-spatial-operations-transform.spec.ts
+++ b/e2e/panels-suite/geomap-spatial-operations-transform.spec.ts
@ -4,7 +4,7 @@ const DASHBOARD_ID = 'P2jR04WVk';

 describe('Geomap spatial operations', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests location auto option', () => {
--- a/e2e/panels-suite/panelEdit_base.spec.ts
+++ b/e2e/panels-suite/panelEdit_base.spec.ts
@ -4,7 +4,7 @@ const PANEL_UNDER_TEST = 'Lines 500 data points';

 describe('Panel edit tests', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests various Panel edit scenarios', () => {
--- a/e2e/panels-suite/panelEdit_queries.spec.ts
+++ b/e2e/panels-suite/panelEdit_queries.spec.ts
@ -4,7 +4,7 @@ const flakyTimeout = 10000;

 describe('Panel edit tests - queries', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests various Panel edit queries scenarios', () => {
--- a/e2e/panels-suite/panelEdit_transforms.spec.ts
+++ b/e2e/panels-suite/panelEdit_transforms.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Panel edit tests - transformations', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests transformations editor', () => {
--- a/e2e/shared/smokeTestScenario.ts
+++ b/e2e/shared/smokeTestScenario.ts
@ -3,7 +3,7 @@ import { e2e } from '../utils';
 export const smokeTestScenario = () =>
  describe('Smoke tests', () => {
    before(() => {
-      e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'), false);
+      e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), false);
      e2e.flows.addDataSource();
      e2e.flows.addDashboard();
    });
--- a/e2e/smoke-tests-suite/panels_smokescreen.spec.ts
+++ b/e2e/smoke-tests-suite/panels_smokescreen.spec.ts
@ -4,7 +4,7 @@ import { e2e } from '../utils';

 describe('Panels smokescreen', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'), false);
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'), false);
  });

  after(() => {
--- a/e2e/sql-suite/mysql.spec.ts
+++ b/e2e/sql-suite/mysql.spec.ts
@ -9,7 +9,7 @@ const normalTableName = tablesResponse.results.tables.frames[0].data.values[0][0

 describe('MySQL datasource', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('code editor autocomplete should handle table name escaping/quoting', () => {
--- a/e2e/utils/flows/addDataSource.ts
+++ b/e2e/utils/flows/addDataSource.ts
@ -82,14 +82,14 @@ export const addDataSource = (config?: Partial<AddDataSourceConfig>) => {
  e2e.pages.DataSource.saveAndTest().click();

  if (awaitHealth) {
-    cy.wait('@health', { timeout: timeout ?? e2e.config().defaultCommandTimeout });
+    cy.wait('@health', { timeout: timeout ?? Cypress.config().defaultCommandTimeout });
  }

  // use the timeout passed in if it exists, otherwise, continue to use the default
  e2e.pages.DataSource.alert()
    .should('exist')
    .contains(expectedAlertMessage, {
-      timeout: timeout ?? e2e.config().defaultCommandTimeout,
+      timeout: timeout ?? Cypress.config().defaultCommandTimeout,
    });
  cy.logToConsole('Added data source with name:', name);

--- a/e2e/utils/flows/configurePanel.ts
+++ b/e2e/utils/flows/configurePanel.ts
@ -155,7 +155,7 @@ export const configurePanel = (config: PartialAddPanelConfig | PartialEditPanelC
    e2e.components.RefreshPicker.runButtonV2().first().click({ force: true });

    // Wait for RxJS
-    cy.wait(timeout ?? e2e.config().defaultCommandTimeout);
+    cy.wait(timeout ?? Cypress.config().defaultCommandTimeout);

    if (matchScreenshot) {
      let visualization;
--- a/e2e/utils/index.ts
+++ b/e2e/utils/index.ts
@ -7,10 +7,6 @@ import { getScenarioContext, setScenarioContext } from './support/scenarioContex
 import * as typings from './typings';

 export const e2e = {
-  env: (args: string) => Cypress.env(args),
-  config: () => Cypress.config(),
-  blobToBase64String: (blob: Blob) => Cypress.Blob.blobToBase64String(blob),
-  imgSrcToBlob: (url: string) => Cypress.Blob.imgSrcToBlob(url),
  benchmark,
  pages: e2eFactory({ selectors: selectors.pages }),
  typings,
--- a/e2e/utils/support/benchmark.ts
+++ b/e2e/utils/support/benchmark.ts
@ -31,7 +31,7 @@ export const benchmark = ({
  } else {
    describe(name, () => {
      beforeEach(() => {
-        e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+        e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
        e2e.flows.importDashboards(dashboard.folder, 1000, dashboard.skipPanelValidation);
      });

--- a/e2e/utils/support/url.ts
+++ b/e2e/utils/support/url.ts
@ -1,6 +1,6 @@
 import { e2e } from '../index';

-const getBaseUrl = () => e2e.env('BASE_URL') || e2e.config().baseUrl || 'http://localhost:3000';
+const getBaseUrl = () => Cypress.env('BASE_URL') || Cypress.config().baseUrl || 'http://localhost:3000';

 export const fromBaseUrl = (url = '') => new URL(url, getBaseUrl()).href;

--- a/e2e/various-suite/bar-gauge.spec.ts
+++ b/e2e/various-suite/bar-gauge.spec.ts
@ -4,7 +4,7 @@ import { e2e } from '../utils';

 describe('Bar Gauge Panel', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Bar Gauge rendering e2e tests', () => {
--- a/e2e/various-suite/exemplars.spec.ts
+++ b/e2e/various-suite/exemplars.spec.ts
@ -19,16 +19,17 @@ const addDataSource = () => {

 describe('Exemplars', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));

-    cy.request({ url: `${e2e.env('BASE_URL')}/api/datasources/name/${dataSourceName}`, failOnStatusCode: false }).then(
-      (response) => {
+    cy.request({
+      url: `${Cypress.env('BASE_URL')}/api/datasources/name/${dataSourceName}`,
+      failOnStatusCode: false,
+    }).then((response) => {
      if (response.isOkStatusCode) {
        return;
      }
      addDataSource();
-      }
-    );
+    });
  });

  it('should be able to navigate to configured data source', () => {
--- a/e2e/various-suite/explore.spec.ts
+++ b/e2e/various-suite/explore.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Explore', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Basic path through Explore.', () => {
--- a/e2e/various-suite/filter-annotations.spec.ts
+++ b/e2e/various-suite/filter-annotations.spec.ts
@ -3,7 +3,7 @@ const DASHBOARD_ID = 'ed155665';

 describe('Annotations filtering', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests switching filter type updates the UI accordingly', () => {
--- a/e2e/various-suite/gauge.spec.ts
+++ b/e2e/various-suite/gauge.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Gauge Panel', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Gauge rendering e2e tests', () => {
--- a/e2e/various-suite/graph-auto-migrate.spec.ts
+++ b/e2e/various-suite/graph-auto-migrate.spec.ts
@ -4,7 +4,7 @@ const DASHBOARD_NAME = 'Panel Tests - Graph Time Regions';

 describe('Auto-migrate graph panel', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Annotation markers exist for time regions', () => {
--- a/e2e/various-suite/inspect-drawer.spec.ts
+++ b/e2e/various-suite/inspect-drawer.spec.ts
@ -4,7 +4,7 @@ const PANEL_UNDER_TEST = 'Value reducers 1';

 describe('Inspect drawer tests', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests various Inspect Drawer scenarios', () => {
--- a/e2e/various-suite/loki-editor.spec.ts
+++ b/e2e/various-suite/loki-editor.spec.ts
@ -14,7 +14,7 @@ const addDataSource = () => {

 describe('Loki Query Editor', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  afterEach(() => {
--- a/e2e/various-suite/loki-query-builder.spec.ts
+++ b/e2e/various-suite/loki-query-builder.spec.ts
@ -17,16 +17,17 @@ const finalQuery = 'rate({instance=~"instance1|instance2"} | logfmt | __error__=

 describe('Loki query builder', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));

-    cy.request({ url: `${e2e.env('BASE_URL')}/api/datasources/name/${dataSourceName}`, failOnStatusCode: false }).then(
-      (response) => {
+    cy.request({
+      url: `${Cypress.env('BASE_URL')}/api/datasources/name/${dataSourceName}`,
+      failOnStatusCode: false,
+    }).then((response) => {
      if (response.isOkStatusCode) {
        return;
      }
      addDataSource();
-      }
-    );
+    });
  });

  it('should be able to use all modes', () => {
--- a/e2e/various-suite/pie-chart.spec.ts
+++ b/e2e/various-suite/pie-chart.spec.ts
@ -4,7 +4,7 @@ import { e2e } from '../utils';

 describe('Pie Chart Panel', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Pie Chart rendering e2e tests', () => {
--- a/e2e/various-suite/query-editor.spec.ts
+++ b/e2e/various-suite/query-editor.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Query editor', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Undo should work in query editor for prometheus -- test CI.', () => {
--- a/e2e/various-suite/select-focus.spec.ts
+++ b/e2e/various-suite/select-focus.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Select focus/unfocus tests', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Tests select focus/unfocus scenarios', () => {
--- a/e2e/various-suite/solo-route.spec.ts
+++ b/e2e/various-suite/solo-route.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Solo Route', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Can view panels with shared queries in fullsceen', () => {
--- a/e2e/various-suite/trace-view-scrolling.spec.ts
+++ b/e2e/various-suite/trace-view-scrolling.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Trace view', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Can lazy load big traces', () => {
--- a/e2e/various-suite/visualization-suggestions.spec.ts
+++ b/e2e/various-suite/visualization-suggestions.spec.ts
@ -2,7 +2,7 @@ import { e2e } from '../utils';

 describe('Visualization suggestions', () => {
  beforeEach(() => {
-    e2e.flows.login(e2e.env('USERNAME'), e2e.env('PASSWORD'));
+    e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
  });

  it('Should be shown and clickable', () => {