Merge branch 'brojd/plugin-initialization-improvements' into matias-e…

…ngine-sync-with-dominik-improvements
grafana · Jun 27, 2024 · eb32361 · eb32361
2 parents e361d63 + 28ffbb3
commit eb32361
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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');