From 5bf014b952f1e82620b5f100955d68136623c185 Mon Sep 17 00:00:00 2001 From: Thijs Louisse Date: Mon, 29 Jun 2020 17:42:53 +0200 Subject: [PATCH] fix(providence-analytics): extensions argument extend-docs --- packages/providence-analytics/src/cli/cli.js | 20 +++++++------------ .../test-node/cli/cli.test.js | 12 +++++------ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/packages/providence-analytics/src/cli/cli.js b/packages/providence-analytics/src/cli/cli.js index 25e3014b5..8e5e53b13 100755 --- a/packages/providence-analytics/src/cli/cli.js +++ b/packages/providence-analytics/src/cli/cli.js @@ -147,7 +147,7 @@ async function cli({ cwd, addProjectDependencyPaths } = {}) { commander .version(version, '-v, --version') - .option('-e, --extensions [extensions]', 'extensions like ".js, .html"', extensionsFromCs, [ + .option('-e, --extensions [extensions]', 'extensions like "js,html"', extensionsFromCs, [ '.js', '.html', ]) @@ -198,9 +198,7 @@ async function cli({ cwd, addProjectDependencyPaths } = {}) { searchMode = 'search-query'; regexSearchOptions = options; regexSearchOptions.regexString = regexString; - launchProvidence() - .then(() => resolveCli()) - .catch(() => rejectCli()); + launchProvidence().then(resolveCli).catch(rejectCli); }); commander @@ -212,9 +210,7 @@ async function cli({ cwd, addProjectDependencyPaths } = {}) { searchMode = 'feature-query'; featureOptions = options; featureOptions.queryString = queryString; - launchProvidence() - .then(() => resolveCli()) - .catch(() => rejectCli()); + launchProvidence().then(resolveCli).catch(rejectCli); }); commander @@ -234,9 +230,7 @@ async function cli({ cwd, addProjectDependencyPaths } = {}) { searchMode = 'analyzer-query'; analyzerOptions = options; analyzerOptions.name = analyzerName; - launchProvidence() - .then(() => resolveCli()) - .catch(() => rejectCli()); + launchProvidence().then(resolveCli).catch(rejectCli); }); commander @@ -278,12 +272,12 @@ async function cli({ cwd, addProjectDependencyPaths } = {}) { referenceProjectPaths: commander.referencePaths, prefixCfg, outputFolder: options.outputFolder, - extensions: commander.referencePaths, + extensions: commander.extensions, whitelist: commander.whitelist, whitelistReference: commander.whitelistReference, }) - .then(() => resolveCli()) - .catch(() => rejectCli()); + .then(resolveCli) + .catch(rejectCli); }); commander diff --git a/packages/providence-analytics/test-node/cli/cli.test.js b/packages/providence-analytics/test-node/cli/cli.test.js index 36405d453..7fb19d554 100644 --- a/packages/providence-analytics/test-node/cli/cli.test.js +++ b/packages/providence-analytics/test-node/cli/cli.test.js @@ -54,7 +54,7 @@ describe('Providence CLI', () => { let qConfStub; beforeEach(() => { qConfStub = sinon.stub(QueryService, 'getQueryConfigFromAnalyzer').returns({ analyzer: {} }); - providenceStub = sinon.stub(providenceModule, 'providence'); + providenceStub = sinon.stub(providenceModule, 'providence').returns(Promise.resolve()); }); afterEach(() => { @@ -145,11 +145,9 @@ describe('Providence CLI', () => { describe('Extend docs', () => { let extendDocsStub; beforeEach(() => { - extendDocsStub = sinon.stub(extendDocsModule, 'launchProvidenceWithExtendDocs').returns( - new Promise(resolve => { - resolve(); - }), - ); + extendDocsStub = sinon + .stub(extendDocsModule, 'launchProvidenceWithExtendDocs') + .returns(Promise.resolve()); }); afterEach(() => { @@ -177,7 +175,7 @@ describe('Providence CLI', () => { to: 'pto', }, outputFolder: '/outp', - extensions: ['/xyz/x'], + extensions: ['.bla'], whitelist: [`${process.cwd()}/wl`], whitelistReference: [`${process.cwd()}/wlr`], });