IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

e2e tests: Add selector to close dashboard settings and use it in e2e tests (#65625)

Browse Source 
* add selector to close dashboard settings and use it in e2e tests

* check visibility of add panel button

* check visibility of add new panel button before clicking
This commit is contained in:
Ashley Harrison
2023-03-31 09:32:44 +01:00
committed by GitHub
parent bbf74b941b
commit a123e0a97c
10 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e2e/cloud-plugins-suite/azure-monitor.spec.ts
View File

@@ -2,6 +2,7 @@ import { load } from 'js-yaml';
import { v4 as uuidv4 } from 'uuid';
import { e2e } from '@grafana/e2e';
import { GrafanaBootConfig } from '@grafana/runtime';
import { selectors } from '../../public/app/plugins/datasource/azuremonitor/e2e/selectors';
import {
@@ -96,7 +97,15 @@ const addAzureMonitorVariable = (
break;
}
e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
e2e.components.PageToolbar.item('Go Back').click();
e2e()
.window()
.then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
if (win.grafanaBootData.settings.featureToggles.topnav) {
e2e.pages.Dashboard.Settings.Actions.close().click();
} else {
e2e.components.PageToolbar.item('Go Back').click();
}
});
};
e2e.scenario({

3
e2e/dashboards-suite/new-constant-variable.spec.ts
View File

@@ -2,7 +2,6 @@ import { e2e } from '@grafana/e2e';
import { GrafanaBootConfig } from '@grafana/runtime';
const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
const DASHBOARD_NAME = 'Test variable output';
describe('Variables - Constant', () => {
it('can add a new constant variable', () => {
@@ -27,7 +26,7 @@ describe('Variables - Constant', () => {
.window()
.then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
if (win.grafanaBootData.settings.featureToggles.topnav) {
e2e.components.Breadcrumbs.breadcrumb(DASHBOARD_NAME).click();
e2e.pages.Dashboard.Settings.Actions.close().click();
} else {
e2e.components.BackButton.backArrow().click({ force: true });
}

5
e2e/dashboards-suite/new-custom-variable.spec.ts
View File

@@ -2,7 +2,6 @@ import { e2e } from '@grafana/e2e';
import { GrafanaBootConfig } from '@grafana/runtime';
const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
const DASHBOARD_NAME = 'Test variable output';
function fillInCustomVariable(name: string, label: string, value: string) {
e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().within(() => {
@@ -36,7 +35,7 @@ describe('Variables - Custom', () => {
.window()
.then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
if (win.grafanaBootData.settings.featureToggles.topnav) {
e2e.components.Breadcrumbs.breadcrumb(DASHBOARD_NAME).click();
e2e.pages.Dashboard.Settings.Actions.close().click();
} else {
e2e.components.BackButton.backArrow().click({ force: true });
}
@@ -68,7 +67,7 @@ describe('Variables - Custom', () => {
.window()
.then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
if (win.grafanaBootData.settings.featureToggles.topnav) {
e2e.components.Breadcrumbs.breadcrumb('Test variable output').click();
e2e.pages.Dashboard.Settings.Actions.close().click();
} else {
e2e.components.BackButton.backArrow().click({ force: true });
}

3
e2e/dashboards-suite/new-datasource-variable.spec.ts
View File

@@ -2,7 +2,6 @@ import { e2e } from '@grafana/e2e';
import { GrafanaBootConfig } from '@grafana/runtime';
const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
const DASHBOARD_NAME = 'Test variable output';
describe('Variables - Datasource', () => {
it('can add a new datasource variable', () => {
@@ -35,7 +34,7 @@ describe('Variables - Datasource', () => {
.window()
.then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
if (win.grafanaBootData.settings.featureToggles.topnav) {
e2e.components.Breadcrumbs.breadcrumb(DASHBOARD_NAME).click();
e2e.pages.Dashboard.Settings.Actions.close().click();
} else {
e2e.components.BackButton.backArrow().click({ force: true });
}

3
e2e/dashboards-suite/new-interval-variable.spec.ts
View File

@@ -2,7 +2,6 @@ import { e2e } from '@grafana/e2e';
import { GrafanaBootConfig } from '@grafana/runtime';
const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
const DASHBOARD_NAME = 'Test variable output';
function assertPreviewValues(expectedValues: string[]) {
for (const expected of expectedValues) {
@@ -37,7 +36,7 @@ describe('Variables - Interval', () => {
.window()
.then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
if (win.grafanaBootData.settings.featureToggles.topnav) {
e2e.components.Breadcrumbs.breadcrumb(DASHBOARD_NAME).click();
e2e.pages.Dashboard.Settings.Actions.close().click();
} else {
e2e.components.BackButton.backArrow().click({ force: true });
}

5
e2e/dashboards-suite/new-query-variable.spec.ts
View File

@@ -2,7 +2,6 @@ import { e2e } from '@grafana/e2e';
import { GrafanaBootConfig } from '@grafana/runtime';
const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
const DASHBOARD_NAME = 'Templating - Nested Template Variables';
describe('Variables - Query - Add variable', () => {
it('query variable should be default and default fields should be correct', () => {
@@ -108,7 +107,7 @@ describe('Variables - Query - Add variable', () => {
.window()
.then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
if (win.grafanaBootData.settings.featureToggles.topnav) {
e2e.components.Breadcrumbs.breadcrumb(DASHBOARD_NAME).click();
e2e.pages.Dashboard.Settings.Actions.close().click();
} else {
e2e.components.BackButton.backArrow().click({ force: true });
}
@@ -180,7 +179,7 @@ describe('Variables - Query - Add variable', () => {
.window()
.then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
if (win.grafanaBootData.settings.featureToggles.topnav) {
e2e.components.Breadcrumbs.breadcrumb(DASHBOARD_NAME).click();
e2e.pages.Dashboard.Settings.Actions.close().click();
} else {
e2e.components.BackButton.backArrow().click({ force: true });
}

3
e2e/dashboards-suite/new-text-box-variable.spec.ts
View File

@@ -2,7 +2,6 @@ import { e2e } from '@grafana/e2e';
import { GrafanaBootConfig } from '@grafana/runtime';
const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
const DASHBOARD_NAME = 'Test variable output';
describe('Variables - Text box', () => {
it('can add a new text box variable', () => {
@@ -27,7 +26,7 @@ describe('Variables - Text box', () => {
.window()
.then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
if (win.grafanaBootData.settings.featureToggles.topnav) {
e2e.components.Breadcrumbs.breadcrumb(DASHBOARD_NAME).click();
e2e.pages.Dashboard.Settings.Actions.close().click();
} else {
e2e.components.BackButton.backArrow().click({ force: true });
}