Disable the functional test for OSS

elastic · Jan 25, 2021 · 4413117 · 4413117
1 parent 5f1d419
commit 4413117
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/test/functional/apps/visualize/_chart_types.ts b/test/functional/apps/visualize/_chart_types.ts
@@ -12,23 +12,17 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
-  const deployment = getService('deployment');
   const log = getService('log');
   const PageObjects = getPageObjects(['visualize']);
-  let isOss = true;
 
   describe('chart types', function () {
     before(async function () {
       log.debug('navigateToApp visualize');
-      isOss = await deployment.isOss();
       await PageObjects.visualize.navigateToNewVisualization();
     });
 
     it('should show the promoted vis types for the first step', async function () {
-      const expectedChartTypes = ['Custom visualization', 'TSVB'];
-      if (!isOss) {
-        expectedChartTypes.push('Lens', 'Maps');
-      }
+      const expectedChartTypes = ['Custom visualization', 'Lens', 'Maps', 'TSVB'];
 
       // find all the chart types and make sure there all there
       const chartTypes = (await PageObjects.visualize.getPromotedVisTypes()).sort();
@@ -39,9 +33,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     it('should show the correct agg based chart types', async function () {
       await PageObjects.visualize.clickAggBasedVisualizations();
-      let expectedChartTypes = [
+      const expectedChartTypes = [
         'Area',
-        'Coordinate Map',
         'Data table',
         'Gauge',
         'Goal',
@@ -50,21 +43,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         'Line',
         'Metric',
         'Pie',
-        'Region Map',
         'Tag cloud',
         'Timelion',
         'Vertical bar',
       ];
-      if (!isOss) {
-        expectedChartTypes = _.remove(expectedChartTypes, function (n) {
-          return n !== 'Coordinate Map';
-        });
-        expectedChartTypes = _.remove(expectedChartTypes, function (n) {
-          return n !== 'Region Map';
-        });
-        expectedChartTypes.sort();
-      }
-      log.debug('oss= ' + isOss);
 
       // find all the chart types and make sure there all there
       const chartTypes = (await PageObjects.visualize.getChartTypes()).sort();

diff --git a/test/functional/apps/visualize/index.ts b/test/functional/apps/visualize/index.ts
@@ -71,6 +71,11 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       loadTestFile(require.resolve('./_data_table'));
       loadTestFile(require.resolve('./_data_table_nontimeindex'));
       loadTestFile(require.resolve('./_data_table_notimeindex_filters'));
+
+      // this check is not needed when the CI doesn't run anymore for the OSS
+      if (!isOss) {
+        loadTestFile(require.resolve('./_chart_types'));
+      }
     });
 
     describe('', function () {