From d8e0e62dfd08579f4d09165b6bd9e8ba9b21e1f0 Mon Sep 17 00:00:00 2001 From: spalger Date: Thu, 28 Feb 2019 14:47:18 -0800 Subject: [PATCH] [junit] use default rootDirectory for project --- src/functional_test_runner/lib/config/schema.ts | 1 - src/functional_test_runner/lib/mocha/reporter/reporter.js | 1 - x-pack/dev-tools/jest/create_jest_config.js | 1 - x-pack/tasks/test.js | 3 +-- x-pack/test/functional/config.js | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/functional_test_runner/lib/config/schema.ts b/src/functional_test_runner/lib/config/schema.ts index 66c4e0d693fb1..8610a8d3bdbcd 100644 --- a/src/functional_test_runner/lib/config/schema.ts +++ b/src/functional_test_runner/lib/config/schema.ts @@ -135,7 +135,6 @@ export const schema = Joi.object() .keys({ enabled: Joi.boolean().default(!!process.env.CI), reportName: Joi.string(), - rootDirectory: Joi.string(), }) .default(), diff --git a/src/functional_test_runner/lib/mocha/reporter/reporter.js b/src/functional_test_runner/lib/mocha/reporter/reporter.js index 363fbee500a53..386411631c155 100644 --- a/src/functional_test_runner/lib/mocha/reporter/reporter.js +++ b/src/functional_test_runner/lib/mocha/reporter/reporter.js @@ -54,7 +54,6 @@ export function MochaReporterProvider({ getService }) { if (config.get('junit.enabled') && config.get('junit.reportName')) { setupJUnitReportGeneration(runner, { reportName: config.get('junit.reportName'), - rootDirectory: config.get('junit.rootDirectory') }); } } diff --git a/x-pack/dev-tools/jest/create_jest_config.js b/x-pack/dev-tools/jest/create_jest_config.js index cd4d6a68ef912..bf20e88333787 100644 --- a/x-pack/dev-tools/jest/create_jest_config.js +++ b/x-pack/dev-tools/jest/create_jest_config.js @@ -50,7 +50,6 @@ export function createJestConfig({ 'default', [`${kibanaDirectory}/src/dev/jest/junit_reporter.js`, { reportName: 'X-Pack Jest Tests', - rootDirectory: xPackKibanaDirectory, }] ], }; diff --git a/x-pack/tasks/test.js b/x-pack/tasks/test.js index 3016e314098ef..5d6f4a0ab4463 100644 --- a/x-pack/tasks/test.js +++ b/x-pack/tasks/test.js @@ -14,7 +14,6 @@ const MOCHA_OPTIONS = { ui: 'bdd', reporter: createAutoJUnitReporter({ reportName: 'X-Pack Mocha Tests', - rootDirectory: __dirname, }), }; @@ -52,4 +51,4 @@ export default (gulp, { mocha }) => { }); }); }); -}; \ No newline at end of file +}; diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js index 24b6dd15cec07..f1cfd20210000 100644 --- a/x-pack/test/functional/config.js +++ b/x-pack/test/functional/config.js @@ -231,7 +231,6 @@ export default async function ({ readConfigFile }) { junit: { reportName: 'X-Pack Functional Tests', - rootDirectory: resolve(__dirname, '../../'), }, };