mirror of
https://github.com/grafana/grafana.git
synced 2024-12-01 21:19:28 -06:00
1261345b81
* update react 18 related deps * fix some types * make sure we're on react-router-dom >= 5.3.3 * Use new root API * Remove StrictMode for now - react 18 double rendering causes issues * fix + ignore some @grafana/ui types * fix some more types * use renderHook from @testing-library/react in almost all cases * fix storybook types * rewrite useDashboardSave to not use useEffect * make props optional * only render if props are provided * add correct type for useCallback * make resourcepicker tests more robust * fix ModalManager rendering * fix some more unit tests * store the click coordinates in a ref as setState is NOT synchronous * fix remaining e2e tests * rewrite dashboardpage tests to avoid act warnings * undo lint ignores * fix ExpanderCell types * set SymbolCell type correctly * fix QueryAndExpressionsStep * looks like the types were actually wrong instead :D * undo this for now... * remove spinner waits * more robust tests * rewrite errorboundary test to not explicitly count the number of renders * make urlParam expect async * increase timeout in waitFor * revert ExplorePage test changes * Update public/app/features/dashboard/containers/DashboardPage.test.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Update public/app/features/dashboard/containers/PublicDashboardPage.test.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Update public/app/features/dashboard/containers/PublicDashboardPage.test.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Update public/app/features/dashboard/containers/PublicDashboardPage.test.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * skip fakeTimer test, ignore table types for now + other review comments * update package peerDeps * small tweak to resourcepicker test * update lockfile... * increase timeout in sharepublicdashboard tests * ensure ExplorePaneContainer passes correct queries to initializeExplore * fix LokiContextUI test * fix unit tests * make importDashboard flow more consistent * wait for dashboard name before continuing * more test fixes * readd dashboard name to variable e2e tests * wait for switches to be enabled before clicking * fix modal rendering * don't use @testing-library/dom directly * quick fix for rendering of panels in firefox * make PromQueryField test more robust * don't wait for chartData - in react 18 this can happen before the wait code even gets executed --------- Co-authored-by: kay delaney <kay@grafana.com> Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
55 lines
2.3 KiB
TypeScript
55 lines
2.3 KiB
TypeScript
import { e2e } from '@grafana/e2e';
|
|
import { GrafanaBootConfig } from '@grafana/runtime';
|
|
|
|
const PAGE_UNDER_TEST = 'kVi2Gex7z/test-variable-output';
|
|
const DASHBOARD_NAME = 'Test variable output';
|
|
|
|
function assertPreviewValues(expectedValues: string[]) {
|
|
for (const expected of expectedValues) {
|
|
const index = expectedValues.indexOf(expected);
|
|
e2e.pages.Dashboard.Settings.Variables.Edit.General.previewOfValuesOption().eq(index).should('have.text', expected);
|
|
}
|
|
}
|
|
|
|
describe('Variables - Interval', () => {
|
|
it('can add a new interval variable', () => {
|
|
e2e.flows.login('admin', 'admin');
|
|
e2e.flows.openDashboard({ uid: `${PAGE_UNDER_TEST}?orgId=1&editview=templating` });
|
|
e2e().contains(DASHBOARD_NAME).should('be.visible');
|
|
|
|
// Create a new "Interval" variable
|
|
e2e.components.CallToActionCard.buttonV2('Add variable').click();
|
|
e2e.pages.Dashboard.Settings.Variables.Edit.General.generalTypeSelectV2().within(() => {
|
|
e2e().get('input').type('Interval{enter}');
|
|
});
|
|
e2e.pages.Dashboard.Settings.Variables.Edit.General.generalNameInputV2().clear().type('VariableUnderTest').blur();
|
|
e2e.pages.Dashboard.Settings.Variables.Edit.General.generalLabelInputV2().type('Variable under test').blur();
|
|
|
|
e2e.pages.Dashboard.Settings.Variables.Edit.IntervalVariable.intervalsValueInput()
|
|
.clear()
|
|
.type('10s,10m,60m,90m,1h30m')
|
|
.blur();
|
|
|
|
assertPreviewValues(['10s', '10m', '60m', '90m', '1h30m']);
|
|
|
|
// Navigate back to the homepage and change the selected variable value
|
|
e2e.pages.Dashboard.Settings.Variables.Edit.General.submitButton().click();
|
|
e2e()
|
|
.window()
|
|
.then((win: Cypress.AUTWindow & { grafanaBootData: GrafanaBootConfig['bootData'] }) => {
|
|
if (win.grafanaBootData.settings.featureToggles.topnav) {
|
|
e2e.pages.Dashboard.Settings.Actions.close().click();
|
|
} else {
|
|
e2e.components.BackButton.backArrow().click({ force: true });
|
|
}
|
|
});
|
|
e2e.components.RefreshPicker.runButtonV2().click();
|
|
|
|
e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownValueLinkTexts('10s').click();
|
|
e2e.pages.Dashboard.SubMenu.submenuItemValueDropDownOptionTexts('1h30m').click();
|
|
|
|
// Assert it was rendered
|
|
e2e().get('.markdown-html').should('include.text', 'VariableUnderTest: 1h30m');
|
|
});
|
|
});
|