From 6a0af93460d32761dd1c675c09669282ce40fb55 Mon Sep 17 00:00:00 2001 From: Dzmitry Lemechko Date: Tue, 3 Nov 2020 15:53:27 +0100 Subject: [PATCH 1/2] [test/new_visualize_flow] fix config --- test/new_visualize_flow/{config.js => config.ts} | 15 +++++++-------- ...hboard_embedding.js => dashboard_embedding.ts} | 4 +++- 2 files changed, 10 insertions(+), 9 deletions(-) rename test/new_visualize_flow/{config.js => config.ts} (90%) rename test/new_visualize_flow/{dashboard_embedding.js => dashboard_embedding.ts} (94%) diff --git a/test/new_visualize_flow/config.js b/test/new_visualize_flow/config.ts similarity index 90% rename from test/new_visualize_flow/config.js rename to test/new_visualize_flow/config.ts index c4790a35404c9..2b58169222822 100644 --- a/test/new_visualize_flow/config.js +++ b/test/new_visualize_flow/config.ts @@ -17,18 +17,16 @@ * under the License. */ -import { pageObjects } from '../functional/page_objects'; -import { services } from '../functional/services'; +import { FtrConfigProviderContext } from '@kbn/test/types/ftr'; -export default async function ({ readConfigFile }) { +export default async function ({ readConfigFile }: FtrConfigProviderContext) { const commonConfig = await readConfigFile(require.resolve('../functional/config.js')); return { - testFiles: [require.resolve('./dashboard_embedding')], - pageObjects, - services, + testFiles: [require.resolve('./index.ts')], + pageObjects: commonConfig.get('pageObjects'), + services: commonConfig.get('services'), servers: commonConfig.get('servers'), - esTestCluster: commonConfig.get('esTestCluster'), kbnTestServer: { @@ -37,6 +35,7 @@ export default async function ({ readConfigFile }) { ...commonConfig.get('kbnTestServer.serverArgs'), '--oss', '--telemetry.optIn=false', + '--dashboard.allowByValueEmbeddables=true', ], }, @@ -105,7 +104,7 @@ export default async function ({ readConfigFile }) { }, kibana: [], }, - //for sample data - can remove but not add sample data + // for sample data - can remove but not add sample data kibana_sample_admin: { elasticsearch: { cluster: [], diff --git a/test/new_visualize_flow/dashboard_embedding.js b/test/new_visualize_flow/dashboard_embedding.ts similarity index 94% rename from test/new_visualize_flow/dashboard_embedding.js rename to test/new_visualize_flow/dashboard_embedding.ts index b1a6bd14547fb..e947f20872697 100644 --- a/test/new_visualize_flow/dashboard_embedding.js +++ b/test/new_visualize_flow/dashboard_embedding.ts @@ -17,6 +17,7 @@ * under the License. */ +import { FtrProviderContext } from 'test/functional/ftr_provider_context'; import expect from '@kbn/expect'; /** @@ -27,7 +28,8 @@ import expect from '@kbn/expect'; * broke?). The upside is that this offers very good coverage with a minimal time investment. */ -export default function ({ getService, getPageObjects }) { +// eslint-disable-next-line import/no-default-export +export default function ({ getService, getPageObjects }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const kibanaServer = getService('kibanaServer'); const dashboardExpect = getService('dashboardExpect'); From b6f82578c87e73cbb605610ebd17b02176b6618e Mon Sep 17 00:00:00 2001 From: Dzmitry Lemechko Date: Tue, 3 Nov 2020 16:24:16 +0100 Subject: [PATCH 2/2] fix file extension --- scripts/functional_tests.js | 2 +- tasks/function_test_groups.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/functional_tests.js b/scripts/functional_tests.js index 2b338b1c054aa..196a13fbb2133 100644 --- a/scripts/functional_tests.js +++ b/scripts/functional_tests.js @@ -22,7 +22,7 @@ const alwaysImportedTests = [ require.resolve('../test/functional/config.js'), require.resolve('../test/plugin_functional/config.ts'), require.resolve('../test/ui_capabilities/newsfeed_err/config.ts'), - require.resolve('../test/new_visualize_flow/config.js'), + require.resolve('../test/new_visualize_flow/config.ts'), require.resolve('../test/security_functional/config.ts'), ]; // eslint-disable-next-line no-restricted-syntax diff --git a/tasks/function_test_groups.js b/tasks/function_test_groups.js index ac41b3f36be0f..7dafc03cfab03 100644 --- a/tasks/function_test_groups.js +++ b/tasks/function_test_groups.js @@ -42,7 +42,7 @@ const getDefaultArgs = (tag) => { '--bail', '--debug', '--config', - 'test/new_visualize_flow/config.js', + 'test/new_visualize_flow/config.ts', '--config', 'test/security_functional/config.ts', ];