cleaned up the code by moving the prefixed arguments removal to getcl…

…iargs
WordPress · Mar 15, 2019 · a50944e · a50944e
1 parent 3bb652a
commit a50944e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/packages/scripts/scripts/test-e2e.js b/packages/scripts/scripts/test-e2e.js
@@ -20,10 +20,10 @@ const jest = require( 'jest' );
 const {
 	fromConfigRoot,
 	getCliArg,
+	getCliArgs,
 	hasCliArg,
 	hasProjectFile,
 	hasJestConfig,
-	cleanUpArgs,
 } = require( '../utils' );
 
 // Provides a default config path for Puppeteer when jest-puppeteer.config.js
@@ -46,8 +46,8 @@ const runInBand = ! hasRunInBand ?
 const cleanUpPrefixes = [ '--puppeteer-' ];
 
 if ( hasCliArg( '--puppeteer-interactive' ) ) {
-	process.env.PUPPETEER_HEADLESS = false;
+	process.env.PUPPETEER_HEADLESS = 'false';
 	process.env.PUPPETEER_SLOWMO = getCliArg( '--puppeteer-slowmo' ) || 80;
 }
 
-jest.run( [ ...config, ...runInBand, ...cleanUpArgs( cleanUpPrefixes ) ] );
+jest.run( [ ...config, ...runInBand, ...getCliArgs( cleanUpPrefixes ) ] );
diff --git a/packages/scripts/utils/cli.js b/packages/scripts/utils/cli.js
@@ -24,12 +24,6 @@ const getCliArg = ( arg ) => {
 	}
 };
 
-const cleanUpArgs = ( prefixes ) => {
-	return getCliArgs().filter( ( arg ) => {
-		return ! prefixes.some( ( prefix ) => arg.startsWith( prefix ) );
-	} );
-};
-
 const hasCliArg = ( arg ) => getCliArg( arg ) !== undefined;
 
 const handleSignal = ( signal ) => {
@@ -88,5 +82,4 @@ module.exports = {
 	getCliArgs,
 	hasCliArg,
 	spawnScript,
-	cleanUpArgs,
 };
diff --git a/packages/scripts/utils/process.js b/packages/scripts/utils/process.js
@@ -1,4 +1,12 @@
-const getCliArgs = () => process.argv.slice( 2 );
+const getCliArgs = ( excludePrefixes ) => {
+	const args = process.argv.slice( 2 );
+	if ( excludePrefixes ) {
+		return args.filter( ( arg ) => {
+			return ! excludePrefixes.some( ( prefix ) => arg.startsWith( prefix ) );
+		} );
+	}
+	return args;
+};
 
 module.exports = {
 	exit: process.exit,