diff --git a/test/functional/apps/visualize/group4/_tsvb_chart.ts b/test/functional/apps/visualize/group4/_tsvb_chart.ts index b71458c5c5527..a468751642888 100644 --- a/test/functional/apps/visualize/group4/_tsvb_chart.ts +++ b/test/functional/apps/visualize/group4/_tsvb_chart.ts @@ -44,7 +44,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { await visualize.navigateToNewVisualization(); await visualize.clickVisualBuilder(); await visualBuilder.checkVisualBuilderIsPresent(); - await visualBuilder.resetPage(); + await visualBuilder.setTime(); }); describe('metric', () => { @@ -430,7 +430,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { describe('switch panel interval test', () => { beforeEach(async () => { - await visualBuilder.resetPage(); + await visualBuilder.setTime(); await visualBuilder.clickMetric(); await visualBuilder.checkMetricTabIsPresent(); await visualBuilder.clickPanelOptions('metric'); @@ -551,7 +551,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) { }); beforeEach(async () => { - await visualBuilder.resetPage(); + await visualBuilder.setTime(); await visualBuilder.selectAggType('Average'); await visualBuilder.setFieldForAggregation('bytes'); await visualBuilder.setMetricsGroupByTerms('machine.os.raw'); diff --git a/test/functional/apps/visualize/group5/_tsvb_time_series.ts b/test/functional/apps/visualize/group5/_tsvb_time_series.ts index fb59d947b6790..d285efdfca4d0 100644 --- a/test/functional/apps/visualize/group5/_tsvb_time_series.ts +++ b/test/functional/apps/visualize/group5/_tsvb_time_series.ts @@ -45,7 +45,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('Time Series', () => { beforeEach(async () => { - await visualBuilder.resetPage(); + await visualBuilder.setTime(); await visualBuilder.clickPanelOptions('timeSeries'); await visualBuilder.setDropLastBucket(true); await visualBuilder.clickDataTab('timeSeries'); diff --git a/test/functional/apps/visualize/group6/_tsvb_markdown.ts b/test/functional/apps/visualize/group6/_tsvb_markdown.ts index c2ebad6892d26..272fc0d095f31 100644 --- a/test/functional/apps/visualize/group6/_tsvb_markdown.ts +++ b/test/functional/apps/visualize/group6/_tsvb_markdown.ts @@ -37,7 +37,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('markdown', () => { before(async () => { await visualize.initTests(); - await visualBuilder.resetPage(); + await visualize.navigateToNewVisualization(); + await visualize.clickVisualBuilder(); + await visualBuilder.checkVisualBuilderIsPresent(); await visualBuilder.clickMarkdown(); await timePicker.setAbsoluteRange( 'Sep 22, 2015 @ 06:00:00.000', @@ -149,7 +151,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { describe('applying field formats from Advanced Settings for values', () => { before(async () => { - await visualBuilder.resetPage(); + await visualize.navigateToNewVisualization(); + await visualize.clickVisualBuilder(); + await visualBuilder.checkVisualBuilderIsPresent(); + await visualBuilder.setTime(); await visualBuilder.clickMarkdown(); await visualBuilder.markdownSwitchSubTab('markdown'); await visualBuilder.enterMarkdown('{{ average_of_bytes.last.formatted }}'); diff --git a/test/functional/apps/visualize/group6/_tsvb_table.ts b/test/functional/apps/visualize/group6/_tsvb_table.ts index e7e24885cb406..3ea2d63bc6305 100644 --- a/test/functional/apps/visualize/group6/_tsvb_table.ts +++ b/test/functional/apps/visualize/group6/_tsvb_table.ts @@ -26,7 +26,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); describe('table', () => { beforeEach(async () => { - await visualBuilder.resetPage('Sep 22, 2015 @ 06:00:00.000', 'Sep 22, 2015 @ 11:00:00.000'); + await visualize.navigateToNewVisualization(); + await visualize.clickVisualBuilder(); + await visualBuilder.checkVisualBuilderIsPresent(); + await visualBuilder.setTime('Sep 22, 2015 @ 06:00:00.000', 'Sep 22, 2015 @ 11:00:00.000'); await visualBuilder.clickTable(); await visualBuilder.checkTableTabIsPresent(); diff --git a/test/functional/apps/visualize/group6/_tsvb_tsdb_basic.ts b/test/functional/apps/visualize/group6/_tsvb_tsdb_basic.ts index 765c7a9d3ec4d..8d1c4a587ff5c 100644 --- a/test/functional/apps/visualize/group6/_tsvb_tsdb_basic.ts +++ b/test/functional/apps/visualize/group6/_tsvb_tsdb_basic.ts @@ -11,7 +11,7 @@ import expect from '@kbn/expect'; import { FtrProviderContext } from '../../../ftr_provider_context'; export default function ({ getPageObjects, getService }: FtrProviderContext) { - const { visualBuilder } = getPageObjects(['visualBuilder']); + const { visualBuilder, visualize } = getPageObjects(['visualBuilder', 'visualize']); const log = getService('log'); const kibanaServer = getService('kibanaServer'); const esArchiver = getService('esArchiver'); @@ -43,7 +43,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) { }); beforeEach(async () => { - await visualBuilder.resetPage(); + await visualize.navigateToNewVisualization(); + await visualize.clickVisualBuilder(); + await visualBuilder.checkVisualBuilderIsPresent(); + await visualBuilder.setTime(); }); it('should render from a tsdb dataView regular fields with no issues', async () => { diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts index a9971f27c968f..f96800596e822 100644 --- a/test/functional/page_objects/visual_builder_page.ts +++ b/test/functional/page_objects/visual_builder_page.ts @@ -45,11 +45,18 @@ export class VisualBuilderPageObject extends FtrService { this.log.debug('Wait for initializing TSVB editor'); await this.checkVisualBuilderIsPresent(); this.log.debug('Set absolute time range from "' + fromTime + '" to "' + toTime + '"'); - await this.timePicker.setAbsoluteRange(fromTime, toTime); + await this.setTime(fromTime, toTime); // 2 sec sleep until https://github.com/elastic/kibana/issues/46353 is fixed await this.common.sleep(2000); } + public async setTime( + fromTime = 'Sep 19, 2015 @ 06:31:44.000', + toTime = 'Sep 22, 2015 @ 18:31:44.000' + ) { + await this.timePicker.setAbsoluteRange(fromTime, toTime); + } + public async checkTabIsLoaded(testSubj: string, name: string) { let isPresent = false; await this.retry.try(async () => {