Skip to content

Commit 5c4bffe

Browse files
committed
fix: fix npm tests runner
1 parent 190e2c7 commit 5c4bffe

2 files changed

Lines changed: 6 additions & 39 deletions

File tree

lib/package.js

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -612,28 +612,8 @@ export default class Package {
612612
}
613613
}
614614

615-
runScript ( script, argv ) {
616-
if ( !this.config.scripts?.[ script ] ) return result( 200 );
617-
618-
if ( argv?.length ) {
619-
argv = [ "--", ...argv ];
620-
}
621-
else {
622-
argv = [];
623-
}
624-
625-
const res = childProcess.spawnSync( shellQuote( [ "npm", "run", script, ...argv ] ), {
626-
"cwd": this.root,
627-
"stdio": "inherit",
628-
"shell": true,
629-
} );
630-
631-
if ( res.status ) {
632-
return result( 500 );
633-
}
634-
else {
635-
return result( 200 );
636-
}
615+
async runScript ( script, args ) {
616+
return this.npm.runScript( script, { args } );
637617
}
638618

639619
async getOutdatedDependencies ( { all } = {} ) {
@@ -947,27 +927,14 @@ export default class Package {
947927
return result( 200 );
948928
}
949929

950-
test ( { log } = {} ) {
930+
async runTests ( { log } = {} ) {
951931
var res;
952932

953933
if ( !this.config.scripts?.test ) {
954934
res = result( [ 200, "No tests to run" ] );
955935
}
956936
else {
957-
res = childProcess.spawnSync( "npm test", {
958-
"cwd": this.root,
959-
"stdio": "pipe",
960-
"shell": true,
961-
} );
962-
963-
if ( res.status ) {
964-
console.log( res.stderr + "" );
965-
966-
res = result( [ 500, "Tests failed" ] );
967-
}
968-
else {
969-
res = result( 200 );
970-
}
937+
res = await this.npm.runScript( "test", { log } );
971938
}
972939

973940
if ( log ) {

lib/package/release.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,12 @@ export default class PackageRelease {
217217
}
218218

219219
// run tests
220-
res = this.#pkg.test( { "log": true } );
220+
res = await this.#pkg.runTests( { "log": true } );
221221
if ( !res.ok ) return res;
222222

223223
if ( subPackages.length ) {
224224
for ( const pkg of subPackages ) {
225-
res = pkg.test( { "log": true } );
225+
res = await pkg.runTests( { "log": true } );
226226

227227
if ( !res.ok ) return res;
228228
}

0 commit comments

Comments
 (0)