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: Use latest version of plugin-e2e (#85669)

Browse Source 
use latest plugin-e2e
This commit is contained in:
Erik Sundell 2024-04-08 08:54:27 +02:00 committed by GitHub
parent fb1afa0c34
commit 170131a4f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
e2e/plugin-e2e/mysql/mysql.spec.ts
View File

@ -28,7 +28,7 @@ test.beforeEach(async ({ context, selectors, explorePage }) => {
test('code editor autocomplete should handle table name escaping/quoting', async ({ explorePage, selectors, page }) => { test('code editor autocomplete should handle table name escaping/quoting', async ({ explorePage, selectors, page }) => {
await page.getByLabel('Code').check(); await page.getByLabel('Code').check();
const editor = explorePage.getByTestIdOrAriaLabel(selectors.components.CodeEditor.container).getByRole('textbox'); const editor = explorePage.getByGrafanaSelector(selectors.components.CodeEditor.container).getByRole('textbox');
await editor.fill('S'); await editor.fill('S');
await page.getByLabel('SELECT <column> FROM <table>').locator('a').click(); await page.getByLabel('SELECT <column> FROM <table>').locator('a').click();
await expect(page.getByLabel(tableNameWithSpecialCharacter)).toBeVisible(); await expect(page.getByLabel(tableNameWithSpecialCharacter)).toBeVisible();
@ -45,11 +45,11 @@ test('code editor autocomplete should handle table name escaping/quoting', async
}); });
test('visual query builder should handle time filter macro', async ({ explorePage, page }) => { test('visual query builder should handle time filter macro', async ({ explorePage, page }) => {
await explorePage.getByTestIdOrAriaLabel(selectors.components.SQLQueryEditor.headerTableSelector).click(); await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.headerTableSelector).click();
await page.getByText(normalTableName, { exact: true }).click(); await page.getByText(normalTableName, { exact: true }).click();
// Open column selector // Open column selector
await explorePage.getByTestIdOrAriaLabel(selectors.components.SQLQueryEditor.selectColumn).click(); await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.selectColumn).click();
const select = page.getByLabel('Select options menu'); const select = page.getByLabel('Select options menu');
await select.locator(page.getByText('createdAt')).click(); await select.locator(page.getByText('createdAt')).click();
@ -61,30 +61,30 @@ test('visual query builder should handle time filter macro', async ({ explorePag
await page.getByRole('button', { name: 'Add filter' }).click(); // For some reason we need to click twice await page.getByRole('button', { name: 'Add filter' }).click(); // For some reason we need to click twice
// Open field selector // Open field selector
await explorePage.getByTestIdOrAriaLabel(selectors.components.SQLQueryEditor.filterField).click(); await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.filterField).click();
await select.locator(page.getByText('createdAt')).click(); await select.locator(page.getByText('createdAt')).click();
// Open operator selector // Open operator selector
await explorePage.getByTestIdOrAriaLabel(selectors.components.SQLQueryEditor.filterOperator).click(); await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.filterOperator).click();
await select.locator(page.getByText('Macros')).click(); await select.locator(page.getByText('Macros')).click();
// Open macros value selector // Open macros value selector
await explorePage.getByTestIdOrAriaLabel('Macros value selector').click(); await explorePage.getByGrafanaSelector('Macros value selector').click();
await select.locator(page.getByText('timeFilter', { exact: true })).click(); await select.locator(page.getByText('timeFilter', { exact: true })).click();
// Validate that the timeFilter macro was added // Validate that the timeFilter macro was added
await expect( await expect(
explorePage.getByTestIdOrAriaLabel(selectors.components.CodeEditor.container).getByRole('textbox') explorePage.getByGrafanaSelector(selectors.components.CodeEditor.container).getByRole('textbox')
).toHaveValue(`SELECT\n createdAt\nFROM\n DataMaker.normalTable\nWHERE\n $__timeFilter(createdAt)\nLIMIT\n 50`); ).toHaveValue(`SELECT\n createdAt\nFROM\n DataMaker.normalTable\nWHERE\n $__timeFilter(createdAt)\nLIMIT\n 50`);
// Validate that the timeFilter macro was removed when changed to equals operator // Validate that the timeFilter macro was removed when changed to equals operator
await explorePage.getByTestIdOrAriaLabel(selectors.components.SQLQueryEditor.filterOperator).click(); await explorePage.getByGrafanaSelector(selectors.components.SQLQueryEditor.filterOperator).click();
await select.locator(page.getByText('==')).click(); await select.locator(page.getByText('==')).click();
await explorePage.getByTestIdOrAriaLabel(selectors.components.DateTimePicker.input).click(); await explorePage.getByGrafanaSelector(selectors.components.DateTimePicker.input).click();
await explorePage.getByTestIdOrAriaLabel(selectors.components.DateTimePicker.input).blur(); await explorePage.getByGrafanaSelector(selectors.components.DateTimePicker.input).blur();
await expect( await expect(
explorePage.getByTestIdOrAriaLabel(selectors.components.CodeEditor.container).getByRole('textbox') explorePage.getByGrafanaSelector(selectors.components.CodeEditor.container).getByRole('textbox')
).not.toHaveValue(`SELECT\n createdAt\nFROM\n DataMaker.normalTable\nWHERE\n createdAt = NULL\nLIMIT\n 50`); ).not.toHaveValue(`SELECT\n createdAt\nFROM\n DataMaker.normalTable\nWHERE\n createdAt = NULL\nLIMIT\n 50`);
}); });

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

@ -40,7 +40,7 @@ test.describe('query editor with mocked responses', () => {
const queryEditorRow = await panelEditPage.getQueryEditorRow('A'); const queryEditorRow = await panelEditPage.getQueryEditorRow('A');
await queryEditorRow.getByLabel('Scenario').last().click(); await queryEditorRow.getByLabel('Scenario').last().click();
await expect( await expect(
panelEditPage.getByTestIdOrAriaLabel(selectors.components.Select.option), panelEditPage.getByGrafanaSelector(selectors.components.Select.option),
formatExpectError('Expected certain select options to be displayed after clicking on the select input') formatExpectError('Expected certain select options to be displayed after clicking on the select input')
).toHaveText(scenarios.map((s) => s.name)); ).toHaveText(scenarios.map((s) => s.name));
}); });
@ -55,7 +55,7 @@ test.describe('query editor with mocked responses', () => {
formatExpectError('Did not expect panel error to be displayed after query execution') formatExpectError('Did not expect panel error to be displayed after query execution')
).not.toBeVisible(); ).not.toBeVisible();
await expect( await expect(
panelEditPage.getByTestIdOrAriaLabel(selectors.components.Panels.Visualization.Table.body), panelEditPage.getByGrafanaSelector(selectors.components.Panels.Visualization.Table.body),
formatExpectError('Expected certain select options to be displayed after clicking on the select input') formatExpectError('Expected certain select options to be displayed after clicking on the select input')
).toHaveText('val1val2val3val4'); ).toHaveText('val1val2val3val4');
}); });
@ -69,12 +69,12 @@ test.describe('edit panel plugin settings', () => {
}) => { }) => {
await panelEditPage.setVisualization(TABLE_VIZ_NAME); await panelEditPage.setVisualization(TABLE_VIZ_NAME);
await expect( await expect(
panelEditPage.getByTestIdOrAriaLabel(selectors.components.PanelEditor.toggleVizPicker), panelEditPage.getByGrafanaSelector(selectors.components.PanelEditor.toggleVizPicker),
formatExpectError('Expected panel visualization to be set to table') formatExpectError('Expected panel visualization to be set to table')
).toHaveText(TABLE_VIZ_NAME); ).toHaveText(TABLE_VIZ_NAME);
await panelEditPage.setPanelTitle(PANEL_TITLE); await panelEditPage.setPanelTitle(PANEL_TITLE);
await expect( await expect(
panelEditPage.getByTestIdOrAriaLabel(selectors.components.Panels.Panel.title(PANEL_TITLE)), panelEditPage.getByGrafanaSelector(selectors.components.Panels.Panel.title(PANEL_TITLE)),
formatExpectError('Expected panel title to be updated') formatExpectError('Expected panel title to be updated')
).toBeVisible(); ).toBeVisible();
await panelEditPage.collapseSection(STANDARD_OTIONS_CATEGORY); await panelEditPage.collapseSection(STANDARD_OTIONS_CATEGORY);

2
e2e/plugin-e2e/plugin-e2e-api-tests/as-admin-user/variableEditPage.spec.ts
View File

@ -6,7 +6,7 @@ import { prometheusLabels } from '../mocks/resources';
test('variable query with mocked response', async ({ variableEditPage, page }) => { test('variable query with mocked response', async ({ variableEditPage, page }) => {
variableEditPage.mockResourceResponse('api/v1/labels?*', prometheusLabels); variableEditPage.mockResourceResponse('api/v1/labels?*', prometheusLabels);
await variableEditPage.datasource.set('gdev-prometheus'); await variableEditPage.datasource.set('gdev-prometheus');
await variableEditPage.getByTestIdOrAriaLabel('Query type').fill('Label names'); await variableEditPage.getByGrafanaSelector('Query type').fill('Label names');
await page.keyboard.press('Tab'); await page.keyboard.press('Tab');
await variableEditPage.runQuery(); await variableEditPage.runQuery();
await expect( await expect(

2
package.json
View File

@ -77,7 +77,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.25.0", "@grafana/plugin-e2e": "1.0.1",
"@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.42.1", "@playwright/test": "1.42.1",

10
yarn.lock
View File

@ -3969,16 +3969,16 @@ __metadata:
languageName: unknown languageName: unknown
linkType: soft linkType: soft
"@grafana/plugin-e2e@npm:^0.25.0": "@grafana/plugin-e2e@npm:1.0.1":
version: 0.25.1 version: 1.0.1
resolution: "@grafana/plugin-e2e@npm:0.25.1" resolution: "@grafana/plugin-e2e@npm:1.0.1"
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/7a478d280202e4757df8152bf47779f107a14007ac5644fec4a691d939dbc0a4ee1b57a4be1b1eaaf85a07365a9287ce5c32e24a0333fa7ead89f638014834ca checksum: 10/9188ea2d5a860e8b14cfe33422ca24d742b6f1bc3dd023a95d53872b8656c489329ad8f7f14bffe336858724c13669574f8c89e4b99a2db6d78027f824f5116f
languageName: node languageName: node
linkType: hard linkType: hard
@ -18647,7 +18647,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.25.0" "@grafana/plugin-e2e": "npm:1.0.1"
"@grafana/prometheus": "workspace:*" "@grafana/prometheus": "workspace:*"
"@grafana/runtime": "workspace:*" "@grafana/runtime": "workspace:*"
"@grafana/saga-icons": "workspace:*" "@grafana/saga-icons": "workspace:*"