From b667ccd458b67da78337b844c0daf5020519dad3 Mon Sep 17 00:00:00 2001
From: ehmicky <ehmicky@gmail.com>
Date: Sun, 1 Sep 2024 13:42:00 +0100
Subject: [PATCH] Add more tests

---
 source/options.js |  6 ++----
 test/context.js   |  4 ++--
 test/index.js     | 11 ++++-------
 test/options.js   | 36 +++++++++++++++++++-----------------
 4 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/source/options.js b/source/options.js
index d860667..2bfd3f1 100644
--- a/source/options.js
+++ b/source/options.js
@@ -14,13 +14,11 @@ export const getOptions = ({
 }) => {
 	const cwd = cwdOption instanceof URL ? fileURLToPath(cwdOption) : path.resolve(cwdOption);
 	const env = envOption === undefined ? undefined : {...process.env, ...envOption};
-	const [stdioOption, input] = stdio[0]?.string === undefined
-		? [stdio]
-		: [['pipe', ...stdio.slice(1)], stdio[0].string];
+	const input = stdio[0]?.string;
 	return {
 		...options,
-		stdio: stdioOption,
 		input,
+		stdio: input === undefined ? stdio : ['pipe', ...stdio.slice(1)],
 		env: preferLocal ? addLocalPath(env ?? process.env, cwd) : env,
 		cwd,
 	};
diff --git a/test/context.js b/test/context.js
index 65c47f0..32123ef 100644
--- a/test/context.js
+++ b/test/context.js
@@ -3,7 +3,7 @@ import {red} from 'yoctocolors';
 import nanoSpawn from '../source/index.js';
 import {testString} from './helpers/arguments.js';
 import {assertDurationMs} from './helpers/assert.js';
-import {nodePrint, nodePrintStdout} from './helpers/commands.js';
+import {nodePrint, nodePrintFail, nodePrintStdout} from './helpers/commands.js';
 
 test('result.command does not quote normal arguments', async t => {
 	const {command} = await nanoSpawn('node', ['--version']);
@@ -27,6 +27,6 @@ test('result.durationMs is set', async t => {
 });
 
 test('error.durationMs is set', async t => {
-	const {durationMs} = await t.throwsAsync(nanoSpawn('node', ['--unknown']));
+	const {durationMs} = await t.throwsAsync(nanoSpawn(...nodePrintFail));
 	assertDurationMs(t, durationMs);
 });
diff --git a/test/index.js b/test/index.js
index 36e0914..3fb92bf 100644
--- a/test/index.js
+++ b/test/index.js
@@ -1,7 +1,6 @@
 import test from 'ava';
 import nanoSpawn from '../source/index.js';
-import {assertSigterm} from './helpers/assert.js';
-import {nodePrintStdout, nodeHanging} from './helpers/commands.js';
+import {nodePrintStdout} from './helpers/commands.js';
 
 test('Returns a promise', async t => {
 	const promise = nanoSpawn(...nodePrintStdout);
@@ -12,10 +11,8 @@ test('Returns a promise', async t => {
 });
 
 test('promise.nodeChildProcess is set', async t => {
-	const promise = nanoSpawn(...nodeHanging);
+	const promise = nanoSpawn(...nodePrintStdout);
 	const nodeChildProcess = await promise.nodeChildProcess;
-	nodeChildProcess.kill();
-
-	const error = await t.throwsAsync(promise);
-	assertSigterm(t, error);
+	t.true(Number.isInteger(nodeChildProcess.pid));
+	await promise;
 });
diff --git a/test/options.js b/test/options.js
index 48136dd..e602154 100644
--- a/test/options.js
+++ b/test/options.js
@@ -45,6 +45,14 @@ const testArgv0 = async (t, shell) => {
 test('Can pass options.argv0', testArgv0, false);
 test('Can pass options.argv0, shell', testArgv0, true);
 
+const testCwd = async (t, cwd) => {
+	const {stdout} = await nanoSpawn(...nodePrint('process.cwd()'), {cwd});
+	t.is(stdout, fixturesPath.replace(/[\\/]$/, ''));
+};
+
+test('Can pass options.cwd string', testCwd, fixturesPath);
+test('Can pass options.cwd URL', testCwd, FIXTURES_URL);
+
 const testStdOption = async (t, optionName) => {
 	const promise = nanoSpawn(...nodePrintStdout, {[optionName]: 'ignore'});
 	const subprocess = await promise.nodeChildProcess;
@@ -62,7 +70,7 @@ test('Can pass options.stdio array', async t => {
 	t.is(stdin, null);
 	t.not(stdout, null);
 	t.not(stderr, null);
-	t.not(stdio[3], null);
+	t.not(stdio[3], undefined);
 	await promise;
 });
 
@@ -76,29 +84,23 @@ test('Can pass options.stdio string', async t => {
 	await promise;
 });
 
-test('options.stdio array has priority over options.stdout', async t => {
-	const promise = nanoSpawn(...nodePrintStdout, {stdio: ['pipe', 'pipe', 'pipe'], stdout: 'ignore'});
+const testStdioPriority = async (t, stdio) => {
+	const promise = nanoSpawn(...nodePrintStdout, {stdio, stdout: 'ignore'});
 	const {stdout} = await promise.nodeChildProcess;
 	t.not(stdout, null);
 	await promise;
-});
+};
 
-test('options.stdio string has priority over options.stdout', async t => {
-	const promise = nanoSpawn(...nodePrintStdout, {stdio: 'pipe', stdout: 'ignore'});
-	const {stdout} = await promise.nodeChildProcess;
-	t.not(stdout, null);
-	await promise;
-});
+test('options.stdio array has priority over options.stdout', testStdioPriority, ['pipe', 'pipe', 'pipe']);
+test('options.stdio string has priority over options.stdout', testStdioPriority, 'pipe');
 
-test('options.stdin can be {string: string}', async t => {
-	const {stdout} = await nanoSpawn(...nodePassThrough, {stdin: {string: testString}});
+const testInput = async (t, options) => {
+	const {stdout} = await nanoSpawn(...nodePassThrough, options);
 	t.is(stdout, testString);
-});
+};
 
-test('options.stdio[0] can be {string: string}', async t => {
-	const {stdout} = await nanoSpawn(...nodePassThrough, {stdio: [{string: testString}, 'pipe', 'pipe']});
-	t.is(stdout, testString);
-});
+test('options.stdin can be {string: string}', testInput, {stdin: {string: testString}});
+test('options.stdio[0] can be {string: string}', testInput, {stdio: [{string: testString}, 'pipe', 'pipe']});
 
 const testLocalBinaryExec = async (t, cwd) => {
 	const {stdout} = await nanoSpawn(...localBinary, {preferLocal: true, cwd});