[Fix] nvm install -s: npm detection

- add `nvm_use_if_needed`
 - add `nvm_install_npm_if_needed`
This commit is contained in:
Jordan Harband
2017-03-27 15:00:50 -07:00
parent 676fff0219
commit b9f9977cdd
3 changed files with 57 additions and 19 deletions

View File

@@ -0,0 +1,24 @@
#!/bin/sh
cleanup() { unset -f nvm_ls_current nvm; }
die () { echo "$@" ; cleanup ; exit 1; }
\. ../../../nvm.sh
nvm_ls_current() { echo foo; }
nvm() {
echo "nvm: $@"
}
OUTPUT="$(nvm_use_if_needed foo)"
EXPECTED_OUTPUT=''
[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "expected >${EXPECTED_OUTPUT}<; got >${OUTPUT}<"
OUTPUT="$(nvm_use_if_needed bar)"
EXPECTED_OUTPUT='nvm: use bar'
[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "expected >${EXPECTED_OUTPUT}<; got >${OUTPUT}<"
cleanup

View File

@@ -23,8 +23,7 @@ OUTPUT="$(NVM_INSTALL_THIRD_PARTY_HOOK=succeed nvm install "${VERSION}")"
USE_OUTPUT="$(nvm use "${VERSION}")"
EXPECTED_OUTPUT="${VERSION} node std binary ${VERSION_PATH}
Downloading and installing node ${VERSION}...
${USE_OUTPUT}
${USE_OUTPUT}" # double use output is from the normal install in succeed()
${USE_OUTPUT}"
[ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "expected >${EXPECTED_OUTPUT}<; got >${OUTPUT}<"