[ftr/discover] split up configs (#137629)

.buildkite/ftr_configs.yml

@@ -74,7 +74,11 @@ enabled:
   - test/functional/apps/dashboard/group4/config.ts
   - test/functional/apps/dashboard/group5/config.ts
   - test/functional/apps/dashboard/group6/config.ts
-  - test/functional/apps/discover/config.ts
+  - test/functional/apps/discover/ccs_compatibility/config.ts
+  - test/functional/apps/discover/classic/config.ts
+  - test/functional/apps/discover/embeddable/config.ts
+  - test/functional/apps/discover/group1/config.ts
+  - test/functional/apps/discover/group2/config.ts
   - test/functional/apps/getting_started/config.ts
   - test/functional/apps/home/config.ts
   - test/functional/apps/kibana_overview/config.ts

test/functional/apps/discover/README.md

@@ -0,0 +1,7 @@
+# What are all these groups?
+
+These tests take a while so they have been broken up into groups with their own `config.ts` and `index.ts` file, causing each of these groups to be independent bundles of tests which can be run on some worker in CI without taking an incredible amount of time.
+
+Want to change the groups to something more logical? Have fun! Just make sure that each group executes on CI in less than 10 minutes or so. We don't currently have any mechanism for validating this right now, you just need to look at the times in the log output on CI, but we'll be working on tooling for making this information more accessible soon.
+
+- Kibana Operations

test/functional/apps/discover/ccs_compatibility/README.md

@@ -0,0 +1,3 @@
+# CCS COMPATIBILITY
+
+These tests are run by the local config without CCS but also run by the config.ccs.js config with CCS enabled.

test/functional/apps/discover/ccs_compatibility/_data_view_editor.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from './ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');

test/functional/apps/discover/ccs_compatibility/_saved_queries.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');

test/functional/apps/discover/ccs_compatibility/config.ts

@@ -9,7 +9,7 @@
 import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const functionalConfig = await readConfigFile(require.resolve('../../config.base.js'));
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
 
   return {
     ...functionalConfig.getAll(),

test/functional/apps/discover/ccs_compatibility/index.ts

@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/ccs_compatible', function () {
+    before(async function () {
+      await browser.setWindowSize(1300, 800);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_data_view_editor'));
+    loadTestFile(require.resolve('./_saved_queries'));
+  });
+}

test/functional/apps/discover/classic/_classic_table_doc_navigation.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const docTable = getService('docTable');

test/functional/apps/discover/classic/_field_data_with_fields_api.ts

@@ -15,11 +15,20 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const kibanaServer = getService('kibanaServer');
   const PageObjects = getPageObjects(['common', 'header', 'discover', 'visualize', 'timePicker']);
   const find = getService('find');
+  const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
 
   describe('discover tab with new fields API', function describeIndexTests() {
     before(async function () {
-      await kibanaServer.uiSettings.update({ 'doc_table:legacy': true });
+      await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover.json');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await kibanaServer.uiSettings.replace({
+        defaultIndex: 'logstash-*',
+        'discover:searchFieldsFromSource': false,
+        'doc_table:legacy': true,
+      });
+      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
     });
 

test/functional/apps/discover/classic/config.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}

test/functional/apps/discover/classic/index.ts

@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/classic', function () {
+    before(async function () {
+      await browser.setWindowSize(1300, 800);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_discover_fields_api'));
+    loadTestFile(require.resolve('./_doc_table'));
+    loadTestFile(require.resolve('./_doc_table_newline'));
+    loadTestFile(require.resolve('./_field_data'));
+    loadTestFile(require.resolve('./_field_data_with_fields_api'));
+    loadTestFile(require.resolve('./_classic_table_doc_navigation'));
+    loadTestFile(require.resolve('./_hide_announcements'));
+  });
+}

test/functional/apps/discover/embeddable/_saved_search_embeddable.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const browser = getService('browser');

test/functional/apps/discover/embeddable/config.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}

test/functional/apps/discover/embeddable/index.ts

@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/embeddable', function () {
+    before(async function () {
+      await browser.setWindowSize(1300, 800);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_saved_search_embeddable'));
+  });
+}

test/functional/apps/discover/group1/_date_nanos.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group1/_date_nanos_mixed.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group1/_discover.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const browser = getService('browser');

test/functional/apps/discover/group1/_discover_accessibility.ts

@@ -8,8 +8,8 @@
 
 import expect from '@kbn/expect';
 
-import { WebElementWrapper } from '../../services/lib/web_element_wrapper';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { WebElementWrapper } from '../../../services/lib/web_element_wrapper';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const browser = getService('browser');

test/functional/apps/discover/group1/_discover_histogram.ts

@@ -7,8 +7,8 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { TimeStrings } from '../../page_objects/common_page';
+import { TimeStrings } from '../../../page_objects/common_page';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group1/_doc_accessibility.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const browser = getService('browser');

test/functional/apps/discover/group1/_errors.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group1/_field_data.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');

test/functional/apps/discover/group1/_field_data_with_fields_api.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');

test/functional/apps/discover/group1/_filter_editor.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const log = getService('log');

test/functional/apps/discover/group1/_inspector.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'visualize', 'timePicker']);

test/functional/apps/discover/group1/_large_string.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group1/_no_data.ts

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const log = getService('log');

test/functional/apps/discover/group1/_shared_links.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');

test/functional/apps/discover/group1/_sidebar.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group1/_source_filters.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const log = getService('log');

test/functional/apps/discover/group1/config.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}

test/functional/apps/discover/group1/index.ts

@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover/group1', function () {
+    before(async function () {
+      await browser.setWindowSize(1300, 800);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_no_data'));
+    loadTestFile(require.resolve('./_discover'));
+    loadTestFile(require.resolve('./_discover_accessibility'));
+    loadTestFile(require.resolve('./_discover_histogram'));
+    loadTestFile(require.resolve('./_doc_accessibility'));
+    loadTestFile(require.resolve('./_filter_editor'));
+    loadTestFile(require.resolve('./_errors'));
+    loadTestFile(require.resolve('./_field_data'));
+    loadTestFile(require.resolve('./_field_data_with_fields_api'));
+    loadTestFile(require.resolve('./_shared_links'));
+    loadTestFile(require.resolve('./_sidebar'));
+    loadTestFile(require.resolve('./_source_filters'));
+    loadTestFile(require.resolve('./_large_string'));
+    loadTestFile(require.resolve('./_inspector'));
+    loadTestFile(require.resolve('./_date_nanos'));
+    loadTestFile(require.resolve('./_date_nanos_mixed'));
+  });
+}

test/functional/apps/discover/group2/_chart_hidden.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const log = getService('log');

test/functional/apps/discover/group2/_context_encoded_url_params.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 const customDataViewIdParam = 'context-enc:oded-param';
 const customDocIdParam = '1+1=2';

test/functional/apps/discover/group2/_data_grid.ts

@@ -7,14 +7,9 @@
  */
 
 import expect from '@kbn/expect';
+import { FtrProviderContext } from '../ftr_provider_context';
 
-export default function ({
-  getService,
-  getPageObjects,
-}: {
-  getService: (service: string) => any;
-  getPageObjects: (pageObjects: string[]) => any;
-}) {
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('discover data grid tests', function describeDiscoverDataGrid() {
     const esArchiver = getService('esArchiver');
     const PageObjects = getPageObjects(['common', 'discover', 'timePicker']);

test/functional/apps/discover/group2/_data_grid_context.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 const TEST_COLUMN_NAMES = ['@message'];
 const TEST_FILTER_COLUMN_NAMES = [

test/functional/apps/discover/group2/_data_grid_copy_to_clipboard.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const dataGrid = getService('dataGrid');

test/functional/apps/discover/group2/_data_grid_doc_navigation.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const filterBar = getService('filterBar');

test/functional/apps/discover/group2/_data_grid_doc_table.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const find = getService('find');

test/functional/apps/discover/group2/_data_grid_field_data.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');

test/functional/apps/discover/group2/_data_grid_pagination.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const browser = getService('browser');

test/functional/apps/discover/group2/_data_grid_row_navigation.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const dataGrid = getService('dataGrid');

test/functional/apps/discover/group2/_date_nested.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group2/_discover_fields_api.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from './ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const log = getService('log');

test/functional/apps/discover/group2/_hide_announcements.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group2/_huge_fields.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group2/_indexpattern_with_unmapped_fields.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group2/_indexpattern_without_timefield.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');

test/functional/apps/discover/group2/_runtime_fields_editor.ts

@@ -7,7 +7,7 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from './ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');

test/functional/apps/discover/group2/_search_on_page_load.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const log = getService('log');

test/functional/apps/discover/group2/_sql_view.ts

@@ -8,7 +8,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');

test/functional/apps/discover/group2/config.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}

test/functional/apps/discover/group2/index.ts

@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, loadTestFile }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const browser = getService('browser');
+
+  describe('discover app', function () {
+    before(async function () {
+      await browser.setWindowSize(1300, 800);
+    });
+
+    after(async function unloadMakelogs() {
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    loadTestFile(require.resolve('./_indexpattern_without_timefield'));
+    loadTestFile(require.resolve('./_discover_fields_api'));
+    loadTestFile(require.resolve('./_data_grid'));
+    loadTestFile(require.resolve('./_data_grid_context'));
+    loadTestFile(require.resolve('./_data_grid_field_data'));
+    loadTestFile(require.resolve('./_data_grid_doc_navigation'));
+    loadTestFile(require.resolve('./_data_grid_row_navigation'));
+    loadTestFile(require.resolve('./_data_grid_doc_table'));
+    loadTestFile(require.resolve('./_data_grid_copy_to_clipboard'));
+    loadTestFile(require.resolve('./_data_grid_pagination'));
+    loadTestFile(require.resolve('./_sql_view'));
+    loadTestFile(require.resolve('./_indexpattern_with_unmapped_fields'));
+    loadTestFile(require.resolve('./_runtime_fields_editor'));
+    loadTestFile(require.resolve('./_huge_fields'));
+    loadTestFile(require.resolve('./_date_nested'));
+    loadTestFile(require.resolve('./_search_on_page_load'));
+    loadTestFile(require.resolve('./_chart_hidden'));
+    loadTestFile(require.resolve('./_context_encoded_url_params'));
+    loadTestFile(require.resolve('./_hide_announcements'));
+  });
+}

test/functional/apps/discover/index.ts

@@ -1,75 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function ({ getService, loadTestFile }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const browser = getService('browser');
-  const config = getService('config');
-
-  describe('discover app', function () {
-    before(async function () {
-      await browser.setWindowSize(1300, 800);
-    });
-
-    after(async function unloadMakelogs() {
-      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
-    });
-
-    if (config.get('esTestCluster.ccs')) {
-      loadTestFile(require.resolve('./_data_view_editor'));
-      loadTestFile(require.resolve('./_saved_queries'));
-    } else {
-      loadTestFile(require.resolve('./_no_data'));
-      loadTestFile(require.resolve('./_saved_queries'));
-      loadTestFile(require.resolve('./_discover'));
-      loadTestFile(require.resolve('./_discover_accessibility'));
-      loadTestFile(require.resolve('./_discover_histogram'));
-      loadTestFile(require.resolve('./_doc_accessibility'));
-      loadTestFile(require.resolve('./classic/_doc_table'));
-      loadTestFile(require.resolve('./classic/_doc_table_newline'));
-      loadTestFile(require.resolve('./_filter_editor'));
-      loadTestFile(require.resolve('./_errors'));
-      loadTestFile(require.resolve('./_field_data'));
-      loadTestFile(require.resolve('./classic/_field_data'));
-      loadTestFile(require.resolve('./_field_data_with_fields_api'));
-      loadTestFile(require.resolve('./classic/_field_data_with_fields_api'));
-      loadTestFile(require.resolve('./_shared_links'));
-      loadTestFile(require.resolve('./_sidebar'));
-      loadTestFile(require.resolve('./_source_filters'));
-      loadTestFile(require.resolve('./_large_string'));
-      loadTestFile(require.resolve('./_inspector'));
-      loadTestFile(require.resolve('./classic/_classic_table_doc_navigation'));
-      loadTestFile(require.resolve('./_date_nanos'));
-      loadTestFile(require.resolve('./_date_nanos_mixed'));
-      loadTestFile(require.resolve('./_indexpattern_without_timefield'));
-      loadTestFile(require.resolve('./classic/_discover_fields_api'));
-      loadTestFile(require.resolve('./_discover_fields_api'));
-      loadTestFile(require.resolve('./_data_grid'));
-      loadTestFile(require.resolve('./_data_grid_context'));
-      loadTestFile(require.resolve('./_data_grid_field_data'));
-      loadTestFile(require.resolve('./_data_grid_doc_navigation'));
-      loadTestFile(require.resolve('./_data_grid_row_navigation'));
-      loadTestFile(require.resolve('./_data_grid_doc_table'));
-      loadTestFile(require.resolve('./_data_grid_copy_to_clipboard'));
-      loadTestFile(require.resolve('./_data_grid_pagination'));
-      loadTestFile(require.resolve('./_sql_view'));
-      loadTestFile(require.resolve('./_indexpattern_with_unmapped_fields'));
-      loadTestFile(require.resolve('./_runtime_fields_editor'));
-      loadTestFile(require.resolve('./_huge_fields'));
-      loadTestFile(require.resolve('./_date_nested'));
-      loadTestFile(require.resolve('./_search_on_page_load'));
-      loadTestFile(require.resolve('./_chart_hidden'));
-      loadTestFile(require.resolve('./_context_encoded_url_params'));
-      loadTestFile(require.resolve('./_data_view_editor'));
-      loadTestFile(require.resolve('./_hide_announcements'));
-      loadTestFile(require.resolve('./classic/_hide_announcements'));
-      loadTestFile(require.resolve('./embeddable/saved_search_embeddable'));
-    }
-  });
-}

test/functional/config.ccs.ts

@@ -19,7 +19,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
 
     testFiles: [
       require.resolve('./apps/dashboard/group3'),
-      require.resolve('./apps/discover'),
+      require.resolve('./apps/discover/ccs_compatibility'),
       require.resolve('./apps/console/_console_ccs'),
     ],
 

test/functional/config.firefox.js

@@ -16,7 +16,9 @@ export default async function ({ readConfigFile }) {
       require.resolve('./apps/console'),
       require.resolve('./apps/dashboard/group4/dashboard_save'),
       require.resolve('./apps/dashboard_elements'),
-      require.resolve('./apps/discover'),
+      require.resolve('./apps/discover/classic'),
+      require.resolve('./apps/discover/group1'),
+      require.resolve('./apps/discover/group2'),
       require.resolve('./apps/home'),
       require.resolve('./apps/visualize/group5'),
     ],