Skip to content

Commit c2d4745

Browse files
committed
feat: fix tests
Signed-off-by: Ruben Romero Montes <[email protected]>
1 parent 1462958 commit c2d4745

File tree

4 files changed

+48
-14
lines changed

4 files changed

+48
-14
lines changed

package-lock.json

+35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/providers/base_javascript.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import fs from 'node:fs'
22
import os from "node:os";
3-
import { handleSpacesInPath, invokeCommand } from "../tools.js";
3+
import { invokeCommand } from "../tools.js";
44
import path from 'node:path'
55
import Sbom from '../sbom.js'
66
import { PackageURL } from 'packageurl-js'
@@ -171,7 +171,7 @@ export default class Base_javascript {
171171
#executeListCmd(includeTransitive, manifestDir) {
172172
const listArgs = this._listCmdArgs(includeTransitive, manifestDir);
173173
try {
174-
invokeCommand(this._cmdName(), listArgs)
174+
return invokeCommand(this._cmdName(), listArgs)
175175
} catch (error) {
176176
throw new Error(`failed to list dependencies via "${this._cmdName()} ${listArgs.join(' ')}" - Error: ${error}`, {cause: error});
177177
}
@@ -195,9 +195,8 @@ export default class Base_javascript {
195195
if (os.platform() === 'win32') {
196196
process.chdir(manifestDir)
197197
}
198-
198+
const args = this._updateLockFileCmdArgs(manifestDir);
199199
try {
200-
const args = this._updateLockFileCmdArgs(manifestDir);
201200
invokeCommand(this._cmdName(), args)
202201
} catch (error) {
203202
throw new Error(`failed to create lockfile "${args}" - Error: ${error}`, {cause: error});

src/providers/javascript_pnpm.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ export default class Javascript_pnpm extends Base_javascript {
1111
}
1212

1313
_listCmdArgs(includeTransitive, manifestDir) {
14-
const args = ['ls', includeTransitive ? '--all' : '--depth=0', '--prod', '--json'];
14+
const args = ['ls', includeTransitive ? '--depth=Infinity' : '--depth=0', '--prod', '--json'];
1515
if (manifestDir) {
16-
args.push('--prefix', manifestDir);
16+
args.push('--dir', manifestDir);
1717
}
1818
return args;
1919
}
2020

2121
_updateLockFileCmdArgs(manifestDir) {
2222
const args = ['install', '--frozen-lockfile'];
2323
if (manifestDir) {
24-
args.push('--prefix', manifestDir)
24+
args.push('--dir', manifestDir)
2525
}
2626
args.push(...[])
2727
return args;

test/providers/javascript.test.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ let clock
99

1010
async function mockProvider(providerName, listingOutput) {
1111

12-
const mockExecSync = (cmd) => {
13-
if (cmd.includes('--version')) { return ''; }
12+
const mockInvokeCommand = (_cmd, args) => {
13+
if (args.includes('--version')) {return '';}
1414
return listingOutput;
15-
}
15+
};
1616

17-
return esmock(`../../src/providers/Javascript_${providerName}.js`, {
18-
'../../src/providers/Base_javascript.js': await esmock('../../src/providers/base_javascript.js', {
19-
'node:child_process': {
20-
execSync: mockExecSync
17+
return esmock(`../../src/providers/javascript_${providerName}.js`, {
18+
'../../src/providers/base_javascript.js': await esmock('../../src/providers/base_javascript.js', {
19+
'../../src/tools.js': {
20+
invokeCommand: mockInvokeCommand
2121
}
2222
})
2323
});

0 commit comments

Comments
 (0)