From 82b20b7c4399cb8e81187e75b60807129d7e4ce2 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 9 Feb 2022 10:54:10 +0100 Subject: [PATCH] Remove unified alerting specific assertions from panel base spec (#44961) (#45047) (cherry picked from commit e50a78a61af096e20c4bd5623b48e25285cb14b6) Co-authored-by: Konrad Lalik --- e2e/panels-suite/panelEdit_base.spec.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/e2e/panels-suite/panelEdit_base.spec.ts b/e2e/panels-suite/panelEdit_base.spec.ts index 5bc8545c12f..121111ec9d8 100644 --- a/e2e/panels-suite/panelEdit_base.spec.ts +++ b/e2e/panels-suite/panelEdit_base.spec.ts @@ -7,7 +7,7 @@ e2e.scenario({ itName: 'Tests various Panel edit scenarios', addScenarioDataSource: false, addScenarioDashBoard: false, - skipScenario: true, + skipScenario: false, scenario: () => { e2e().intercept('/api/ds/query').as('query'); e2e.flows.openDashboard({ uid: 'TkZXxlNG3' }); @@ -46,11 +46,16 @@ e2e.scenario({ // Can change to Alerts tab (graph panel is the default vis so the alerts tab should be rendered) e2e.components.Tab.title('Alert').should('be.visible').click(); e2e.components.Tab.active().should('have.text', 'Alert0'); // there's no alert so therefore Alert + 0 - e2e.components.AlertTab.content().should('not.exist'); + + // Needs to be disabled until Grafana EE turns unified alerting on by default + // e2e.components.AlertTab.content().should('not.exist'); + e2e.components.QueryTab.content().should('not.exist'); e2e.components.TransformTab.content().should('not.exist'); - e2e.components.PanelAlertTabContent.content().should('exist'); - e2e.components.PanelAlertTabContent.content().should('be.visible'); + + // Needs to be disabled until Grafana EE turns unified alerting on by default + // e2e.components.PanelAlertTabContent.content().should('exist'); + // e2e.components.PanelAlertTabContent.content().should('be.visible'); e2e.components.Tab.title('Query').should('be.visible').click(); });