ayo/lion
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #790 from ing-bank/fix/providenceExtensions

Browse source 
fix(providence-analytics): extensions argument extend-docs
This commit is contained in:
Thijs Louisse 2020-06-29 17:51:30 +02:00 committed by GitHub
commit 1962c3cefd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
packages/providence-analytics/src/cli/cli.js
View file

@ -147,7 +147,7 @@ async function cli({ cwd, addProjectDependencyPaths } = {}) {
commander commander
.version(version, '-v, --version') .version(version, '-v, --version')
.option('-e, --extensions [extensions]', 'extensions like ".js, .html"', extensionsFromCs, [ .option('-e, --extensions [extensions]', 'extensions like "js,html"', extensionsFromCs, [
'.js', '.js',
'.html', '.html',
]) ])
@ -198,9 +198,7 @@ async function cli({ cwd, addProjectDependencyPaths } = {}) {
searchMode = 'search-query'; searchMode = 'search-query';
regexSearchOptions = options; regexSearchOptions = options;
regexSearchOptions.regexString = regexString; regexSearchOptions.regexString = regexString;
launchProvidence() launchProvidence().then(resolveCli).catch(rejectCli);
.then(() => resolveCli())
.catch(() => rejectCli());
}); });
commander commander
@ -212,9 +210,7 @@ async function cli({ cwd, addProjectDependencyPaths } = {}) {
searchMode = 'feature-query'; searchMode = 'feature-query';
featureOptions = options; featureOptions = options;
featureOptions.queryString = queryString; featureOptions.queryString = queryString;
launchProvidence() launchProvidence().then(resolveCli).catch(rejectCli);
.then(() => resolveCli())
.catch(() => rejectCli());
}); });
commander commander
@ -234,9 +230,7 @@ async function cli({ cwd, addProjectDependencyPaths } = {}) {
searchMode = 'analyzer-query'; searchMode = 'analyzer-query';
analyzerOptions = options; analyzerOptions = options;
analyzerOptions.name = analyzerName; analyzerOptions.name = analyzerName;
launchProvidence() launchProvidence().then(resolveCli).catch(rejectCli);
.then(() => resolveCli())
.catch(() => rejectCli());
}); });
commander commander
@ -278,12 +272,12 @@ async function cli({ cwd, addProjectDependencyPaths } = {}) {
referenceProjectPaths: commander.referencePaths, referenceProjectPaths: commander.referencePaths,
prefixCfg, prefixCfg,
outputFolder: options.outputFolder, outputFolder: options.outputFolder,
extensions: commander.referencePaths, extensions: commander.extensions,
whitelist: commander.whitelist, whitelist: commander.whitelist,
whitelistReference: commander.whitelistReference, whitelistReference: commander.whitelistReference,
}) })
.then(() => resolveCli()) .then(resolveCli)
.catch(() => rejectCli()); .catch(rejectCli);
}); });
commander commander

12
packages/providence-analytics/test-node/cli/cli.test.js
View file

@ -54,7 +54,7 @@ describe('Providence CLI', () => {
let qConfStub; let qConfStub;
beforeEach(() => { beforeEach(() => {
qConfStub = sinon.stub(QueryService, 'getQueryConfigFromAnalyzer').returns({ analyzer: {} }); qConfStub = sinon.stub(QueryService, 'getQueryConfigFromAnalyzer').returns({ analyzer: {} });
providenceStub = sinon.stub(providenceModule, 'providence'); providenceStub = sinon.stub(providenceModule, 'providence').returns(Promise.resolve());
}); });
afterEach(() => { afterEach(() => {
@ -145,11 +145,9 @@ describe('Providence CLI', () => {
describe('Extend docs', () => { describe('Extend docs', () => {
let extendDocsStub; let extendDocsStub;
beforeEach(() => { beforeEach(() => {
extendDocsStub = sinon.stub(extendDocsModule, 'launchProvidenceWithExtendDocs').returns( extendDocsStub = sinon
new Promise(resolve => { .stub(extendDocsModule, 'launchProvidenceWithExtendDocs')
resolve(); .returns(Promise.resolve());
}),
);
}); });
afterEach(() => { afterEach(() => {
@ -177,7 +175,7 @@ describe('Providence CLI', () => {
to: 'pto', to: 'pto',
}, },
outputFolder: '/outp', outputFolder: '/outp',
extensions: ['/xyz/x'], extensions: ['.bla'],
whitelist: [`${process.cwd()}/wl`], whitelist: [`${process.cwd()}/wl`],
whitelistReference: [`${process.cwd()}/wlr`], whitelistReference: [`${process.cwd()}/wlr`],
}); });