diff --git a/nvm-exec b/nvm-exec index 44d5ddb116..c082f8fb2b 100755 --- a/nvm-exec +++ b/nvm-exec @@ -7,6 +7,7 @@ unset NVM_CD_FLAGS # shellcheck disable=SC1090,SC1091 \. "$DIR/nvm.sh" --no-use +nvm_rc_version > /dev/null && nvm_ensure_version_installed "$NVM_RC_VERSION"; if [ -n "$NODE_VERSION" ]; then nvm use "$NODE_VERSION" > /dev/null || exit 127 elif ! nvm use >/dev/null 2>&1; then diff --git a/test/fast/Running 'nvm-exec' should display required node version b/test/fast/Running 'nvm-exec' should display required node version new file mode 100755 index 0000000000..25c9a0de07 --- /dev/null +++ b/test/fast/Running 'nvm-exec' should display required node version @@ -0,0 +1,19 @@ +#!/bin/bash + +set -x +\. ../../nvm.sh + +NVM_TEST_VERSION=v0.42 + +# Write it to nvmrc +echo "$NVM_TEST_VERSION" > .nvmrc + +OUTPUT="$(../../nvm-exec 2>&1)"; +EXPECTED="N/A: version \"${NVM_TEST_VERSION}\" is not yet installed. + +You need to run \`nvm install ${NVM_TEST_VERSION}\` to install and use it. +No NODE_VERSION provided; no .nvmrc file found"; + +# Skip install, we want to test the error message +diff <(echo "${EXPECTED}") <(echo "${OUTPUT}") +rm .nvmrc diff --git a/test/fast/Set Colors/nvm_print_versions calls nvm_get_colors b/test/fast/Set Colors/nvm_print_versions calls nvm_get_colors index 55e2334993..b54d2300ba 100755 --- a/test/fast/Set Colors/nvm_print_versions calls nvm_get_colors +++ b/test/fast/Set Colors/nvm_print_versions calls nvm_get_colors @@ -2,7 +2,7 @@ \. ../../../nvm.sh -set -e +#set -e #nvm use system returns 127 and No system set message die () { # echo "$@" ; @@ -24,7 +24,7 @@ fi # default system color nvm use system OUTPUT=$(nvm_print_versions system) -FORMAT="\033[0;32m-> %12s\033[0m" +FORMAT="\033[0;33m%15s\033[0m" VERSION='system' EXPECTED_OUTPUT=$(command printf -- "${FORMAT}\\n" "${VERSION}") @@ -34,7 +34,7 @@ nvm_ls_current() { echo "current";} # default current color OUTPUT=$(nvm_print_versions current) -FORMAT="\033[0;32m-> %12s\033[0m" +FORMAT="\033[0;32m->%13s\033[0m" VERSION="current" EXPECTED_OUTPUT=$(command printf -- "${FORMAT}\\n" "${VERSION}") @@ -43,7 +43,7 @@ EXPECTED_OUTPUT=$(command printf -- "${FORMAT}\\n" "${VERSION}") # custom current color nvm set-colors YCMGR OUTPUT=$(nvm_print_versions current) -FORMAT="\033[1;35m-> %12s\033[0m" +FORMAT="\033[1;35m->%13s\033[0m" VERSION="current" EXPECTED_OUTPUT=$(command printf -- "${FORMAT}\\n" "${VERSION}")