From d499b91a9bc3ffbb078bc61cc66897ba80141550 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Thu, 9 Jul 2020 14:41:29 +0200
Subject: [PATCH] [Discover] Improve saved queries reload functional test
 (#70957)

---
 test/functional/apps/discover/_saved_queries.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/functional/apps/discover/_saved_queries.js b/test/functional/apps/discover/_saved_queries.js
index 61bb5f7cfee6..6b423bf6eeb1 100644
--- a/test/functional/apps/discover/_saved_queries.js
+++ b/test/functional/apps/discover/_saved_queries.js
@@ -20,6 +20,7 @@
 import expect from '@kbn/expect';
 
 export default function ({ getService, getPageObjects }) {
+  const retry = getService('retry');
   const log = getService('log');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
@@ -93,7 +94,10 @@ export default function ({ getService, getPageObjects }) {
         expect(await filterBar.hasFilter('extension.raw', 'jpg')).to.be(true);
         expect(timePickerValues.start).to.not.eql(PageObjects.timePicker.defaultStartTime);
         expect(timePickerValues.end).to.not.eql(PageObjects.timePicker.defaultEndTime);
-        expect(await PageObjects.discover.getHitCount()).to.be('2,792');
+        await retry.waitFor(
+          'the right hit count',
+          async () => (await PageObjects.discover.getHitCount()) === '2,792'
+        );
         expect(await savedQueryManagementComponent.getCurrentlyLoadedQueryID()).to.be('OkResponse');
       });
 
@@ -149,7 +153,6 @@ export default function ({ getService, getPageObjects }) {
         expect(await queryBar.getQueryString()).to.eql('');
       });
 
-      // https://github.com/elastic/kibana/issues/63505
       it('allows clearing if non default language was remembered in localstorage', async () => {
         await queryBar.switchQueryLanguage('lucene');
         await PageObjects.common.navigateToApp('discover'); // makes sure discovered is reloaded without any state in url
@@ -160,9 +163,7 @@ export default function ({ getService, getPageObjects }) {
         await queryBar.expectQueryLanguageOrFail('lucene');
       });
 
-      // fails: bug in discover https://github.com/elastic/kibana/issues/63561
-      // unskip this test when bug is fixed
-      it.skip('changing language removes saved query', async () => {
+      it('changing language removes saved query', async () => {
         await savedQueryManagementComponent.loadSavedQuery('OkResponse');
         await queryBar.switchQueryLanguage('lucene');
         expect(await queryBar.getQueryString()).to.eql('');