diff --git a/grafana-plugin/e2e-tests/pluginInitialization/initialization.test.ts b/grafana-plugin/e2e-tests/pluginInitialization/initialization.test.ts index c0f95d0ec8..0befb993ad 100644 --- a/grafana-plugin/e2e-tests/pluginInitialization/initialization.test.ts +++ b/grafana-plugin/e2e-tests/pluginInitialization/initialization.test.ts @@ -1,3 +1,5 @@ +import semver from 'semver'; + import { test, expect } from '../fixtures'; import { OrgRole } from '../utils/constants'; import { goToGrafanaPage, goToOnCallPage } from '../utils/navigation'; @@ -34,6 +36,11 @@ test.describe('Plugin initialization', () => { adminRolePage: { page }, browser, }) => { + test.skip( + semver.lt(process.env.CURRENT_GRAFANA_VERSION, '10.3.0'), + 'Extension is only available in Grafana 10.3.0 and above' + ); + // Create new editor user const USER_NAME = `editor-${new Date().getTime()}`; await createGrafanaUser({ page, username: USER_NAME, role: OrgRole.Editor }); diff --git a/grafana-plugin/e2e-tests/utils/users.ts b/grafana-plugin/e2e-tests/utils/users.ts index 996b4a6e7a..03972f8f5c 100644 --- a/grafana-plugin/e2e-tests/utils/users.ts +++ b/grafana-plugin/e2e-tests/utils/users.ts @@ -77,9 +77,9 @@ export const createGrafanaUser = async ({ export const loginAndWaitTillGrafanaIsLoaded = async ({ page, username }: { page: Page; username: string }) => { await goToGrafanaPage(page, '/login'); - await page.getByLabel('Email or username').fill(username); - await page.getByLabel(/Password/).fill(username); - await clickButton({ page, buttonText: 'Log in' }); + await page.getByPlaceholder(/Email or username/i).fill(username); + await page.getByPlaceholder(/Password/i).fill(username); + await page.locator('button[type="submit"]').click(); await page.getByText('Welcome to Grafana').waitFor(); await page.waitForLoadState('networkidle');