less flaky tests for github actions

grafana · Mar 8, 2024 · ece4d73 · ece4d73
1 parent ec5bc4e
commit ece4d73
Showing 1 changed file with 44 additions and 2 deletions.
diff --git a/e2e/query-editor.spec.ts b/e2e/query-editor.spec.ts
@@ -90,6 +90,15 @@ test.describe('Prometheus query editor', () => {
       await expect(explorePage
         .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.queryField)).toBeVisible();
 
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.queryField).focus();
+
+      await expect(explorePage
+        .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton)).toBeVisible();
+
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton).focus();
+
       await explorePage
         .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton)
         .click()
@@ -128,6 +137,15 @@ test.describe('Prometheus query editor', () => {
       await expect(explorePage
         .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.queryField)).toBeVisible();
 
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.queryField).focus();
+
+      await expect(explorePage
+        .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton)).toBeVisible();
+
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton).focus();
+
       await explorePage
         .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.code.metricsBrowser.openButton)
         .click()
@@ -148,14 +166,17 @@ test.describe('Prometheus query editor', () => {
   });
 
   test.describe('Query builder', () => {
-    test('it navigates to the code editor with default editor type as builder', async ({
+    test('it navigates to the query builder with default editor type as builder', async ({
       readProvisionedDataSource,
       explorePage
     }) => {
       const dsDefaultEditorBuilder = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({ fileName: 'datasources.yml' });
 
       explorePage.datasource.set(dsDefaultEditorBuilder.name);
 
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus();
+
       await expect(explorePage
         .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)).toBeVisible();
     });
@@ -168,15 +189,27 @@ test.describe('Prometheus query editor', () => {
 
       explorePage.datasource.set(dsDefaultEditorBuilder.name);
 
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus();
+
       await expect(explorePage
         .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect)).toBeVisible();
 
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).focus();  
+
       await expect(explorePage
         .getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect)).toBeVisible();
+
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.QueryBuilder.matchOperatorSelect).focus();  
 
       await expect(explorePage
         .getByTestIdOrAriaLabel(selectors.components.QueryBuilder.matchOperatorSelect)).toBeVisible();
 
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.QueryBuilder.valueSelect).focus();  
+
       await expect(explorePage
         .getByTestIdOrAriaLabel(selectors.components.QueryBuilder.valueSelect)).toBeVisible();
     });
@@ -190,6 +223,9 @@ test.describe('Prometheus query editor', () => {
 
       explorePage.datasource.set(dsDefaultEditorBuilder.name);
 
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).focus();
+
       await explorePage.getByTestIdOrAriaLabel(selectors.components.DataSource.Prometheus.queryEditor.builder.metricSelect).click()
 
       await page.getByText(metric, { exact: true }).click();
@@ -207,7 +243,13 @@ test.describe('Prometheus query editor', () => {
       const dsDefaultEditorBuilder = await readProvisionedDataSource<DataSourcePluginOptionsEditorProps<PromOptions>>({ fileName: 'datasources.yml' });
 
       explorePage.datasource.set(dsDefaultEditorBuilder.name);
-
+
+      await explorePage
+        .getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).focus();  
+
+      await expect(explorePage
+        .getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect)).toBeVisible();
+
       await explorePage.getByTestIdOrAriaLabel(selectors.components.QueryBuilder.labelSelect).click()
 
       await page.getByText('__name__', { exact: true }).click();