Skip to content

Commit db7cc59

Browse files
mohamedhamed-ahmedmohamedhamed-ahmed
authored
[Discover] Fix doc viewer flaky test (#236268)
closes #235841
1 parent 5ed7186 commit db7cc59

File tree

6 files changed

+24
-35
lines changed

6 files changed

+24
-35
lines changed

‎src/platform/test/functional/apps/discover/context_awareness/extensions/_get_doc_viewer.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
2727
await common.navigateToActualUrl('discover', `?_a=${state}`, {
2828
ensureCurrentUrl: false,
2929
});
30-
await discover.waitUntilSearchingHasFinished();
30+
await discover.waitUntilTabIsLoaded();
3131
await dataGrid.clickRowToggle({ rowIndex: 0 });
3232
await testSubjects.existOrFail('docViewerTab-doc_view_table');
3333
await testSubjects.existOrFail('docViewerTab-doc_view_source');
@@ -43,7 +43,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
4343
await common.navigateToActualUrl('discover', `?_a=${state}`, {
4444
ensureCurrentUrl: false,
4545
});
46-
await discover.waitUntilSearchingHasFinished();
46+
await discover.waitUntilTabIsLoaded();
4747
await dataGrid.clickRowToggle({ rowIndex: 0 });
4848
await testSubjects.existOrFail('docViewerTab-doc_view_table');
4949
await testSubjects.existOrFail('docViewerTab-doc_view_source');
@@ -58,7 +58,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
5858
ensureCurrentUrl: false,
5959
});
6060
await dataViews.switchTo('my-example-*');
61-
await discover.waitUntilSearchingHasFinished();
61+
await discover.waitUntilTabIsLoaded();
6262
await dataGrid.clickRowToggle({ rowIndex: 0 });
6363
await testSubjects.existOrFail('docViewerTab-doc_view_table');
6464
await testSubjects.existOrFail('docViewerTab-doc_view_source');
@@ -71,7 +71,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
7171
ensureCurrentUrl: false,
7272
});
7373
await dataViews.switchTo('my-example-logs');
74-
await discover.waitUntilSearchingHasFinished();
74+
await discover.waitUntilTabIsLoaded();
7575
await dataGrid.clickRowToggle({ rowIndex: 0 });
7676
await testSubjects.existOrFail('docViewerTab-doc_view_table');
7777
await testSubjects.existOrFail('docViewerTab-doc_view_source');

‎src/platform/test/functional/apps/discover/observability/logs/_get_doc_viewer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
5959

6060
await queryBar.setQuery('error.stack_trace : * and _ignored : *');
6161
await queryBar.submitQuery();
62-
await PageObjects.discover.waitUntilSearchingHasFinished();
62+
await PageObjects.discover.waitUntilTabIsLoaded();
6363
});
6464

6565
after(async () => {

‎x-pack/platform/test/serverless/functional/test_suites/discover/context_awareness/extensions/_get_doc_viewer.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
2020
const dataGrid = getService('dataGrid');
2121

2222
describe('extension getDocViewer', function () {
23-
// flaky on MKI, see https://github.com/elastic/kibana/issues/235841
24-
this.tags(['failsOnMKI']);
25-
2623
before(async () => {
2724
await svlCommonPage.loginAsAdmin();
2825
});
@@ -36,7 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
3633
await common.navigateToActualUrl('discover', `?_a=${state}`, {
3734
ensureCurrentUrl: false,
3835
});
39-
await discover.waitUntilSearchingHasFinished();
36+
await discover.waitUntilTabIsLoaded();
4037
await dataGrid.clickRowToggle({ rowIndex: 0 });
4138
await testSubjects.existOrFail('docViewerTab-doc_view_table');
4239
await testSubjects.existOrFail('docViewerTab-doc_view_source');
@@ -52,7 +49,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
5249
await common.navigateToActualUrl('discover', `?_a=${state}`, {
5350
ensureCurrentUrl: false,
5451
});
55-
await discover.waitUntilSearchingHasFinished();
52+
await discover.waitUntilTabIsLoaded();
5653
await dataGrid.clickRowToggle({ rowIndex: 0 });
5754
await testSubjects.existOrFail('docViewerTab-doc_view_table');
5855
await testSubjects.existOrFail('docViewerTab-doc_view_source');
@@ -67,7 +64,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
6764
ensureCurrentUrl: false,
6865
});
6966
await dataViews.switchTo('my-example-*');
70-
await discover.waitUntilSearchingHasFinished();
67+
await discover.waitUntilTabIsLoaded();
7168
await dataGrid.clickRowToggle({ rowIndex: 0 });
7269
await testSubjects.existOrFail('docViewerTab-doc_view_table');
7370
await testSubjects.existOrFail('docViewerTab-doc_view_source');
@@ -80,7 +77,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
8077
ensureCurrentUrl: false,
8178
});
8279
await dataViews.switchTo('my-example-logs');
83-
await discover.waitUntilSearchingHasFinished();
80+
await discover.waitUntilTabIsLoaded();
8481
await dataGrid.clickRowToggle({ rowIndex: 0 });
8582
await testSubjects.existOrFail('docViewerTab-doc_view_table');
8683
await testSubjects.existOrFail('docViewerTab-doc_view_source');

‎x-pack/solutions/observability/test/serverless/functional/test_suites/discover/context_awareness/_get_doc_viewer.ts‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import kbnRison from '@kbn/rison';
99
import type { FtrProviderContext } from '../../../ftr_provider_context';
1010

1111
export default function ({ getService, getPageObjects }: FtrProviderContext) {
12-
const PageObjects = getPageObjects(['common', 'discover', 'svlCommonPage', 'header']);
12+
const PageObjects = getPageObjects(['common', 'discover', 'svlCommonPage']);
1313
const testSubjects = getService('testSubjects');
1414
const dataViews = getService('dataViews');
1515
const dataGrid = getService('dataGrid');
@@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
2929
await PageObjects.common.navigateToActualUrl('discover', `?_a=${state}`, {
3030
ensureCurrentUrl: false,
3131
});
32-
await PageObjects.discover.waitUntilSearchingHasFinished();
32+
await PageObjects.discover.waitUntilTabIsLoaded();
3333
await dataGrid.clickRowToggle();
3434
await testSubjects.existOrFail('docViewerTab-doc_view_table');
3535
await testSubjects.existOrFail('docViewerTab-doc_view_logs_overview');
@@ -45,7 +45,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
4545
await PageObjects.common.navigateToActualUrl('discover', `?_a=${state}`, {
4646
ensureCurrentUrl: false,
4747
});
48-
await PageObjects.discover.waitUntilSearchingHasFinished();
48+
await PageObjects.discover.waitUntilTabIsLoaded();
4949
await dataGrid.clickRowToggle();
5050
await testSubjects.existOrFail('docViewerTab-doc_view_table');
5151
await testSubjects.missingOrFail('docViewerTab-doc_view_logs_overview');
@@ -58,7 +58,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
5858
ensureCurrentUrl: false,
5959
});
6060
await dataViews.switchTo('my-example-logs');
61-
await PageObjects.discover.waitUntilSearchingHasFinished();
61+
await PageObjects.discover.waitUntilTabIsLoaded();
6262
await dataGrid.clickRowToggle();
6363
await testSubjects.existOrFail('docViewerTab-doc_view_table');
6464
await testSubjects.existOrFail('docViewerTab-doc_view_logs_overview');
@@ -68,11 +68,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
6868
// check Surrounding docs page
6969
const [, surroundingActionEl] = await dataGrid.getRowActions();
7070
await surroundingActionEl.click();
71-
await PageObjects.header.waitUntilLoadingHasFinished();
72-
await PageObjects.discover.waitUntilSearchingHasFinished();
71+
await PageObjects.discover.waitUntilTabIsLoaded();
7372
await browser.refresh(); // To make sure context awareness even works when a page is refreshed
74-
await PageObjects.header.waitUntilLoadingHasFinished();
75-
await PageObjects.discover.waitUntilSearchingHasFinished();
73+
await PageObjects.discover.waitUntilTabIsLoaded();
7674

7775
await dataGrid.clickRowToggle({ isAnchorRow: true });
7876
await testSubjects.existOrFail('docViewerTab-doc_view_table');
@@ -83,11 +81,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
8381
// check Single doc page
8482
const [singleDocActionEl] = await dataGrid.getRowActions();
8583
await singleDocActionEl.click();
86-
await PageObjects.header.waitUntilLoadingHasFinished();
87-
await PageObjects.discover.waitUntilSearchingHasFinished();
84+
await PageObjects.discover.waitUntilTabIsLoaded();
8885
await browser.refresh(); // To make sure context awareness even works when a page is refreshed
89-
await PageObjects.header.waitUntilLoadingHasFinished();
90-
await PageObjects.discover.waitUntilSearchingHasFinished();
86+
await PageObjects.discover.waitUntilTabIsLoaded();
9187

9288
await testSubjects.existOrFail('docViewerTab-doc_view_table');
9389
await testSubjects.existOrFail('docViewerTab-doc_view_logs_overview');
@@ -100,19 +96,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
10096
ensureCurrentUrl: false,
10197
});
10298
await dataViews.switchTo('my-example-metrics');
103-
await PageObjects.discover.waitUntilSearchingHasFinished();
99+
await PageObjects.discover.waitUntilTabIsLoaded();
104100
await dataGrid.clickRowToggle();
105101
await testSubjects.existOrFail('docViewerTab-doc_view_table');
106102
await testSubjects.missingOrFail('docViewerTab-doc_view_logs_overview');
107103

108104
// check Surrounding docs page
109105
const [, surroundingActionEl] = await dataGrid.getRowActions();
110106
await surroundingActionEl.click();
111-
await PageObjects.header.waitUntilLoadingHasFinished();
112-
await PageObjects.discover.waitUntilSearchingHasFinished();
107+
await PageObjects.discover.waitUntilTabIsLoaded();
113108
await browser.refresh(); // To make sure context awareness even works when a page is refreshed
114-
await PageObjects.header.waitUntilLoadingHasFinished();
115-
await PageObjects.discover.waitUntilSearchingHasFinished();
109+
await PageObjects.discover.waitUntilTabIsLoaded();
116110

117111
await dataGrid.clickRowToggle({ isAnchorRow: true });
118112
await testSubjects.existOrFail('docViewerTab-doc_view_table');
@@ -121,11 +115,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
121115
// check Single doc page
122116
const [singleDocActionEl] = await dataGrid.getRowActions();
123117
await singleDocActionEl.click();
124-
await PageObjects.header.waitUntilLoadingHasFinished();
125-
await PageObjects.discover.waitUntilSearchingHasFinished();
118+
await PageObjects.discover.waitUntilTabIsLoaded();
126119
await browser.refresh(); // To make sure context awareness even works when a page is refreshed
127-
await PageObjects.header.waitUntilLoadingHasFinished();
128-
await PageObjects.discover.waitUntilSearchingHasFinished();
120+
await PageObjects.discover.waitUntilTabIsLoaded();
129121

130122
await testSubjects.existOrFail('docViewerTab-doc_view_table');
131123
await testSubjects.missingOrFail('docViewerTab-doc_view_logs_overview');

‎x-pack/solutions/observability/test/serverless/functional/test_suites/discover/embeddables/_get_doc_viewer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
6363

6464
await queryBar.setQuery(searchQuery);
6565
await queryBar.submitQuery();
66-
await PageObjects.discover.waitUntilSearchingHasFinished();
66+
await PageObjects.discover.waitUntilTabIsLoaded();
6767

6868
// Required to access Dashboard page
6969
await dataViews.createFromSearchBar({

‎x-pack/solutions/observability/test/serverless/functional/test_suites/discover/logs/_get_doc_viewer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
5353

5454
await queryBar.setQuery('error.stack_trace : * and _ignored : *');
5555
await queryBar.submitQuery();
56-
await PageObjects.discover.waitUntilSearchingHasFinished();
56+
await PageObjects.discover.waitUntilTabIsLoaded();
5757
});
5858

5959
after(async () => {

0 commit comments

Comments
 (0)