github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

resolve merge conflict (#143790)

Browse source
This commit is contained in:
Lee Drengenberg 2022-10-20 17:45:26 -05:00 • committed by GitHub
parent 9265b3db75
commit eb2030c80e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
View file

@ -12,6 +12,9 @@ import { REPO_ROOT } from '@kbn/utils';
import chalk from 'chalk';
import { esTestConfig, kbnTestConfig } from '@kbn/test';
import { TriggersActionsPageProvider } from '../../functional_with_es_ssl/page_objects/triggers_actions_ui_page';
import { ReportingAPIProvider } from '../../upgrade/services/reporting_upgrade_services';
import { MapsHelper } from '../../upgrade/services/maps_upgrade_services';
import { RulesHelper } from '../../upgrade/services/rules_upgrade_services';
const log = new ToolingLog({
level: 'info',
@ -24,6 +27,7 @@ const testsFolder = '../apps';
const prepend = (testFile) => require.resolve(`${testsFolder}/${testFile}`);
export default async ({ readConfigFile }) => {
const apiConfig = await readConfigFile(require.resolve('../../api_integration/config'));
const xpackFunctionalConfig = await readConfigFile(
require.resolve('../../functional/config.base.js')
);
@ -65,6 +69,13 @@ export default async ({ readConfigFile }) => {
screenshots: {
directory: resolve(INTEGRATION_TEST_ROOT, 'test/screenshots'),
},
services: {
...apiConfig.get('services'),
...xpackFunctionalConfig.get('services'),
reportingAPI: ReportingAPIProvider,
mapsHelper: MapsHelper,
rulesHelper: RulesHelper,
},
};
return settings;
};