Skip to content

Chore: Update to latest e2e-selectors#2569

Merged
sunker merged 3 commits intomainfrom
ash/update-to-latest-e2e-selectors
Apr 13, 2026
Merged

Chore: Update to latest e2e-selectors#2569
sunker merged 3 commits intomainfrom
ash/update-to-latest-e2e-selectors

Conversation

@ashharrison90
Copy link
Copy Markdown
Contributor

@ashharrison90 ashharrison90 commented Apr 9, 2026

What this PR does / why we need it:

  • updates to the latest e2e-selectors
  • disables the splash screen
  • fixes a couple of methods to work with the new selectors
  • disables dashboardNewLayouts
    • this needs fixing, but i'm not the person to do it 😅

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

📦 Published PR as canary version: Canary Versions

✨ Test out this PR locally via:

npm install @grafana/plugin-e2e@3.4.13-canary.2569.24237094857.0
# or 
yarn add @grafana/plugin-e2e@3.4.13-canary.2569.24237094857.0

@ashharrison90 ashharrison90 requested a review from jackw April 9, 2026 15:03
@ashharrison90 ashharrison90 self-assigned this Apr 9, 2026
Copilot AI review requested due to automatic review settings April 9, 2026 15:03
@ashharrison90 ashharrison90 requested a review from a team as a code owner April 9, 2026 15:03
@ashharrison90 ashharrison90 requested a review from oshirohugo April 9, 2026 15:03
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 9, 2026

Hello! 👋 This repository uses Auto for releasing packages using PR labels.

✨ This PR can be merged and will trigger a new patch release.
NOTE: When merging a PR with the release label please avoid merging another PR. For further information see here.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the @grafana/plugin-e2e test harness to align with the latest @grafana/e2e-selectors, adjusting affected selectors/usages and tweaking the local Grafana docker setup to keep the e2e suite stable.

Changes:

  • Bump @grafana/e2e-selectors to a newer build.
  • Update a panel edit test and alert rule page object to use updated selector/label behavior.
  • Disable Grafana splashScreen and dashboardNewLayouts feature toggles in the plugin-e2e docker compose environment.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File Description
packages/plugin-e2e/tests/as-admin-user/panel/panelEdit.spec.ts Updates a color picker option label to match new selector/label expectations.
packages/plugin-e2e/src/models/pages/AlertRuleEditPage.ts Switches default query row lookup to use Grafana selectors instead of a hard-coded test id.
packages/plugin-e2e/package.json Bumps @grafana/e2e-selectors dependency version.
packages/plugin-e2e/docker-compose.yaml Disables splash screen and new dashboard layouts to reduce e2e friction.

Comment on lines 50 to 55
},
"dependencies": {
"@grafana/e2e-selectors": "13.0.0-23624974663",
"@grafana/e2e-selectors": "13.0.0-24159250795",
"semver": "^7.5.4",
"uuid": "^13.0.0",
"yaml": "^2.3.4"
Copy link

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grafana/e2e-selectors was bumped here, but the repo-level package-lock.json still pins the previous version. This will cause CI installs to keep using the old selectors unless the lockfile is updated (run npm install / update the lockfile).

Copilot uses AI. Check for mistakes.
return new AlertRuleQuery(this.ctx, this.ctx.page.getByTestId('query-editor-row'));
return new AlertRuleQuery(
this.ctx,
this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRows.rows)
Copy link

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the advanced-mode-disabled branch, QueryEditorRows.rows is passed directly as the query root. Since this selector represents a collection of rows (used elsewhere with .filter()/.last()), this can unintentionally target multiple rows and later actions may fail Playwright strictness or operate on the wrong row. Narrow the locator to a single row (e.g. .first()), or otherwise uniquely identify the default row.

Suggested change
this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRows.rows)
this.getByGrafanaSelector(this.ctx.selectors.components.QueryEditorRows.rows).first()

Copilot uses AI. Check for mistakes.
@grafana-plugins-platform-bot grafana-plugins-platform-bot bot moved this from 📬 Triage to 🔬 In review in Grafana Catalog Team Apr 9, 2026
@ashharrison90 ashharrison90 added patch Increment the patch version when merged release Create a release when this pr is merged labels Apr 10, 2026
@github-actions
Copy link
Copy Markdown
Contributor

Playwright test results

Image Name Version Result Report
grafana-dev 13.1.0-24236083202
grafana-enterprise 12.4.2
grafana-enterprise 12.0.10
grafana-enterprise 10.4.19
grafana-enterprise 9.3.16
grafana-enterprise 8.5.27
Troubleshooting

404 when clicking on View report

By default, the deploy-report-pages Action deploys reports to the gh-pages branch. However, you need to take an extra step to ensure that GitHub Pages can build and serve the site from this branch. To do so:

  1. Go to the Settings tab of your repository.
  2. In the left-hand sidebar, click on Pages.
  3. Under Source, select Deploy from a branch, then choose the gh-pages branch.

This action needs to be completed manually in order for your GitHub Pages site to be built and accessible from the gh-pages branch. Once configured, GitHub will automatically build and serve the site whenever new reports are deployed.

Copy link
Copy Markdown
Contributor

@sunker sunker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for raising this @ashharrison90!

I created an issue for adding support for new dashboard layout and splash screen in plugin e2e. Will look into this asap.

@sunker sunker merged commit 180f31d into main Apr 13, 2026
52 of 55 checks passed
@sunker sunker deleted the ash/update-to-latest-e2e-selectors branch April 13, 2026 08:55
@github-project-automation github-project-automation bot moved this from 🔬 In review to 🚀 Shipped in Grafana Catalog Team Apr 13, 2026
@grafana-plugins-platform-bot
Copy link
Copy Markdown
Contributor

🚀 PR was released in @grafana/plugin-e2e@3.4.13 🚀

@grafana-plugins-platform-bot grafana-plugins-platform-bot bot added the released This issue/pull request has been released. label Apr 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

patch Increment the patch version when merged release Create a release when this pr is merged released This issue/pull request has been released.

Projects

Status: 🚀 Shipped

Development

Successfully merging this pull request may close these issues.

3 participants