From 228dc1c4d74fc3b7d9f33e59adba7c33ec381f0a Mon Sep 17 00:00:00 2001
From: John Gee <john@ruru.gen.nz>
Date: Sun, 20 Dec 2020 16:17:18 +1300
Subject: [PATCH] WIP: Scan package.json last (#644)

* Scan for package.json after other files (as engine)

* Add engine to help, remove chakra from code.

* Rework auto tests with best practice BATS patterm. Simpler and ignores trace logging.

* Same-line local masking possible command  error

* Oops, remove denugging
---
 README.md                                   |   4 +-
 bin/n                                       |  42 +++++--
 test/tests/version-auto-priority.bats       |  37 +++---
 test/tests/version-resolve-auto-engine.bats | 118 ++++++++------------
 test/tests/version-resolve-auto-file.bats   |  47 +++-----
 test/tests/version-resolve-auto-nvmrc.bats  |  37 ++----
 6 files changed, 133 insertions(+), 152 deletions(-)

diff --git a/README.md b/README.md
index c15499e..f6779b7 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,9 @@ There is an `auto` label to read the target version from a file in the current d
 - `.n-node-version`: version on single line. Custom to `n`.
 - `.node-version`: version on single line. Used by multiple tools: [node-version-usage](https://github.com/shadowspawn/node-version-usage)
 - `.nvmrc`: version on single line. Used by `nvm`.
-- `package.json`: use `engines` field to determine compatible `node`. Requires an installed version of `node`, and uses `npx semver` to resolve complex ranges.
+- if no version file found, look for `engine` as below.
+
+The `engine` label looks for a `package.json` file and reads the `engines` field to determine compatible `node`. Requires an installed version of `node`, and uses `npx semver` to resolve complex ranges.
 
 There is support for the named release streams:
 
diff --git a/bin/n b/bin/n
index 53e2467..0d7394f 100755
--- a/bin/n
+++ b/bin/n
@@ -222,7 +222,7 @@ function is_lts_codename() {
 
 function is_download_folder() {
   # e.g. nightly
-  [[ "$1" =~ ^(chakracore-nightly|chakracore-rc|chakracore-release|next-nightly|nightly|rc|release|test|v8-canary)$ ]]
+  [[ "$1" =~ ^(next-nightly|nightly|rc|release|test|v8-canary)$ ]]
 }
 
 #
@@ -373,10 +373,11 @@ Versions:
     lts               Newest Long Term Support official release
     latest, current   Newest official release
     auto              Read version from file: .n-node-version, .node-version, .nvmrc, or package.json
+    engine            Read version from package.json
     boron, carbon     Codenames for release streams
     lts_latest        node support aliases
 
-    and nightly, chakracore-release/latest, rc/10 et al
+    and nightly, rc/10 et al
 
 EOF
 }
@@ -684,7 +685,6 @@ install() {
     fi
   fi
 
-  echo
   log installing "${g_mirror_folder_name}-v$version"
 
   local url="$(tarball_url "$version")"
@@ -709,7 +709,6 @@ install() {
   if "$ACTIVATE" ; then
     activate "${g_mirror_folder_name}/$version"
   fi
-  echo
 }
 
 #
@@ -969,6 +968,7 @@ function display_package_engine_version() {
   range="$(node -e "package = require('${filepath}'); if (package && package.engines && package.engines.node) console.log(package.engines.node)")"
   trace_log "read" "${range}"
   if [[ -z "${range}" || "*" == "${range}" ]]; then
+    trace_log "target" "current"
     echo "current"
     return
   fi
@@ -983,6 +983,7 @@ function display_package_engine_version() {
       \~) [[ "${version}" =~ ^([0-9]+\.[0-9]+)\.[0-9]+$ ]] && version="${BASH_REMATCH[1]}" ;;
       ^) [[ "${version}" =~ ^([0-9]+) ]] && version="${BASH_REMATCH[1]}" ;;
     esac
+    trace_log "target" "${version}"
   else
     command -v npx &> /dev/null || abort "an active version of npx is required to use complex 'engine' ranges from package.json"
     trace_log "resolving" "${range}"
@@ -1015,11 +1016,32 @@ function display_nvmrc_version() {
   echo "${version}"
 }
 
+#
+# Synopsis: display_engine_version [error-message]
+#
+
+function display_engine_version() {
+  local error_message="${1-package.json not found}"
+  local parent
+  parent="${PWD}"
+  while [[ -n "${parent}" ]]; do
+    if [[ -e "${parent}/package.json" ]]; then
+      display_package_engine_version "${parent}/package.json"
+    else
+      parent=${parent%/*}
+      continue
+    fi
+    break
+  done
+  [[ -n "${parent}" ]] || abort "${error_message}"
+}
+
 #
 # Synopsis: display_auto_version
 #
 
 function display_auto_version() {
+  # Search for a version control file first
   local parent
   parent="${PWD}"
   while [[ -n "${parent}" ]]; do
@@ -1029,26 +1051,28 @@ function display_auto_version() {
       display_file_node_version "${parent}/.node-version"
     elif [[ -e "${parent}/.nvmrc" ]]; then
       display_nvmrc_version "${parent}/.nvmrc"
-    elif [[ -e "${parent}/package.json" ]]; then
-      display_package_engine_version "${parent}/package.json"
     else
       parent=${parent%/*}
       continue
     fi
     break
   done
-  [[ -n "${parent}" ]] || abort "no file found for auto version"
+  # Fallback to package.json
+  [[ -n "${parent}" ]] || display_engine_version "no file found for auto version (.n-node-version, .node-version, .nvmrc, or package.json)"
 }
-
 #
 # Synopsis: display_latest_resolved_version version
 #
 
 function display_latest_resolved_version() {
   local version=${1}
+  # auto and engine make sense for local use and not much for ls-remote, so handled here rather than display_remote_versions
   if [[ "${version}" = "auto" ]]; then
     version="$(display_auto_version)" || return 2
   fi
+  if [[ "${version}" = "engine" ]]; then
+    version="$(display_engine_version)" || return 2
+  fi
   simple_version=${version#node/} # Only place supporting node/ [sic]
   if is_exact_numeric_version "${simple_version}"; then
     # Just numbers, already resolved, no need to lookup first.
@@ -1233,7 +1257,7 @@ function show_diagnostics() {
   printf "\nnode\n"
   if command -v node &> /dev/null; then
     command -v node && node --version
-    node -e 'if (process.versions.v8) console.log("JavaScript engine: v8"); if (process.versions.chakracore) console.log("JavaScript engine: chakracore")'
+    node -e 'if (process.versions.v8) console.log("JavaScript engine: v8");'
 
     printf "\nnpm\n"
     command -v npm && npm --version
diff --git a/test/tests/version-auto-priority.bats b/test/tests/version-auto-priority.bats
index e7647c7..854fe95 100644
--- a/test/tests/version-auto-priority.bats
+++ b/test/tests/version-auto-priority.bats
@@ -10,13 +10,12 @@ function setup() {
   tmpdir="${TMPDIR:-/tmp}"
   export MY_DIR="${tmpdir}/n/test/version-resolve-auto-priority"
   mkdir -p "${MY_DIR}"
+  # Bit fragile, but reuse directory and clean up between tests.
   rm -f "${MY_DIR}/package.json"
   rm -f "${MY_DIR}/.n-node-version"
   rm -f "${MY_DIR}/.node-version"
   rm -f "${MY_DIR}/.nvmrc"
 
-  PAYLOAD_LINE=2
-
   # Need a version of node available for reading package.json
   export N_PREFIX="${MY_DIR}"
   export PATH="${MY_DIR}/bin:${PATH}"
@@ -40,9 +39,8 @@ function teardown() {
   echo "401.0.3" > .nvmrc
   echo '{ "engines" : { "node" : "v401.0.4" } }' > package.json
 
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "401.0.1" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "401.0.1" ]
 }
 
 @test ".node-version second" {
@@ -51,9 +49,8 @@ function teardown() {
   echo "401.0.3" > .nvmrc
   echo '{ "engines" : { "node" : "v401.0.4" } }' > package.json
 
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "401.0.2" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "401.0.2" ]
 }
 
 @test ".nvmrc third" {
@@ -61,17 +58,29 @@ function teardown() {
   echo "401.0.3" > .nvmrc
   echo '{ "engines" : { "node" : "v401.0.4" } }' > package.json
 
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "401.0.3" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "401.0.3" ]
 }
 
 @test ".package.json last" {
   cd "${MY_DIR}"
   echo '{ "engines" : { "node" : "v401.0.4" } }' > package.json
 
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "401.0.4" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "401.0.4" ]
 }
 
+@test ".package.json last, after parent scanning" {
+  cd "${MY_DIR}"
+  echo "401.0.2" > .node-version
+  mkdir package
+  cd package
+  echo '{ "engines" : { "node" : "v401.0.4" } }' > package.json
+
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "401.0.2" ]
+
+  rm package.json
+  cd ..
+  rmdir package
+}
diff --git a/test/tests/version-resolve-auto-engine.bats b/test/tests/version-resolve-auto-engine.bats
index e6ff582..49d1a9c 100644
--- a/test/tests/version-resolve-auto-engine.bats
+++ b/test/tests/version-resolve-auto-engine.bats
@@ -4,6 +4,7 @@ load shared-functions
 
 
 # auto
+# engine is a label too! These tests mostly use auto as first available only through auto.
 
 function setup() {
   unset_n_env
@@ -19,21 +20,6 @@ function setup() {
   if [[ "${BATS_TEST_NUMBER}" -eq 1 ]] ; then
     n install lts
   fi
-
-  # Output looks likes:
-  ##        found : package.json
-  ##         read : 101.0.1
-  ## v101.0.1
-  # so version payload is...
-  PAYLOAD_SIMPLE_LINE=2
-
-  # Output looks likes:
-  ##        found : package.json
-  ##       read : 4.8.2 - 4.8.4
-  ##  resolving : 4.8.2 - 4.8.4
-  ## v4.8.4
-  # so version payload is...
-  PAYLOAD_COMPLEX_LINE=3
 }
 
 function teardown() {
@@ -54,123 +40,115 @@ function write_engine() {
 @test "auto engine, 104.0.1" {
   cd "${MY_DIR}"
   write_engine "103.0.1"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "103.0.1" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "103.0.1" ]
 }
 
 @test "auto engine, v104.0.2" {
   cd "${MY_DIR}"
   write_engine "v104.0.2"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "104.0.2" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "104.0.2" ]
 }
 
 @test "auto engine, =104.0.3" {
   cd "${MY_DIR}"
   write_engine "=103.0.3"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "103.0.3" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "103.0.3" ]
 }
 
 @test "auto engine, =v104.0.4" {
   cd "${MY_DIR}"
   write_engine "=v104.0.4"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "104.0.4" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "104.0.4" ]
+}
+
+@test "engine, =v104.0.5" {
+  cd "${MY_DIR}"
+  write_engine "=v104.0.5"
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION engine)"
+  [ "${output}" = "104.0.5" ]
 }
 
 @test "auto engine, >1" {
   local TARGET_VERSION="$(display_remote_version latest)"
   cd "${MY_DIR}"
   write_engine ">1"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "${TARGET_VERSION}" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "${TARGET_VERSION}" ]
 }
 
 @test "auto engine, >=2" {
   local TARGET_VERSION="$(display_remote_version latest)"
   cd "${MY_DIR}"
   write_engine ">=2"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "${TARGET_VERSION}" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "${TARGET_VERSION}" ]
 }
 
 @test "auto engine, 8" {
   cd "${MY_DIR}"
   write_engine "8"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "8.17.0" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.17.0" ]
 }
 
 @test "auto engine, 8.x" {
   cd "${MY_DIR}"
   write_engine "8.x"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "8.17.0" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.17.0" ]
 }
 
 @test "auto engine, 8.X" {
   cd "${MY_DIR}"
   write_engine "8.X"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "8.17.0" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.17.0" ]
 }
 
 @test "auto engine, 8.*" {
   cd "${MY_DIR}"
   write_engine "8.*"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "8.17.0" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.17.0" ]
 }
 
 @test "auto engine, ~8.11.0" {
   cd "${MY_DIR}"
   write_engine "~8.11.0"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "8.11.4" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.11.4" ]
 }
 
 @test "auto engine, ~8.11" {
   cd "${MY_DIR}"
   write_engine "~8.11"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "8.11.4" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.11.4" ]
 }
 
 @test "auto engine, ~8" {
   cd "${MY_DIR}"
   write_engine "~8"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "8.17.0" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.17.0" ]
 }
 
 @test "auto engine, ^8.11.0" {
   cd "${MY_DIR}"
   write_engine "^8.11.0"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "8.17.0" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.17.0" ]
 }
 
 @test "auto engine, ^8.x" {
   cd "${MY_DIR}"
   write_engine "^8.x"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "8.17.0" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.17.0" ]
 }
 
 @test "auto engine, subdir" {
@@ -178,31 +156,27 @@ function write_engine() {
   write_engine "8.11.2"
   mkdir -p sub-engine
   cd sub-engine
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_SIMPLE_LINE}]}" = "8.11.2" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.11.2" ]
 }
 
 @test "auto engine (semver), <8.12" {
   cd "${MY_DIR}"
   write_engine "<8.12"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_COMPLEX_LINE}]}" = "8.11.4" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.11.4" ]
 }
 
 @test "auto engine (semver), 8.11.1 - 8.11.3" {
   cd "${MY_DIR}"
   write_engine "8.11.1 - 8.11.3"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_COMPLEX_LINE}]}" = "8.11.3" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.11.3" ]
 }
 
 @test "auto engine (semver), >8.1 <8.12 || >2.1 <3.4" {
   cd "${MY_DIR}"
   write_engine ">8.1 <8.12 || >2.1 <3.4"
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_COMPLEX_LINE}]}" = "8.11.4" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "8.11.4" ]
 }
diff --git a/test/tests/version-resolve-auto-file.bats b/test/tests/version-resolve-auto-file.bats
index ba6889b..80809fa 100644
--- a/test/tests/version-resolve-auto-file.bats
+++ b/test/tests/version-resolve-auto-file.bats
@@ -15,13 +15,6 @@ function setup() {
   mkdir -p "${MY_DIR}"
   rm -f "${MY_DIR}/.n-node-version"
   rm -f "${MY_DIR}/.node-version"
-
-  # Output looks likes:
-  ##        found : .n-node-version
-  ##         read : 101.0.1
-  ## v101.0.1
-  # so payload to check is on line #2.
-  PAYLOAD_LINE=2
 }
 
 function teardown() {
@@ -40,41 +33,36 @@ function teardown() {
 @test "auto .n-node-version, no eol" {
   cd "${MY_DIR}"
   printf "101.0.1" > .n-node-version
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "101.0.1" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "101.0.1" ]
 }
 
 @test "auto .n-node-version, unix eol" {
   cd "${MY_DIR}"
   printf "101.0.2\n" > .n-node-version
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "101.0.2" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "101.0.2" ]
 }
 
 @test "auto .n-node-version, Windows eol" {
   cd "${MY_DIR}"
   printf "101.0.3\r\n" > .n-node-version
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "101.0.3" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "101.0.3" ]
 }
 
 @test "auto .n-node-version, leading v" {
   cd "${MY_DIR}"
   printf "v101.0.4\n" > .n-node-version
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "101.0.4" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "101.0.4" ]
 }
 
 @test "auto .n-node-version, first line only" {
   cd "${MY_DIR}"
   printf "101.0.5\nmore text\n" > .n-node-version
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "101.0.5" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "101.0.5" ]
 }
 
 @test "auto .n-node-version, from sub directory" {
@@ -82,18 +70,16 @@ function teardown() {
   printf "101.0.6\nmore text\n" > .n-node-version
   mkdir -p sub6
   cd sub6
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "101.0.6" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "101.0.6" ]
 }
 
 @test "auto .node-version, partial version lookup" {
   # Check normal resolving
   cd "${MY_DIR}"
   printf "4.9\n" > .node-version
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "4.9.1" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "4.9.1" ]
 }
 
 @test "auto .node-version, from sub directory" {
@@ -101,8 +87,7 @@ function teardown() {
   printf "101.0.7\nmore text\n" > .n-node-version
   mkdir -p sub7
   cd sub7
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "101.0.7" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "101.0.7" ]
 }
 
diff --git a/test/tests/version-resolve-auto-nvmrc.bats b/test/tests/version-resolve-auto-nvmrc.bats
index d7ed31d..e146037 100644
--- a/test/tests/version-resolve-auto-nvmrc.bats
+++ b/test/tests/version-resolve-auto-nvmrc.bats
@@ -13,13 +13,6 @@ function setup() {
   export MY_DIR="${tmpdir}/n/test/version-resolve-auto-nvmrc"
   mkdir -p "${MY_DIR}"
   rm -f "${MY_DIR}/.nvmrc"
-
-  # Output looks likes:
-  ##        found : .nvmrc
-  ##         read : 101.0.1
-  ## v101.0.1
-  # so payload to check is on line #2.
-  PAYLOAD_LINE=2
 }
 
 function teardown() {
@@ -32,44 +25,39 @@ function teardown() {
 @test "auto .nvmrc, numeric" {
   cd "${MY_DIR}"
   printf "102.0.1\n" > .nvmrc
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "102.0.1" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "102.0.1" ]
 }
 
 @test "auto .nvmrc, numeric with leading v" {
   cd "${MY_DIR}"
   printf "v102.0.2\n" > .nvmrc
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "102.0.2" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "102.0.2" ]
 }
 
 @test "auto .nvmrc, node" {
   local TARGET_VERSION="$(display_remote_version latest)"
   cd "${MY_DIR}"
   printf "node\n" > .nvmrc
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "${TARGET_VERSION}" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "${TARGET_VERSION}" ]
 }
 
 @test "auto .nvmrc, lts/*" {
   local TARGET_VERSION="$(display_remote_version lts)"
   cd "${MY_DIR}"
   printf "lts/*\n" > .nvmrc
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "${TARGET_VERSION}" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "${TARGET_VERSION}" ]
 }
 
 @test "auto .nvmrc, lts/argon" {
   local TARGET_VERSION="$(display_remote_version lts)"
   cd "${MY_DIR}"
   printf "lts/argon\n" > .nvmrc
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "4.9.1" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "4.9.1" ]
 }
 
 @test "auto .nvmrc, sub directory" {
@@ -77,7 +65,6 @@ function teardown() {
   printf "v102.0.3\n" > .nvmrc
   mkdir -p sub-npmrc
   cd sub-npmrc
-  run n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto
-  [ "$status" -eq 0 ]
-  [ "${lines[${PAYLOAD_LINE}]}" = "102.0.3" ]
+  output="$(n N_TEST_DISPLAY_LATEST_RESOLVED_VERSION auto)"
+  [ "${output}" = "102.0.3" ]
 }