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

Chore: Bump to latest version of plugin-e2e (#84370)

Browse Source 
bump plugin-e2e and update tests
This commit is contained in:
Erik Sundell 2024-03-13 14:37:28 +01:00 committed by GitHub
parent 0604ddac13
commit c0933fa6bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelDataAssertion.spec.ts
View File

@ -1,4 +1,4 @@
import { expect, test, PanelEditPage, DashboardPage } from '@grafana/plugin-e2e'; import { expect, test, DashboardPage } from '@grafana/plugin-e2e';
import { formatExpectError } from '../errors'; import { formatExpectError } from '../errors';
import { successfulDataQuery } from '../mocks/queries'; import { successfulDataQuery } from '../mocks/queries';
@ -6,17 +6,8 @@ import { successfulDataQuery } from '../mocks/queries';
const REACT_TABLE_DASHBOARD = { uid: 'U_bZIMRMk' }; const REACT_TABLE_DASHBOARD = { uid: 'U_bZIMRMk' };
test.describe('panel edit page', () => { test.describe('panel edit page', () => {
test('table panel data assertions with provisioned dashboard', async ({ test('table panel data assertions with provisioned dashboard', async ({ gotoPanelEditPage }) => {
page, const panelEditPage = await gotoPanelEditPage({ dashboard: REACT_TABLE_DASHBOARD, id: '4' });
selectors,
grafanaVersion,
request,
}) => {
const panelEditPage = new PanelEditPage(
{ page, selectors, grafanaVersion, request },
{ dashboard: REACT_TABLE_DASHBOARD, id: '4' }
);
await panelEditPage.goto();
await expect( await expect(
panelEditPage.panel.locator, panelEditPage.panel.locator,
formatExpectError('Could not locate panel in panel edit page') formatExpectError('Could not locate panel in panel edit page')
@ -70,15 +61,15 @@ test.describe('panel edit page', () => {
}); });
test.describe('dashboard page', () => { test.describe('dashboard page', () => {
test('getting panel by title', async ({ page, selectors, grafanaVersion, request }) => { test('getting panel by title', async ({ gotoDashboardPage }) => {
const dashboardPage = new DashboardPage({ page, selectors, grafanaVersion, request }, REACT_TABLE_DASHBOARD); const dashboardPage = await gotoDashboardPage(REACT_TABLE_DASHBOARD);
await dashboardPage.goto(); await dashboardPage.goto();
const panel = await dashboardPage.getPanelByTitle('Colored background'); const panel = await dashboardPage.getPanelByTitle('Colored background');
await expect(panel.fieldNames).toContainText(['Field', 'Max', 'Mean', 'Last']); await expect(panel.fieldNames).toContainText(['Field', 'Max', 'Mean', 'Last']);
}); });
test('getting panel by id', async ({ page, selectors, grafanaVersion, request }) => { test('getting panel by id', async ({ gotoDashboardPage }) => {
const dashboardPage = new DashboardPage({ page, selectors, grafanaVersion, request }, REACT_TABLE_DASHBOARD); const dashboardPage = await gotoDashboardPage(REACT_TABLE_DASHBOARD);
await dashboardPage.goto(); await dashboardPage.goto();
const panel = await dashboardPage.getPanelById('4'); const panel = await dashboardPage.getPanelById('4');
await expect(panel.fieldNames, formatExpectError('Could not locate header elements in table panel')).toContainText([ await expect(panel.fieldNames, formatExpectError('Could not locate header elements in table panel')).toContainText([

4
e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/panelEditPage.spec.ts
View File

@ -33,9 +33,7 @@ test.describe('query editor query data', () => {
}); });
test.describe('query editor with mocked responses', () => { test.describe('query editor with mocked responses', () => {
test('and resource `scenarios` is mocked', async ({ page, selectors, grafanaVersion, request }) => { test('and resource `scenarios` is mocked', async ({ selectors, dashboardPage }) => {
const dashboardPage = new DashboardPage({ page, selectors, grafanaVersion, request });
await dashboardPage.goto();
await dashboardPage.mockResourceResponse('scenarios', scenarios); await dashboardPage.mockResourceResponse('scenarios', scenarios);
const panelEditPage = await dashboardPage.addPanel(); const panelEditPage = await dashboardPage.addPanel();
await panelEditPage.datasource.set('gdev-testdata'); await panelEditPage.datasource.set('gdev-testdata');

2
package.json
View File

@ -75,7 +75,7 @@
"@emotion/eslint-plugin": "11.11.0", "@emotion/eslint-plugin": "11.11.0",
"@grafana/eslint-config": "7.0.0", "@grafana/eslint-config": "7.0.0",
"@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules", "@grafana/eslint-plugin": "link:./packages/grafana-eslint-rules",
"@grafana/plugin-e2e": "^0.19.0", "@grafana/plugin-e2e": "^0.21.0",
"@grafana/tsconfig": "^1.3.0-rc1", "@grafana/tsconfig": "^1.3.0-rc1",
"@manypkg/get-packages": "^2.2.0", "@manypkg/get-packages": "^2.2.0",
"@playwright/test": "^1.41.2", "@playwright/test": "^1.41.2",

10
yarn.lock
View File

@ -3890,16 +3890,16 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@grafana/plugin-e2e@npm:^0.19.0": "@grafana/plugin-e2e@npm:^0.21.0":
version: 0.19.0 version: 0.21.0
resolution: "@grafana/plugin-e2e@npm:0.19.0" resolution: "@grafana/plugin-e2e@npm:0.21.0"
dependencies: dependencies:
semver: "npm:^7.5.4" semver: "npm:^7.5.4"
uuid: "npm:^9.0.1" uuid: "npm:^9.0.1"
yaml: "npm:^2.3.4" yaml: "npm:^2.3.4"
peerDependencies: peerDependencies:
"@playwright/test": ^1.41.2 "@playwright/test": ^1.41.2
checksum: 10/d47913d4abd07b245892d834b06ca44ecec767151134575d9e2679b93fad190cd6957542f6f0ddd12eaa4199b3282b557ddbb0ba88df13eb107986e35ed17d62 checksum: 10/0c158508e425ed1fe1219dde66149f23ede1a6d39219a688e351ac8cdac9938aeea65d922d0fd0965203069c8a7844afc3bac4f04c5f78f6bee3535b7de9b1ac
languageName: node languageName: node
linkType: hard linkType: hard
@ -18397,7 +18397,7 @@ __metadata:
"@grafana/lezer-logql": "npm:0.2.3" "@grafana/lezer-logql": "npm:0.2.3"
"@grafana/monaco-logql": "npm:^0.0.7" "@grafana/monaco-logql": "npm:^0.0.7"
"@grafana/o11y-ds-frontend": "workspace:*" "@grafana/o11y-ds-frontend": "workspace:*"
"@grafana/plugin-e2e": "npm:^0.19.0" "@grafana/plugin-e2e": "npm:^0.21.0"
"@grafana/prometheus": "workspace:*" "@grafana/prometheus": "workspace:*"
"@grafana/runtime": "workspace:*" "@grafana/runtime": "workspace:*"
"@grafana/scenes": "npm:^3.11.0" "@grafana/scenes": "npm:^3.11.0"