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

@grafana/e2e: improvements (#25908)

Browse Source 
* Set time range when creating a dashboard

* Optionally set time range when opening a dashboard

* Default time range to 6 hours instead of 1 hour

* Minor changes
This commit is contained in:
Steven Vachon 2020-06-29 16:04:38 -04:00 committed by GitHub
parent d21558231f
commit 49e629b278
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/grafana-e2e/src/flows/addDashboard.ts
View File

@ -1,9 +1,11 @@
import { DashboardTimeRangeConfig, setDashboardTimeRange } from './setDashboardTimeRange';
import { DeleteDashboardConfig } from './deleteDashboard';
import { e2e } from '../index';
import { getDashboardUid } from '../support/url';
import { selectOption } from './selectOption';
export interface AddDashboardConfig {
timeRange: DashboardTimeRangeConfig;
timezone: string;
title: string;
}
@ -11,12 +13,16 @@ export interface AddDashboardConfig {
// @todo this actually returns type `Cypress.Chainable`
export const addDashboard = (config?: Partial<AddDashboardConfig>): any => {
const fullConfig = {
timeRange: {
from: '2020-01-01 00:00:00',
to: '2020-01-01 06:00:00',
},
timezone: 'Coordinated Universal Time',
title: `e2e-${Date.now()}`,
...config,
} as AddDashboardConfig;
const { timezone, title } = fullConfig;
const { timeRange, timezone, title } = fullConfig;
e2e().logToConsole('Adding dashboard with title:', title);
@ -24,9 +30,16 @@ export const addDashboard = (config?: Partial<AddDashboardConfig>): any => {
e2e.pages.Dashboard.Toolbar.toolbarItems('Dashboard settings').click();
// @todo use the time range picker's time zone control
selectOption(e2e.pages.Dashboard.Settings.General.timezone(), timezone);
e2e.pages.Dashboard.Settings.General.saveDashBoard().click();
e2e.components.BackButton.backArrow().click();
if (timeRange) {
setDashboardTimeRange(timeRange);
}
e2e.pages.Dashboard.Toolbar.toolbarItems('Save dashboard').click();
e2e.pages.SaveDashboardAsModal.newName()
.clear()

32
packages/grafana-e2e/src/flows/openDashboard.ts
View File

@ -1,21 +1,15 @@
import { DashboardTimeRangeConfig, setDashboardTimeRange } from './setDashboardTimeRange';
import { e2e } from '../index';
import { getScenarioContext } from '../support/scenarioContext';
export interface OpenDashboardConfig {
timeRange?: DashboardTimeRangeConfig;
uid: string;
timeRange: {
from: string;
to: string;
};
}
export const openDashboard = (config?: Partial<OpenDashboardConfig>) =>
getScenarioContext().then(({ lastAddedDashboardUid }: any) => {
const fullConfig = {
timeRange: {
from: '2020-01-01 00:00:00',
to: '2020-01-01 01:00:00',
},
uid: lastAddedDashboardUid,
...config,
} as OpenDashboardConfig;
@ -24,25 +18,9 @@ export const openDashboard = (config?: Partial<OpenDashboardConfig>) =>
e2e.pages.Dashboard.visit(uid);
e2e.pages.Dashboard.Toolbar.navBar().within(() => {
e2e()
.get('[aria-label="TimePicker Open Button"]')
.click();
e2e()
.get('[aria-label="TimePicker absolute time range"]')
.click();
e2e()
.get('[aria-label="TimePicker from field"]')
.clear()
.type(timeRange.from);
e2e()
.get('[aria-label="TimePicker to field"]')
.clear()
.type(timeRange.to);
e2e()
.get('[aria-label="TimePicker submit button"]')
.click();
});
if (timeRange) {
setDashboardTimeRange(timeRange);
}
// @todo remove `wrap` when possible
return e2e().wrap({ config: fullConfig });

27
packages/grafana-e2e/src/flows/setDashboardTimeRange.ts Normal file
View File

@ -0,0 +1,27 @@
import { e2e } from '../index';
export interface DashboardTimeRangeConfig {
from: string;
to: string;
}
export const setDashboardTimeRange = ({ from, to }: DashboardTimeRangeConfig) =>
e2e.pages.Dashboard.Toolbar.navBar().within(() => {
e2e()
.get('[aria-label="TimePicker Open Button"]')
.click();
e2e()
.get('[aria-label="TimePicker absolute time range"]')
.click();
e2e()
.get('[aria-label="TimePicker from field"]')
.clear()
.type(from);
e2e()
.get('[aria-label="TimePicker to field"]')
.clear()
.type(to);
e2e()
.get('[aria-label="TimePicker submit button"]')
.click();
});