Plugin E2E: Fix some APIs that were broken in older versions of Grafa…

…na (#1391)

.github/workflows/playwright.yml

@@ -25,6 +25,7 @@ jobs:
         with:
           version-resolver-type: plugin-grafana-dependency
           grafana-dependency: '>=8.5.0'
+          # limit: 0 # Uncomment to test all versions since 8.5.0. Useful when testing compatibility for new APIs.
 
   playwright-tests:
     needs: resolve-versions
@@ -82,7 +83,7 @@ jobs:
           GOOGLE_JWT_FILE: ${{ secrets.GOOGLE_JWT_FILE }}
 
       - name: Publish report to GCS
-        if: ${{ github.repository_owner == 'grafana' && (always() && steps.run-tests.outcome == 'success') || (failure() && steps.run-tests.outcome == 'failure') }}
+        if: ${{ github.repository_owner == 'grafana' && (failure() && steps.run-tests.outcome == 'failure') }}
         uses: grafana/plugin-actions/publish-report@main
         with:
           grafana-version: ${{ matrix.GRAFANA_IMAGE.VERSION }}

.gitignore

@@ -40,6 +40,8 @@ playwright-report/
 packages/plugin-e2e/test-results/
 packages/plugin-e2e/playwright/.cache/
 packages/plugin-e2e/playwright/.auth
+playwright/.cache/
+playwright/.auth
 .nx
 
 # Used in CI to pass built packages to the next job

packages/plugin-e2e/package.json

@@ -43,7 +43,7 @@
     "dotenv": "^16.3.1"
   },
   "dependencies": {
-    "@grafana/e2e-selectors": "^11.5.0-211617",
+    "@grafana/e2e-selectors": "^11.5.0-212629",
     "semver": "^7.5.4",
     "uuid": "^11.0.2",
     "yaml": "^2.3.4"

packages/plugin-e2e/src/models/components/Panel.ts

@@ -6,7 +6,10 @@ import { GrafanaPage } from '../pages/GrafanaPage';
 const ERROR_STATUS = 'error';
 
 export class Panel extends GrafanaPage {
-  constructor(readonly ctx: PluginTestCtx, readonly locator: Locator) {
+  constructor(
+    readonly ctx: PluginTestCtx,
+    readonly locator: Locator
+  ) {
     super(ctx);
   }
 
@@ -66,7 +69,7 @@ export class Panel extends GrafanaPage {
     let selector = this.ctx.selectors.components.Panels.Panel.status(ERROR_STATUS);
 
     // the selector (not the selector value) used to identify a panel error changed in 9.4.3
-    if (semver.lte(this.ctx.grafanaVersion, '9.4.3')) {
+    if (semver.lt(this.ctx.grafanaVersion, '9.5.0')) {
       selector = this.ctx.selectors.components.Panels.Panel.headerCornerInfo(ERROR_STATUS);
     }
 

packages/plugin-e2e/src/models/pages/DashboardPage.ts

@@ -87,7 +87,7 @@ export class DashboardPage extends GrafanaPage {
       await this.getByGrafanaSelector(components.NavToolbar.editDashboard.editButton).click();
     }
 
-    if (semver.gte(this.ctx.grafanaVersion, '10.0.0')) {
+    if (semver.gte(this.ctx.grafanaVersion, '9.5.0')) {
       await this.getByGrafanaSelector(components.PageToolbar.itemButton(constants.PageToolBar.itemButtonTitle)).click();
       await this.getByGrafanaSelector(pages.AddDashboard.itemButton(pages.AddDashboard.itemButtonAddViz)).click();
     } else {

packages/plugin-e2e/src/models/pages/PanelEditPage.ts

@@ -130,10 +130,8 @@ export class PanelEditPage extends GrafanaPage {
       await this.getByGrafanaSelector(
         this.ctx.selectors.components.NavToolbar.editDashboard.backToDashboardButton
       ).click();
-    } else if (semver.gte(this.ctx.grafanaVersion, '9.0.0')) {
-      await this.ctx.page.getByTestId(this.ctx.selectors.components.PanelEditor.applyButton).click();
     } else {
-      await this.ctx.page.getByLabel('panel editor apply').click();
+      await this.getByGrafanaSelector(this.ctx.selectors.components.PanelEditor.applyButton).click();
     }
 
     return new DashboardPage(this.ctx, this.args);

packages/plugin-e2e/src/selectors/versionedAPIs.ts

@@ -22,7 +22,7 @@ export const versionedAPIs = {
       [MIN_GRAFANA_VERSION]: '/api/ds/query',
     },
     health: {
-      '9.5.0': (uid: string, _: string) => `/api/datasources/uid/${uid}/health`,
+      '9.4.0': (uid: string, _: string) => `/api/datasources/uid/${uid}/health`,
       [MIN_GRAFANA_VERSION]: (_: string, id: string) => `/api/datasources/${id}/health`,
     },
     datasourceByUID: {