diff --git a/src/dev/ci_setup/load_env_keys.sh b/src/dev/ci_setup/load_env_keys.sh index 62d29db232eae..b52b3d3810b3d 100644 --- a/src/dev/ci_setup/load_env_keys.sh +++ b/src/dev/ci_setup/load_env_keys.sh @@ -31,7 +31,7 @@ else KIBANA_CI_REPORTER_KEY=$(retry 5 vault read -field=value secret/kibana-issues/dev/kibanamachine-reporter) export KIBANA_CI_REPORTER_KEY - PERCY_TOKEN=$(retry 5 vault read -field=value secret/kibana-issues/dev/percy) + PERCY_TOKEN=$(retry 5 vault read -field=value secret/kibana-issues/dev/percy-dev) export PERCY_TOKEN # remove vault related secrets diff --git a/x-pack/test/functional/page_objects/infra_home_page.ts b/x-pack/test/functional/page_objects/infra_home_page.ts index 998a60500aca2..318e9216ba0dd 100644 --- a/x-pack/test/functional/page_objects/infra_home_page.ts +++ b/x-pack/test/functional/page_objects/infra_home_page.ts @@ -74,5 +74,14 @@ export function InfraHomePageProvider({ getService }: FtrProviderContext) { await testSubjects.click('configureSourceButton'); await testSubjects.exists('sourceConfigurationFlyout'); }, + + async waitForChartToLoad() { + await retry.try(async () => { + const renderComplete = await find.byCssSelector('[data-ech-render-complete="true"]'); + if (!renderComplete) { + throw new Error('Chart did not render'); + } + }); + }, }; } diff --git a/x-pack/test/visual_regression/tests/infra/index.js b/x-pack/test/visual_regression/tests/infra/index.js index f3063746b37b5..9efd45e83a550 100644 --- a/x-pack/test/visual_regression/tests/infra/index.js +++ b/x-pack/test/visual_regression/tests/infra/index.js @@ -7,7 +7,7 @@ export default function ({ loadTestFile, getService }) { const browser = getService('browser'); - describe.skip('InfraUI Visual Regression', function () { + describe('InfraUI Visual Regression', function () { before(async () => { await browser.setWindowSize(1600, 1000); }); diff --git a/x-pack/test/visual_regression/tests/infra/saved_views.js b/x-pack/test/visual_regression/tests/infra/saved_views.js index c07534acb4430..0c7ec08731bc4 100644 --- a/x-pack/test/visual_regression/tests/infra/saved_views.js +++ b/x-pack/test/visual_regression/tests/infra/saved_views.js @@ -7,17 +7,23 @@ import { DATES } from '../../../functional/apps/infra/constants'; const DATE_WITH_DATA = DATES.metricsAndLogs.hosts.withData; export default function ({ getPageObjects, getService }) { - const PageObjects = getPageObjects(['common', 'infraHome', 'infraMetricExplorer']); + const PageObjects = getPageObjects(['common', 'header', 'infraHome', 'infraMetricExplorer', 'timePicker']); const visualTesting = getService('visualTesting'); const esArchiver = getService('esArchiver'); + const find = getService('find'); describe('saved views', () => { before(() => esArchiver.load('infra/metrics_and_logs')); after(() => esArchiver.unload('infra/metrics_and_logs')); - describe('Inverntory Test save functionality', () => { - it('should have save and load controls', async () => { + + describe('Inventory Test save functionality', () => { + before(async function () { await PageObjects.common.navigateToApp('infraOps'); await PageObjects.infraHome.goToTime(DATE_WITH_DATA); + await PageObjects.header.awaitGlobalLoadingIndicatorHidden(); + }); + + it('should have save and load controls', async () => { await PageObjects.infraHome.getSaveViewButton(); await PageObjects.infraHome.getLoadViewsButton(); await visualTesting.snapshot(); @@ -25,6 +31,7 @@ export default function ({ getPageObjects, getService }) { it('should open flyout list', async () => { await PageObjects.infraHome.openSaveViewsFlyout(); + await find.waitForDeletedByCssSelector('.euiBasicTable-loading', 5000); await visualTesting.snapshot(); await PageObjects.infraHome.closeSavedViewFlyout(); }); @@ -36,19 +43,30 @@ export default function ({ getPageObjects, getService }) { it('should be able to enter a view name', async () => { await PageObjects.infraHome.openEnterViewNameAndSave(); + await PageObjects.header.awaitGlobalLoadingIndicatorHidden(); await visualTesting.snapshot(); }); it('should see a saved view in list', async () => { await PageObjects.infraHome.openSaveViewsFlyout(); + await find.waitForDeletedByCssSelector('.euiBasicTable-loading', 5000); await visualTesting.snapshot(); }); }); describe('Metric Explorer Test save functionality', () => { - it('should have save and load controls', async () => { + const fromTime = 'Oct 16, 2018 @ 00:00:00.000'; + const toTime = 'Oct 18, 2018 @ 00:00:00.000'; + + before(async function () { await PageObjects.common.navigateToApp('infraOps'); await PageObjects.infraHome.goToMetricExplorer(); + await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime); + await PageObjects.header.awaitGlobalLoadingIndicatorHidden(); + await PageObjects.infraHome.waitForChartToLoad(); + }); + + it('should have save and load controls', async () => { await PageObjects.infraMetricExplorer.getSaveViewButton(); await PageObjects.infraMetricExplorer.getLoadViewsButton(); await visualTesting.snapshot(); @@ -56,6 +74,7 @@ export default function ({ getPageObjects, getService }) { it('should open flyout list', async () => { await PageObjects.infraMetricExplorer.openSaveViewsFlyout(); + await find.waitForDeletedByCssSelector('.euiBasicTable-loading', 5000); await visualTesting.snapshot(); await PageObjects.infraMetricExplorer.closeSavedViewFlyout(); }); @@ -72,6 +91,7 @@ export default function ({ getPageObjects, getService }) { it('should see a saved view in list', async () => { await PageObjects.infraMetricExplorer.openSaveViewsFlyout(); + await find.waitForDeletedByCssSelector('.euiBasicTable-loading', 5000); await visualTesting.snapshot(); }); });