public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v11.0.x] DashboardScene: Re-enabled skipped scenes e2e tests due to bugs (#88100)

Browse Source 
DashboardScene: Re-enabled skipped scenes e2e tests due to bugs (#87723)

* enabled skipped tests

* adjust to wait for loading indicator

* adjust typos

* adjust e2e workflow for test PR run

* restore workflow

* adjust workflow for test run

* restore workflow to sheduled runs

(cherry picked from commit e324a346f6)

Co-authored-by: Sergej-Vlasov <37613182+Sergej-Vlasov@users.noreply.github.com>
This commit is contained in:
grafana-delivery-bot[bot]
2024-05-20 20:56:01 +03:00
committed by GitHub
co-authored by Sergej-Vlasov
parent e8dd634e25
commit 2a650ff121
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/scenes/dashboard-suite/new-interval-variable.spec.ts
+3 -4
View File
@@ -15,8 +15,7 @@ describe('Variables - Interval', () => {
e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
});
// TODO: remove skip once https://github.com/grafana/grafana/issues/84727 is done
it.skip('can add a new interval variable', () => {
it('can add a new interval variable', () => {
e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=variables` });
cy.contains(DASHBOARD_NAME).should('be.visible');
@@ -41,8 +40,8 @@ describe('Variables - Interval', () => {
e2e.components.RefreshPicker.runButtonV2().click();
e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('10s').click();
e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('1h30m').click();
e2e.pages.Dashboard.SubMenu.submenuItemLabels('Variable under test').next().should('have.text', `10s`).click();
e2e.components.Select.option().contains('1h30m').click();
// Assert it was rendered
cy.get('.markdown-html').should('include.text', 'VariableUnderTest: 1h30m');
e2e/scenes/dashboard-suite/set-options-from-ui.spec.ts
+6 -3
View File
@@ -1,3 +1,5 @@
import { selectors } from '@grafana/e2e-selectors';
import { e2e } from '../utils';
const PAGE_UNDER_TEST = '-Y-tnEDWk/templating-nested-template-variables';
@@ -81,7 +83,7 @@ describe('Variables - Set options from ui', () => {
e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A,B').scrollIntoView().should('be.visible');
e2e.components.LoadingIndicator.icon().should('have.length', 0);
cy.get(`[aria-label="${selectors.components.LoadingIndicator.icon}"]`).should('not.exist');
e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('AA')
.should('be.visible')
@@ -129,6 +131,7 @@ describe('Variables - Set options from ui', () => {
cy.intercept({ pathname: '/api/ds/query' }).as('query');
cy.wait('@query');
cy.get(`[aria-label="${selectors.components.LoadingIndicator.icon}"]`).should('not.exist');
e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('A,B')
.should('be.visible')
@@ -138,8 +141,8 @@ describe('Variables - Set options from ui', () => {
cy.get('body').click();
cy.wait(300);
cy.wait('@query');
cy.get(`[aria-label="${selectors.components.LoadingIndicator.icon}"]`).should('not.exist');
e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('B')
.scrollIntoView()
@@ -150,7 +153,7 @@ describe('Variables - Set options from ui', () => {
cy.get('body').click();
e2e.components.LoadingIndicator.icon().should('have.length', 0);
cy.get(`[aria-label="${selectors.components.LoadingIndicator.icon}"]`).should('not.exist');
e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('BB')
.should('be.visible')
e2e/scenes/dashboard-suite/textbox-variables.spec.ts
+1 -2
View File
@@ -7,8 +7,7 @@ describe('TextBox - load options scenarios', function () {
e2e.flows.login(Cypress.env('USERNAME'), Cypress.env('PASSWORD'));
});
// TODO: remove skip after https://github.com/grafana/grafana/issues/86435
it.skip('default options should be correct', function () {
it('default options should be correct', function () {
e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}/templating-textbox-e2e-scenarios?orgId=1` });
validateTextboxAndMarkup('default value');