Fix upgrade tests for 7.14 (#104993)

* Fix upgrade tests for 7.14 * Fix lint issues * Comment out unused const * Update uiSettings for non-default space Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
elastic · Jul 12, 2021 · bb1759e · bb1759e
1 parent 4b7b45d
commit bb1759e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/x-pack/test/upgrade/apps/dashboard/dashboard_smoke_tests.ts b/x-pack/test/upgrade/apps/dashboard/dashboard_smoke_tests.ts
@@ -16,6 +16,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const renderable = getService('renderable');
   const dashboardExpect = getService('dashboardExpect');
   const PageObjects = getPageObjects(['common', 'header', 'home', 'dashboard', 'timePicker']);
+  const kibanaServer = getService('kibanaServer');
+  const browser = getService('browser');
 
   describe('dashboard smoke tests', function describeIndexTests() {
     const spaces = [
@@ -36,6 +38,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
             basePath,
           });
           await PageObjects.header.waitUntilLoadingHasFinished();
+          await kibanaServer.uiSettings.update(
+            {
+              'visualization:visualize:legacyChartsLibrary': true,
+              'visualization:visualize:legacyPieChartsLibrary': true,
+            },
+            { space }
+          );
+          await browser.refresh();
         });
         dashboardTests.forEach(({ name, numPanels }) => {
           it('should launch sample ' + name + ' data set dashboard', async () => {
@@ -56,9 +66,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           await renderable.waitForRender();
           log.debug('Checking pie charts rendered');
           await pieChart.expectPieSliceCount(4);
-          // https://github.com/elastic/kibana/issues/92887
-          // log.debug('Checking area, bar and heatmap charts rendered');
-          // await dashboardExpect.seriesElementCount(15);
+          log.debug('Checking area, bar and heatmap charts rendered');
+          await dashboardExpect.seriesElementCount(15);
           log.debug('Checking saved searches rendered');
           await dashboardExpect.savedSearchRowCount(49);
           log.debug('Checking input controls rendered');

diff --git a/x-pack/test/upgrade/apps/reporting/reporting_smoke_tests.ts b/x-pack/test/upgrade/apps/reporting/reporting_smoke_tests.ts
@@ -69,6 +69,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
             if (type === 'pdf_optimize') {
               await testSubjects.click('usePrintLayout');
             }
+            const advOpt = await find.byXPath(`//button[descendant::*[text()='Advanced options']]`);
+            await advOpt.click();
             const postUrl = await find.byXPath(`//button[descendant::*[text()='Copy POST URL']]`);
             await postUrl.click();
             const url = await browser.getClipboardValue();