Skip to content

Commit

Permalink
[test/new_visualize_flow] fix config (#82441)
Browse files Browse the repository at this point in the history
* [test/new_visualize_flow] fix config

* fix file extension
  • Loading branch information
dmlemeshko authored Nov 4, 2020
1 parent fe3b053 commit ae3f4f5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion scripts/functional_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tasks/function_test_groups.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -37,6 +35,7 @@ export default async function ({ readConfigFile }) {
...commonConfig.get('kbnTestServer.serverArgs'),
'--oss',
'--telemetry.optIn=false',
'--dashboard.allowByValueEmbeddables=true',
],
},

Expand Down Expand Up @@ -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: [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* under the License.
*/

import { FtrProviderContext } from 'test/functional/ftr_provider_context';
import expect from '@kbn/expect';

/**
Expand All @@ -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');
Expand Down

0 comments on commit ae3f4f5

Please sign in to comment.