diff --git a/test/fast/Aliases/'nvm alias' should ignore leading blank lines in the file b/test/fast/Aliases/'nvm alias' should ignore leading blank lines in the file index 3fe5784..38bd1cc 100755 --- a/test/fast/Aliases/'nvm alias' should ignore leading blank lines in the file +++ b/test/fast/Aliases/'nvm alias' should ignore leading blank lines in the file @@ -4,6 +4,7 @@ die() { echo "$@" ; exit 1; } export NVM_DIR="$(cd ../../.. && pwd)" +: nvm.sh \. "${NVM_DIR}/nvm.sh" \. ../../common.sh diff --git a/test/fast/Aliases/'nvm alias' should not accept aliases with a hash b/test/fast/Aliases/'nvm alias' should not accept aliases with a hash index 3922ea7..a172a25 100755 --- a/test/fast/Aliases/'nvm alias' should not accept aliases with a hash +++ b/test/fast/Aliases/'nvm alias' should not accept aliases with a hash @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { echo "$@" ; exit 1; } diff --git a/test/fast/Aliases/'nvm alias' should not accept aliases with slashes b/test/fast/Aliases/'nvm alias' should not accept aliases with slashes index d10937d..53fc70e 100755 --- a/test/fast/Aliases/'nvm alias' should not accept aliases with slashes +++ b/test/fast/Aliases/'nvm alias' should not accept aliases with slashes @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { echo "$@" ; exit 1; } diff --git a/test/fast/Aliases/'nvm unalias' should accept aliases when they shadow a built-in alias b/test/fast/Aliases/'nvm unalias' should accept aliases when they shadow a built-in alias index d88a4fa..ff69208 100755 --- a/test/fast/Aliases/'nvm unalias' should accept aliases when they shadow a built-in alias +++ b/test/fast/Aliases/'nvm unalias' should accept aliases when they shadow a built-in alias @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { echo "$@" ; exit 1; } diff --git a/test/fast/Aliases/'nvm unalias' should not accept aliases with names equal to built-in alias b/test/fast/Aliases/'nvm unalias' should not accept aliases with names equal to built-in alias index 35bdc8f..a2dbad1 100755 --- a/test/fast/Aliases/'nvm unalias' should not accept aliases with names equal to built-in alias +++ b/test/fast/Aliases/'nvm unalias' should not accept aliases with names equal to built-in alias @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { echo "$@" ; exit 1; } diff --git a/test/fast/Aliases/'nvm unalias' should not accept aliases with slashes b/test/fast/Aliases/'nvm unalias' should not accept aliases with slashes index 2afafad..5e5fb52 100755 --- a/test/fast/Aliases/'nvm unalias' should not accept aliases with slashes +++ b/test/fast/Aliases/'nvm unalias' should not accept aliases with slashes @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { echo "$@" ; exit 1; } diff --git a/test/fast/Aliases/Running 'nvm alias ˂aliasname˃ ˂target˃' again should change the target b/test/fast/Aliases/Running 'nvm alias ˂aliasname˃ ˂target˃' again should change the target index f366beb..de0e997 100755 --- a/test/fast/Aliases/Running 'nvm alias ˂aliasname˃ ˂target˃' again should change the target +++ b/test/fast/Aliases/Running 'nvm alias ˂aliasname˃ ˂target˃' again should change the target @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Aliases/Running 'nvm alias ˂aliasname˃' should list but one alias b/test/fast/Aliases/Running 'nvm alias ˂aliasname˃' should list but one alias index 7ba4c38..2ad01ec 100755 --- a/test/fast/Aliases/Running 'nvm alias ˂aliasname˃' should list but one alias +++ b/test/fast/Aliases/Running 'nvm alias ˂aliasname˃' should list but one alias @@ -1,4 +1,5 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh [ $(nvm alias test-stable-1 | wc -l) = '2' ] diff --git a/test/fast/Aliases/Running 'nvm alias' lists implicit aliases when they do not exist b/test/fast/Aliases/Running 'nvm alias' lists implicit aliases when they do not exist index 24a341c..a89804d 100755 --- a/test/fast/Aliases/Running 'nvm alias' lists implicit aliases when they do not exist +++ b/test/fast/Aliases/Running 'nvm alias' lists implicit aliases when they do not exist @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Aliases/Running 'nvm alias' lists manual aliases instead of implicit aliases when present b/test/fast/Aliases/Running 'nvm alias' lists manual aliases instead of implicit aliases when present index 1857f44..c1bd70a 100755 --- a/test/fast/Aliases/Running 'nvm alias' lists manual aliases instead of implicit aliases when present +++ b/test/fast/Aliases/Running 'nvm alias' lists manual aliases instead of implicit aliases when present @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Aliases/Running 'nvm alias' should list all aliases b/test/fast/Aliases/Running 'nvm alias' should list all aliases index d620fe5..0435320 100755 --- a/test/fast/Aliases/Running 'nvm alias' should list all aliases +++ b/test/fast/Aliases/Running 'nvm alias' should list all aliases @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Aliases/circular/nvm_resolve_alias b/test/fast/Aliases/circular/nvm_resolve_alias index ee772bb..37f9ca2 100755 --- a/test/fast/Aliases/circular/nvm_resolve_alias +++ b/test/fast/Aliases/circular/nvm_resolve_alias @@ -3,6 +3,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../../nvm.sh ALIAS="$(nvm_resolve_alias loopback | strip_colors)" diff --git a/test/fast/Aliases/circular/nvm_resolve_local_alias b/test/fast/Aliases/circular/nvm_resolve_local_alias index 0d4b200..acb0c75 100755 --- a/test/fast/Aliases/circular/nvm_resolve_local_alias +++ b/test/fast/Aliases/circular/nvm_resolve_local_alias @@ -3,6 +3,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../../nvm.sh ALIAS="$(nvm_resolve_local_alias loopback | strip_colors)" diff --git a/test/fast/Aliases/lts/'nvm alias' should ensure LTS alias dir exists b/test/fast/Aliases/lts/'nvm alias' should ensure LTS alias dir exists index f6f3960..ff2baef 100755 --- a/test/fast/Aliases/lts/'nvm alias' should ensure LTS alias dir exists +++ b/test/fast/Aliases/lts/'nvm alias' should ensure LTS alias dir exists @@ -2,6 +2,7 @@ set -ex +: nvm.sh \. ../../../../nvm.sh \. ../../../common.sh diff --git a/test/fast/Aliases/lts/setup_dir b/test/fast/Aliases/lts/setup_dir index 4aeb067..cf96db6 100755 --- a/test/fast/Aliases/lts/setup_dir +++ b/test/fast/Aliases/lts/setup_dir @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../../nvm.sh LTS_ALIAS_PATH="$(nvm_alias_path)/lts" diff --git a/test/fast/Aliases/lts/teardown_dir b/test/fast/Aliases/lts/teardown_dir index 18863f4..cf3581b 100755 --- a/test/fast/Aliases/lts/teardown_dir +++ b/test/fast/Aliases/lts/teardown_dir @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../../nvm.sh LTS_ALIAS_PATH="$(nvm_alias_path)/lts" diff --git a/test/fast/Aliases/nvm_ensure_default_set b/test/fast/Aliases/nvm_ensure_default_set index 7e7dab8..1277c77 100755 --- a/test/fast/Aliases/nvm_ensure_default_set +++ b/test/fast/Aliases/nvm_ensure_default_set @@ -4,6 +4,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh nvm alias default 0.1 >/dev/null || die "'nvm alias default 0.1' failed" diff --git a/test/fast/Aliases/nvm_list_aliases calls nvm_get_colors b/test/fast/Aliases/nvm_list_aliases calls nvm_get_colors index 21e5127..1fb7914 100755 --- a/test/fast/Aliases/nvm_list_aliases calls nvm_get_colors +++ b/test/fast/Aliases/nvm_list_aliases calls nvm_get_colors @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { echo "$@" ; exit 1; } diff --git a/test/fast/Aliases/nvm_list_aliases works with LTS aliases b/test/fast/Aliases/nvm_list_aliases works with LTS aliases index 6af1828..75e8884 100755 --- a/test/fast/Aliases/nvm_list_aliases works with LTS aliases +++ b/test/fast/Aliases/nvm_list_aliases works with LTS aliases @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { diff --git a/test/fast/Aliases/nvm_list_aliases works with no LTS aliases present b/test/fast/Aliases/nvm_list_aliases works with no LTS aliases present index 337d1d1..6a2a25f 100755 --- a/test/fast/Aliases/nvm_list_aliases works with no LTS aliases present +++ b/test/fast/Aliases/nvm_list_aliases works with no LTS aliases present @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { diff --git a/test/fast/Aliases/nvm_print_alias_path calls nvm_get_colors b/test/fast/Aliases/nvm_print_alias_path calls nvm_get_colors index 2c49b2a..2554f06 100755 --- a/test/fast/Aliases/nvm_print_alias_path calls nvm_get_colors +++ b/test/fast/Aliases/nvm_print_alias_path calls nvm_get_colors @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { diff --git a/test/fast/Aliases/nvm_print_formatted_alias calls nvm_get_colors b/test/fast/Aliases/nvm_print_formatted_alias calls nvm_get_colors index 7f82769..70cc82f 100755 --- a/test/fast/Aliases/nvm_print_formatted_alias calls nvm_get_colors +++ b/test/fast/Aliases/nvm_print_formatted_alias calls nvm_get_colors @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { diff --git a/test/fast/Aliases/nvm_resolve_alias b/test/fast/Aliases/nvm_resolve_alias index 307c3cb..960c92b 100755 --- a/test/fast/Aliases/nvm_resolve_alias +++ b/test/fast/Aliases/nvm_resolve_alias @@ -4,6 +4,7 @@ die () { echo "$@" ; exit 1; } export NVM_DIR="$(cd ../../.. && pwd)" +: nvm.sh \. "${NVM_DIR}/nvm.sh" EXIT_CODE=$(nvm_resolve_alias ; echo $?) diff --git a/test/fast/Aliases/nvm_resolve_local_alias b/test/fast/Aliases/nvm_resolve_local_alias index 06f4374..db6a5d3 100755 --- a/test/fast/Aliases/nvm_resolve_local_alias +++ b/test/fast/Aliases/nvm_resolve_local_alias @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh EXIT_CODE=$(nvm_resolve_local_alias ; echo $?) diff --git a/test/fast/Aliases/setup b/test/fast/Aliases/setup index 9b82259..9b07b5a 100755 --- a/test/fast/Aliases/setup +++ b/test/fast/Aliases/setup @@ -2,6 +2,7 @@ export NVM_DIR="$(cd ../../.. && pwd)" +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing paths/Running 'nvm which 0.0.2' should display only version 0.0.2 b/test/fast/Listing paths/Running 'nvm which 0.0.2' should display only version 0.0.2 index 1f4eb11..24ea621 100755 --- a/test/fast/Listing paths/Running 'nvm which 0.0.2' should display only version 0.0.2 +++ b/test/fast/Listing paths/Running 'nvm which 0.0.2' should display only version 0.0.2 @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing paths/Running 'nvm which foo' should return a nonzero exit code when not found b/test/fast/Listing paths/Running 'nvm which foo' should return a nonzero exit code when not found index c0218a0..0df7da6 100755 --- a/test/fast/Listing paths/Running 'nvm which foo' should return a nonzero exit code when not found +++ b/test/fast/Listing paths/Running 'nvm which foo' should return a nonzero exit code when not found @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh nvm which nonexistent_version diff --git a/test/fast/Listing versions/Running 'nvm ls --no-alias' does not call into nvm_alias b/test/fast/Listing versions/Running 'nvm ls --no-alias' does not call into nvm_alias index 20e28ec..50d2ad9 100755 --- a/test/fast/Listing versions/Running 'nvm ls --no-alias' does not call into nvm_alias +++ b/test/fast/Listing versions/Running 'nvm ls --no-alias' does not call into nvm_alias @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls --no-alias' with a pattern errors b/test/fast/Listing versions/Running 'nvm ls --no-alias' with a pattern errors index 6f5a809..38d0c5f 100755 --- a/test/fast/Listing versions/Running 'nvm ls --no-alias' with a pattern errors +++ b/test/fast/Listing versions/Running 'nvm ls --no-alias' with a pattern errors @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls 0.0.2' should display only version 0.0.2 b/test/fast/Listing versions/Running 'nvm ls 0.0.2' should display only version 0.0.2 index 666a3f0..963ea50 100755 --- a/test/fast/Listing versions/Running 'nvm ls 0.0.2' should display only version 0.0.2 +++ b/test/fast/Listing versions/Running 'nvm ls 0.0.2' should display only version 0.0.2 @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls 0.2' should display only 0.2.x versions b/test/fast/Listing versions/Running 'nvm ls 0.2' should display only 0.2.x versions index b02efa3..d1377ac 100755 --- a/test/fast/Listing versions/Running 'nvm ls 0.2' should display only 0.2.x versions +++ b/test/fast/Listing versions/Running 'nvm ls 0.2' should display only 0.2.x versions @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls foo' should return a nonzero exit code when not found b/test/fast/Listing versions/Running 'nvm ls foo' should return a nonzero exit code when not found index 74a97b4..fc0a22d 100755 --- a/test/fast/Listing versions/Running 'nvm ls foo' should return a nonzero exit code when not found +++ b/test/fast/Listing versions/Running 'nvm ls foo' should return a nonzero exit code when not found @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh nvm ls nonexistent_version diff --git a/test/fast/Listing versions/Running 'nvm ls io' should return NA b/test/fast/Listing versions/Running 'nvm ls io' should return NA index 79dccfe..4632fc1 100755 --- a/test/fast/Listing versions/Running 'nvm ls io' should return NA +++ b/test/fast/Listing versions/Running 'nvm ls io' should return NA @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh nvm ls io diff --git a/test/fast/Listing versions/Running 'nvm ls node_' should return a nonzero exit code when not found b/test/fast/Listing versions/Running 'nvm ls node_' should return a nonzero exit code when not found index af79302..fbf60a4 100755 --- a/test/fast/Listing versions/Running 'nvm ls node_' should return a nonzero exit code when not found +++ b/test/fast/Listing versions/Running 'nvm ls node_' should return a nonzero exit code when not found @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh nvm ls node_ diff --git a/test/fast/Listing versions/Running 'nvm ls stable' and 'nvm ls unstable' should return the appropriate implicit alias b/test/fast/Listing versions/Running 'nvm ls stable' and 'nvm ls unstable' should return the appropriate implicit alias index 78d0a50..a612e20 100755 --- a/test/fast/Listing versions/Running 'nvm ls stable' and 'nvm ls unstable' should return the appropriate implicit alias +++ b/test/fast/Listing versions/Running 'nvm ls stable' and 'nvm ls unstable' should return the appropriate implicit alias @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls system' should include 'system' when appropriate b/test/fast/Listing versions/Running 'nvm ls system' should include 'system' when appropriate index 1d39a41..c7e72a4 100755 --- a/test/fast/Listing versions/Running 'nvm ls system' should include 'system' when appropriate +++ b/test/fast/Listing versions/Running 'nvm ls system' should include 'system' when appropriate @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls' calls into nvm_alias b/test/fast/Listing versions/Running 'nvm ls' calls into nvm_alias index a5f7457..64cac55 100755 --- a/test/fast/Listing versions/Running 'nvm ls' calls into nvm_alias +++ b/test/fast/Listing versions/Running 'nvm ls' calls into nvm_alias @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls' should display all installed versions b/test/fast/Listing versions/Running 'nvm ls' should display all installed versions index 92e0270..f56846d 100755 --- a/test/fast/Listing versions/Running 'nvm ls' should display all installed versions +++ b/test/fast/Listing versions/Running 'nvm ls' should display all installed versions @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls' should filter out '.nvm' b/test/fast/Listing versions/Running 'nvm ls' should filter out '.nvm' index dedb541..fa51b4d 100755 --- a/test/fast/Listing versions/Running 'nvm ls' should filter out '.nvm' +++ b/test/fast/Listing versions/Running 'nvm ls' should filter out '.nvm' @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls' should filter out 'versions' b/test/fast/Listing versions/Running 'nvm ls' should filter out 'versions' index bd0c709..1f4b4bb 100755 --- a/test/fast/Listing versions/Running 'nvm ls' should filter out 'versions' +++ b/test/fast/Listing versions/Running 'nvm ls' should filter out 'versions' @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls' should include 'system' when appropriate b/test/fast/Listing versions/Running 'nvm ls' should include 'system' when appropriate index 9c465c0..6d76fe2 100755 --- a/test/fast/Listing versions/Running 'nvm ls' should include 'system' when appropriate +++ b/test/fast/Listing versions/Running 'nvm ls' should include 'system' when appropriate @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls' should list versions in the 'versions' directory b/test/fast/Listing versions/Running 'nvm ls' should list versions in the 'versions' directory index a2a31e2..e5fbd5b 100755 --- a/test/fast/Listing versions/Running 'nvm ls' should list versions in the 'versions' directory +++ b/test/fast/Listing versions/Running 'nvm ls' should list versions in the 'versions' directory @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls' should not show a trailing slash b/test/fast/Listing versions/Running 'nvm ls' should not show a trailing slash index e3dbd5b..7e891f3 100755 --- a/test/fast/Listing versions/Running 'nvm ls' should not show a trailing slash +++ b/test/fast/Listing versions/Running 'nvm ls' should not show a trailing slash @@ -2,6 +2,7 @@ export NVM_DIR="$(cd ../../.. && pwd)" +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls' with node-like versioning vx.x.x should only list a matched version b/test/fast/Listing versions/Running 'nvm ls' with node-like versioning vx.x.x should only list a matched version index cb54278..2f2c74b 100755 --- a/test/fast/Listing versions/Running 'nvm ls' with node-like versioning vx.x.x should only list a matched version +++ b/test/fast/Listing versions/Running 'nvm ls' with node-like versioning vx.x.x should only list a matched version @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Running 'nvm ls' with nounset should not fail b/test/fast/Listing versions/Running 'nvm ls' with nounset should not fail index d2bfe9e..f677091 100755 --- a/test/fast/Listing versions/Running 'nvm ls' with nounset should not fail +++ b/test/fast/Listing versions/Running 'nvm ls' with nounset should not fail @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Listing versions/Using a nonstandard IFS should not break b/test/fast/Listing versions/Using a nonstandard IFS should not break index 27cf2de..26c26b2 100755 --- a/test/fast/Listing versions/Using a nonstandard IFS should not break +++ b/test/fast/Listing versions/Using a nonstandard IFS should not break @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Running 'nvm alias' should create a file in the alias directory b/test/fast/Running 'nvm alias' should create a file in the alias directory index c061a57..2316274 100755 --- a/test/fast/Running 'nvm alias' should create a file in the alias directory +++ b/test/fast/Running 'nvm alias' should create a file in the alias directory @@ -4,6 +4,7 @@ set -ex export NVM_DIR="$(cd ../.. && pwd)" +: nvm.sh \. ../../nvm.sh nvm alias test v0.1.2 diff --git a/test/fast/Running 'nvm current' should display current nvm environment b/test/fast/Running 'nvm current' should display current nvm environment index b9f1304..21540df 100755 --- a/test/fast/Running 'nvm current' should display current nvm environment +++ b/test/fast/Running 'nvm current' should display current nvm environment @@ -6,6 +6,7 @@ die () { echo "$@" ; exit 1; } export NVM_DIR="$(cd ../.. && pwd)" +: nvm.sh \. ../../nvm.sh nvm deactivate 2>&1 diff --git a/test/fast/Running 'nvm deactivate' should unset the nvm environment variables b/test/fast/Running 'nvm deactivate' should unset the nvm environment variables index b631597..3cb2cc6 100755 --- a/test/fast/Running 'nvm deactivate' should unset the nvm environment variables +++ b/test/fast/Running 'nvm deactivate' should unset the nvm environment variables @@ -6,6 +6,7 @@ die () { echo "$@" ; exit 1; } export NVM_DIR="$(cd ../.. && pwd)" +: nvm.sh \. ../../nvm.sh \. ../common.sh diff --git a/test/fast/Running 'nvm install' with '--reinstall-packages-from' requires a valid version b/test/fast/Running 'nvm install' with '--reinstall-packages-from' requires a valid version index 329fe2b..7e2fd3a 100755 --- a/test/fast/Running 'nvm install' with '--reinstall-packages-from' requires a valid version +++ b/test/fast/Running 'nvm install' with '--reinstall-packages-from' requires a valid version @@ -9,6 +9,7 @@ cleanup () { export NVM_DIR="$(cd ../.. && pwd)" +: nvm.sh \. ../../nvm.sh \. ../common.sh diff --git a/test/fast/Running 'nvm install' with an invalid version fails nicely b/test/fast/Running 'nvm install' with an invalid version fails nicely index 5bbea41..51d7792 100755 --- a/test/fast/Running 'nvm install' with an invalid version fails nicely +++ b/test/fast/Running 'nvm install' with an invalid version fails nicely @@ -6,6 +6,7 @@ die () { echo "$@" ; exit 1; } export NVM_DIR="$(cd ../.. && pwd)" +: nvm.sh \. ../../nvm.sh set +ex # needed for stderr diff --git a/test/fast/Running 'nvm unalias' should remove the alias file b/test/fast/Running 'nvm unalias' should remove the alias file index 2781f57..b741eb2 100755 --- a/test/fast/Running 'nvm unalias' should remove the alias file +++ b/test/fast/Running 'nvm unalias' should remove the alias file @@ -6,6 +6,7 @@ ALIAS_PATH="../../alias" echo v0.1.2 > "${ALIAS_PATH}/test" +: nvm.sh \. ../../nvm.sh nvm unalias test diff --git a/test/fast/Running 'nvm uninstall' should remove the appropriate directory b/test/fast/Running 'nvm uninstall' should remove the appropriate directory index 9d5fa1b..59233d2 100755 --- a/test/fast/Running 'nvm uninstall' should remove the appropriate directory +++ b/test/fast/Running 'nvm uninstall' should remove the appropriate directory @@ -2,6 +2,7 @@ set -ex +: nvm.sh \. ../../nvm.sh \. ../common.sh diff --git a/test/fast/Running 'nvm uninstall' with incorrect file permissions fails nicely b/test/fast/Running 'nvm uninstall' with incorrect file permissions fails nicely index 23f6f54..95d89f9 100755 --- a/test/fast/Running 'nvm uninstall' with incorrect file permissions fails nicely +++ b/test/fast/Running 'nvm uninstall' with incorrect file permissions fails nicely @@ -2,6 +2,7 @@ set -ex +: nvm.sh \. ../../nvm.sh \. ../common.sh diff --git a/test/fast/Running 'nvm unload' should unset all function and variables b/test/fast/Running 'nvm unload' should unset all function and variables index abb5ca4..7ef208e 100755 --- a/test/fast/Running 'nvm unload' should unset all function and variables +++ b/test/fast/Running 'nvm unload' should unset all function and variables @@ -12,6 +12,7 @@ typeset -f | awk '/ \(\) $/ && !/^main / {print $1}' > "${BEFORE}" env | grep -v PATH= | grep -v IFS= | grep -v NVM_ | grep -v TRAVIS_ | sort >> "${BEFORE}" set +e # TODO: fix +: nvm.sh \. ../../nvm.sh set -e diff --git a/test/fast/Running 'nvm use foo' where 'foo' is circular aborts b/test/fast/Running 'nvm use foo' where 'foo' is circular aborts index 2b9fc92..5c9e032 100755 --- a/test/fast/Running 'nvm use foo' where 'foo' is circular aborts +++ b/test/fast/Running 'nvm use foo' where 'foo' is circular aborts @@ -8,6 +8,7 @@ cleanup() { rm -rf "$(nvm_alias_path)/foo" } +: nvm.sh \. ../../nvm.sh nvm_make_alias foo foo diff --git a/test/fast/Running 'nvm use iojs' uses latest io.js version b/test/fast/Running 'nvm use iojs' uses latest io.js version index be383ce..c5932e1 100755 --- a/test/fast/Running 'nvm use iojs' uses latest io.js version +++ b/test/fast/Running 'nvm use iojs' uses latest io.js version @@ -13,6 +13,7 @@ cleanup() { rm -rf "$(nvm_version_path "iojs-${VERSION}")" } +: nvm.sh \. ../../nvm.sh nvm deactivate || die "unable to deactivate; current: >$(nvm current)<" diff --git a/test/fast/Running 'nvm use system' should work as expected b/test/fast/Running 'nvm use system' should work as expected index be3d11e..7d48562 100755 --- a/test/fast/Running 'nvm use system' should work as expected +++ b/test/fast/Running 'nvm use system' should work as expected @@ -7,6 +7,7 @@ cleanup() { } die() { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../nvm.sh nvm_has_system_node() { return 0; } diff --git a/test/fast/Running 'nvm use x' should create and change the 'current' symlink b/test/fast/Running 'nvm use x' should create and change the 'current' symlink index fc1a086..f5a9f4d 100755 --- a/test/fast/Running 'nvm use x' should create and change the 'current' symlink +++ b/test/fast/Running 'nvm use x' should create and change the 'current' symlink @@ -3,6 +3,7 @@ set -ex export NVM_SYMLINK_CURRENT=true +: nvm.sh \. ../../nvm.sh \. ../common.sh diff --git a/test/fast/Running 'nvm use x' should not create the 'current' symlink if $NVM_SYMLINK_CURRENT is false b/test/fast/Running 'nvm use x' should not create the 'current' symlink if $NVM_SYMLINK_CURRENT is false index 1450659..f0de053 100755 --- a/test/fast/Running 'nvm use x' should not create the 'current' symlink if $NVM_SYMLINK_CURRENT is false +++ b/test/fast/Running 'nvm use x' should not create the 'current' symlink if $NVM_SYMLINK_CURRENT is false @@ -2,6 +2,7 @@ set -ex +: nvm.sh \. ../../nvm.sh \. ../common.sh diff --git a/test/fast/Running 'nvm use' should drop CR char automatically b/test/fast/Running 'nvm use' should drop CR char automatically index 3889f47..ecc018c 100755 --- a/test/fast/Running 'nvm use' should drop CR char automatically +++ b/test/fast/Running 'nvm use' should drop CR char automatically @@ -9,6 +9,7 @@ cleanup() { rm .nvmrc } +: nvm.sh \. ../../nvm.sh # normal .nvmrc diff --git a/test/fast/Running 'nvm-exec' should display required node version b/test/fast/Running 'nvm-exec' should display required node version index dc6972b..2c316fd 100755 --- a/test/fast/Running 'nvm-exec' should display required node version +++ b/test/fast/Running 'nvm-exec' should display required node version @@ -1,6 +1,7 @@ #!/bin/bash set -x +: nvm.sh \. ../../nvm.sh die () { echo "$@" ; rm .nvmrc ; exit 1; } diff --git a/test/fast/Set Colors/nvm_echo_with_colors b/test/fast/Set Colors/nvm_echo_with_colors index daace15..54223eb 100755 --- a/test/fast/Set Colors/nvm_echo_with_colors +++ b/test/fast/Set Colors/nvm_echo_with_colors @@ -11,6 +11,7 @@ cleanup() { echo "Tested nvm_echo_with_colors" } +: nvm.sh \. ../../../nvm.sh OUTPUT="$(nvm_echo_with_colors "\033[0;36mCyan-colored text")" diff --git a/test/fast/Set Colors/nvm_err_with_colors b/test/fast/Set Colors/nvm_err_with_colors index c0b4812..316cced 100755 --- a/test/fast/Set Colors/nvm_err_with_colors +++ b/test/fast/Set Colors/nvm_err_with_colors @@ -8,6 +8,7 @@ cleanup() { echo "Tested nvm_err_with_colors" } +: nvm.sh \. ../../../nvm.sh set +ex diff --git a/test/fast/Set Colors/nvm_print_default_alias calls nvm_get_colors b/test/fast/Set Colors/nvm_print_default_alias calls nvm_get_colors index 64a2a08..fd75f47 100755 --- a/test/fast/Set Colors/nvm_print_default_alias calls nvm_get_colors +++ b/test/fast/Set Colors/nvm_print_default_alias calls nvm_get_colors @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh die () { 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 b54d230..3f0dd64 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 @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh #set -e #nvm use system returns 127 and No system set message diff --git a/test/fast/Sourcing nvm.sh should make the nvm command available b/test/fast/Sourcing nvm.sh should make the nvm command available index e74f347..1490c3a 100755 --- a/test/fast/Sourcing nvm.sh should make the nvm command available +++ b/test/fast/Sourcing nvm.sh should make the nvm command available @@ -2,6 +2,7 @@ set -ex +: nvm.sh \. ../../nvm.sh nvm diff --git a/test/fast/Sourcing nvm.sh should not modify parameters of caller b/test/fast/Sourcing nvm.sh should not modify parameters of caller index 2053b73..98f6230 100755 --- a/test/fast/Sourcing nvm.sh should not modify parameters of caller +++ b/test/fast/Sourcing nvm.sh should not modify parameters of caller @@ -3,5 +3,6 @@ set -ex set -- yes +: nvm.sh \. ../../nvm.sh [ "$1" = yes ] diff --git a/test/fast/Unit tests/Running 'nvm install --save' works as expected' b/test/fast/Unit tests/Running 'nvm install --save' works as expected' index a020382..d5b24ee 100755 --- a/test/fast/Unit tests/Running 'nvm install --save' works as expected' +++ b/test/fast/Unit tests/Running 'nvm install --save' works as expected' @@ -1,4 +1,5 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/Running 'nvm use --save' works as expected' b/test/fast/Unit tests/Running 'nvm use --save' works as expected' index a188072..ebabc56 100755 --- a/test/fast/Unit tests/Running 'nvm use --save' works as expected' +++ b/test/fast/Unit tests/Running 'nvm use --save' works as expected' @@ -1,4 +1,5 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/Running 'nvm use --save' works with a .nvmrc in the parent dir b/test/fast/Unit tests/Running 'nvm use --save' works with a .nvmrc in the parent dir index ef8a25a..dbed356 100755 --- a/test/fast/Unit tests/Running 'nvm use --save' works with a .nvmrc in the parent dir +++ b/test/fast/Unit tests/Running 'nvm use --save' works with a .nvmrc in the parent dir @@ -1,4 +1,5 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/Running 'nvm use --silent --save' doesn't output anything b/test/fast/Unit tests/Running 'nvm use --silent --save' doesn't output anything index 578c315..80fc371 100755 --- a/test/fast/Unit tests/Running 'nvm use --silent --save' doesn't output anything +++ b/test/fast/Unit tests/Running 'nvm use --silent --save' doesn't output anything @@ -1,4 +1,5 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/nvm install -b b/test/fast/Unit tests/nvm install -b index 20b4b76..8bc4c65 100755 --- a/test/fast/Unit tests/nvm install -b +++ b/test/fast/Unit tests/nvm install -b @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh nvm_install_source() { diff --git a/test/fast/Unit tests/nvm install with nonlowercase LTS name b/test/fast/Unit tests/nvm install with nonlowercase LTS name index 7dd27f5..bc647f1 100755 --- a/test/fast/Unit tests/nvm install with nonlowercase LTS name +++ b/test/fast/Unit tests/nvm install with nonlowercase LTS name @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh REMOTE="${PWD}/mocks/nvm_ls_remote.txt" diff --git a/test/fast/Unit tests/nvm ls-remote b/test/fast/Unit tests/nvm ls-remote index af3a0a7..27df7d4 100755 --- a/test/fast/Unit tests/nvm ls-remote +++ b/test/fast/Unit tests/nvm ls-remote @@ -12,6 +12,7 @@ cleanup() { mv "${NVM_DIR}/alias/lts-backup" "${NVM_DIR}/alias/lts" } +: nvm.sh \. ../../../nvm.sh if [ -n "${NVM_COLORS-}" ]; then export TEMP_NVM_COLORS=NVM_COLORS diff --git a/test/fast/Unit tests/nvm set_colors b/test/fast/Unit tests/nvm set_colors index 85496eb..20f9622 100755 --- a/test/fast/Unit tests/nvm set_colors +++ b/test/fast/Unit tests/nvm set_colors @@ -13,6 +13,7 @@ cleanup() { unset TEMP_NVM_COLORS } +: nvm.sh \. ../../../nvm.sh # NVM_COLORS is not set if [ -n ${NVM_COLORS} ]; then diff --git a/test/fast/Unit tests/nvm version-remote b/test/fast/Unit tests/nvm version-remote index 6a3beeb..1c4026a 100755 --- a/test/fast/Unit tests/nvm version-remote +++ b/test/fast/Unit tests/nvm version-remote @@ -8,6 +8,7 @@ cleanup() { unset -f nvm_remote_version } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/nvm_add_iojs_prefix b/test/fast/Unit tests/nvm_add_iojs_prefix index f947118..b619cc2 100755 --- a/test/fast/Unit tests/nvm_add_iojs_prefix +++ b/test/fast/Unit tests/nvm_add_iojs_prefix @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh [ "_$(nvm_add_iojs_prefix 1)" = "_iojs-v1" ] || die '"nvm_add_iojs_prefix 1" did not return "iojs-v1"' diff --git a/test/fast/Unit tests/nvm_alias b/test/fast/Unit tests/nvm_alias index 49cac2d..b05599a 100755 --- a/test/fast/Unit tests/nvm_alias +++ b/test/fast/Unit tests/nvm_alias @@ -6,6 +6,7 @@ cleanup () { rm -rf ../../../alias/test } +: nvm.sh \. ../../../nvm.sh OUTPUT="$(nvm_alias 2>&1)" diff --git a/test/fast/Unit tests/nvm_alias LTS-N b/test/fast/Unit tests/nvm_alias LTS-N index bbc6343..5e3702d 100755 --- a/test/fast/Unit tests/nvm_alias LTS-N +++ b/test/fast/Unit tests/nvm_alias LTS-N @@ -9,6 +9,7 @@ cleanup() { mv "${NVM_DIR}/alias/lts-backup" "${NVM_DIR}/alias/lts" } +: nvm.sh \. ../../../nvm.sh MOCKS_DIR="${PWD}/mocks" diff --git a/test/fast/Unit tests/nvm_alias handles comments b/test/fast/Unit tests/nvm_alias handles comments index 9e4d166..0b118e9 100755 --- a/test/fast/Unit tests/nvm_alias handles comments +++ b/test/fast/Unit tests/nvm_alias handles comments @@ -8,6 +8,7 @@ cleanup () { rm -rf ../../../alias/test-comment-first } +: nvm.sh \. ../../../nvm.sh # Test: alias file with comment on separate line diff --git a/test/fast/Unit tests/nvm_alias_path b/test/fast/Unit tests/nvm_alias_path index fe304af..1d1653e 100755 --- a/test/fast/Unit tests/nvm_alias_path +++ b/test/fast/Unit tests/nvm_alias_path @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh [ "_$(nvm_alias_path)" = "_$NVM_DIR/alias" ] || die "nvm_alias_path did not return correct location" diff --git a/test/fast/Unit tests/nvm_change_path b/test/fast/Unit tests/nvm_change_path index f434981..aa1642b 100755 --- a/test/fast/Unit tests/nvm_change_path +++ b/test/fast/Unit tests/nvm_change_path @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh TEST_PATH=/usr/bin:/usr/local/bin diff --git a/test/fast/Unit tests/nvm_check_for_help b/test/fast/Unit tests/nvm_check_for_help index b3218f2..562ca3b 100755 --- a/test/fast/Unit tests/nvm_check_for_help +++ b/test/fast/Unit tests/nvm_check_for_help @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh TERM=dumb nvm clear-cache --help | grep 'Usage:' || die 'did not print help menu' diff --git a/test/fast/Unit tests/nvm_command_info b/test/fast/Unit tests/nvm_command_info index 6eebefc..6d13490 100755 --- a/test/fast/Unit tests/nvm_command_info +++ b/test/fast/Unit tests/nvm_command_info @@ -8,6 +8,7 @@ cleanup() { die() { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh diff --git a/test/fast/Unit tests/nvm_compare_checksum b/test/fast/Unit tests/nvm_compare_checksum index c14aee4..99c3b79 100755 --- a/test/fast/Unit tests/nvm_compare_checksum +++ b/test/fast/Unit tests/nvm_compare_checksum @@ -5,6 +5,7 @@ cleanup () { } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh set -ex diff --git a/test/fast/Unit tests/nvm_compute_checksum b/test/fast/Unit tests/nvm_compute_checksum index 6b52eb9..0e8ae0f 100755 --- a/test/fast/Unit tests/nvm_compute_checksum +++ b/test/fast/Unit tests/nvm_compute_checksum @@ -4,6 +4,7 @@ set -ex die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh set +x diff --git a/test/fast/Unit tests/nvm_curl_libz_support b/test/fast/Unit tests/nvm_curl_libz_support index 34602be..acab56f 100755 --- a/test/fast/Unit tests/nvm_curl_libz_support +++ b/test/fast/Unit tests/nvm_curl_libz_support @@ -6,6 +6,7 @@ cleanup() { die() { cleanup; echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh curl() { diff --git a/test/fast/Unit tests/nvm_die_on_prefix b/test/fast/Unit tests/nvm_die_on_prefix index 0a2429e..73ba556 100755 --- a/test/fast/Unit tests/nvm_die_on_prefix +++ b/test/fast/Unit tests/nvm_die_on_prefix @@ -3,6 +3,7 @@ TEST_PWD=$(pwd) TEST_DIR="$TEST_PWD/nvm_die_on_prefix_tmp" +: nvm.sh \. ../../../nvm.sh TEST_VERSION_DIR="${TEST_DIR}/version" diff --git a/test/fast/Unit tests/nvm_download b/test/fast/Unit tests/nvm_download index 0c25609..727fe13 100755 --- a/test/fast/Unit tests/nvm_download +++ b/test/fast/Unit tests/nvm_download @@ -6,6 +6,7 @@ cleanup () { } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh set -ex diff --git a/test/fast/Unit tests/nvm_download_artifact b/test/fast/Unit tests/nvm_download_artifact index 250bca3..ec450d9 100755 --- a/test/fast/Unit tests/nvm_download_artifact +++ b/test/fast/Unit tests/nvm_download_artifact @@ -5,6 +5,7 @@ cleanup () { } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh # bad flavor diff --git a/test/fast/Unit tests/nvm_ensure_default_set b/test/fast/Unit tests/nvm_ensure_default_set index 14b53eb..c8170bc 100755 --- a/test/fast/Unit tests/nvm_ensure_default_set +++ b/test/fast/Unit tests/nvm_ensure_default_set @@ -4,6 +4,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh EXPECTED_OUTPUT="nvm_ensure_default_set: a version is required" diff --git a/test/fast/Unit tests/nvm_ensure_version_installed b/test/fast/Unit tests/nvm_ensure_version_installed index 4c51508..d2e1149 100755 --- a/test/fast/Unit tests/nvm_ensure_version_installed +++ b/test/fast/Unit tests/nvm_ensure_version_installed @@ -6,6 +6,7 @@ cleanup () { unset -f nvm_has_system_node nvm_has_system_iojs } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/nvm_ensure_version_prefix b/test/fast/Unit tests/nvm_ensure_version_prefix index b54ea02..68db145 100755 --- a/test/fast/Unit tests/nvm_ensure_version_prefix +++ b/test/fast/Unit tests/nvm_ensure_version_prefix @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh [ "_$(nvm_ensure_version_prefix 1)" = "_v1" ] || die '"nvm_ensure_version_prefix 1" did not return "v1"' diff --git a/test/fast/Unit tests/nvm_extract_tarball b/test/fast/Unit tests/nvm_extract_tarball index 4cf7533..6119e72 100755 --- a/test/fast/Unit tests/nvm_extract_tarball +++ b/test/fast/Unit tests/nvm_extract_tarball @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh [ "$(nvm_extract_tarball 2>&1)" = "nvm_extract_tarball requires exactly 4 arguments" ] || die 'incorrect error message with no args' diff --git a/test/fast/Unit tests/nvm_find_project_dir b/test/fast/Unit tests/nvm_find_project_dir index 1bfcf16..bf1f489 100755 --- a/test/fast/Unit tests/nvm_find_project_dir +++ b/test/fast/Unit tests/nvm_find_project_dir @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh set -ex diff --git a/test/fast/Unit tests/nvm_find_up b/test/fast/Unit tests/nvm_find_up index 73f7d21..fff3e5f 100755 --- a/test/fast/Unit tests/nvm_find_up +++ b/test/fast/Unit tests/nvm_find_up @@ -11,6 +11,7 @@ cleanup () { rm -rf tmp_nvm_find_up } +: nvm.sh \. ../../../nvm.sh setup diff --git a/test/fast/Unit tests/nvm_format_version b/test/fast/Unit tests/nvm_format_version index 98541fe..d4dd86c 100755 --- a/test/fast/Unit tests/nvm_format_version +++ b/test/fast/Unit tests/nvm_format_version @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh INPUT="0.1.2" diff --git a/test/fast/Unit tests/nvm_get_arch b/test/fast/Unit tests/nvm_get_arch index c45cae0..b759b59 100755 --- a/test/fast/Unit tests/nvm_get_arch +++ b/test/fast/Unit tests/nvm_get_arch @@ -11,6 +11,7 @@ cleanup() { die () { cleanup; echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh # Directory where mocked binaries used by nvm_get_arch for each OS/arch are diff --git a/test/fast/Unit tests/nvm_get_arch_unofficial b/test/fast/Unit tests/nvm_get_arch_unofficial index 12c5da0..a05757f 100755 --- a/test/fast/Unit tests/nvm_get_arch_unofficial +++ b/test/fast/Unit tests/nvm_get_arch_unofficial @@ -15,6 +15,7 @@ die() { exit 1 } +: nvm.sh . ../../../nvm.sh # Sets the PATH for these tests to include the symlinks to the mocked binaries diff --git a/test/fast/Unit tests/nvm_get_artifact_compression b/test/fast/Unit tests/nvm_get_artifact_compression index 3fc5fcf..f099000 100755 --- a/test/fast/Unit tests/nvm_get_artifact_compression +++ b/test/fast/Unit tests/nvm_get_artifact_compression @@ -5,6 +5,7 @@ cleanup () { } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh # nvm_get_artifact_compression by default diff --git a/test/fast/Unit tests/nvm_get_checksum b/test/fast/Unit tests/nvm_get_checksum index 975a3e6..3df06d4 100755 --- a/test/fast/Unit tests/nvm_get_checksum +++ b/test/fast/Unit tests/nvm_get_checksum @@ -8,6 +8,7 @@ cleanup () { die () { echo "$@" ; cleanup ; exit 1; } set +e # TODO: fix +: nvm.sh \. ../../../nvm.sh set -e diff --git a/test/fast/Unit tests/nvm_get_checksum_alg b/test/fast/Unit tests/nvm_get_checksum_alg index 1869437..74aa11f 100755 --- a/test/fast/Unit tests/nvm_get_checksum_alg +++ b/test/fast/Unit tests/nvm_get_checksum_alg @@ -5,6 +5,7 @@ set -ex die () { echo "$@" ; exit 1; } set +e # TODO: fix +: nvm.sh \. ../../../nvm.sh set -e diff --git a/test/fast/Unit tests/nvm_get_checksum_binary b/test/fast/Unit tests/nvm_get_checksum_binary index 0de0cd4..532c1e5 100755 --- a/test/fast/Unit tests/nvm_get_checksum_binary +++ b/test/fast/Unit tests/nvm_get_checksum_binary @@ -5,6 +5,7 @@ set -ex die () { echo "$@" ; exit 1; } set +e # TODO: fix +: nvm.sh \. ../../../nvm.sh set -e diff --git a/test/fast/Unit tests/nvm_get_colors b/test/fast/Unit tests/nvm_get_colors index df35da5..c90da49 100755 --- a/test/fast/Unit tests/nvm_get_colors +++ b/test/fast/Unit tests/nvm_get_colors @@ -12,6 +12,7 @@ cleanup() { unset TEMP_NVM_COLORS } +: nvm.sh \. ../../../nvm.sh # NVM_COLORS is not set diff --git a/test/fast/Unit tests/nvm_get_default_packages b/test/fast/Unit tests/nvm_get_default_packages index d8a8157..9e10214 100755 --- a/test/fast/Unit tests/nvm_get_default_packages +++ b/test/fast/Unit tests/nvm_get_default_packages @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh FILE="${NVM_DIR}/default-packages" diff --git a/test/fast/Unit tests/nvm_get_default_packages mawk compat b/test/fast/Unit tests/nvm_get_default_packages mawk compat index f6fa5d7..35c8d4f 100755 --- a/test/fast/Unit tests/nvm_get_default_packages mawk compat +++ b/test/fast/Unit tests/nvm_get_default_packages mawk compat @@ -6,6 +6,7 @@ die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh # The awk command from nvm_get_default_packages diff --git a/test/fast/Unit tests/nvm_get_download_slug b/test/fast/Unit tests/nvm_get_download_slug index a4a0bc4..eeb72ac 100755 --- a/test/fast/Unit tests/nvm_get_download_slug +++ b/test/fast/Unit tests/nvm_get_download_slug @@ -7,6 +7,7 @@ cleanup() { die () { cleanup; echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh [ "$(nvm_get_download_slug 2>/dev/null ; echo $?)" = '1' ] || die 'invalid flavor did not fail with exit code 1' diff --git a/test/fast/Unit tests/nvm_get_latest missing curl or wget b/test/fast/Unit tests/nvm_get_latest missing curl or wget index 2c9b1da..bc23d37 100755 --- a/test/fast/Unit tests/nvm_get_latest missing curl or wget +++ b/test/fast/Unit tests/nvm_get_latest missing curl or wget @@ -6,6 +6,7 @@ cleanup() { unset -f nvm_has } +: nvm.sh \. ../../../nvm.sh nvm_has() { return 1 ; } diff --git a/test/fast/Unit tests/nvm_get_minor_version b/test/fast/Unit tests/nvm_get_minor_version index dbfea5d..546caf6 100755 --- a/test/fast/Unit tests/nvm_get_minor_version +++ b/test/fast/Unit tests/nvm_get_minor_version @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh expect () { diff --git a/test/fast/Unit tests/nvm_get_mirror b/test/fast/Unit tests/nvm_get_mirror index 201a0ee..a8a4255 100755 --- a/test/fast/Unit tests/nvm_get_mirror +++ b/test/fast/Unit tests/nvm_get_mirror @@ -8,6 +8,7 @@ unset NVM_NODEJS_ORG_MIRROR unset NVM_IOJS_ORG_MIRROR set +e # TODO: fix +: nvm.sh \. ../../../nvm.sh set -e diff --git a/test/fast/Unit tests/nvm_has b/test/fast/Unit tests/nvm_has index 8a7d7be..0987801 100755 --- a/test/fast/Unit tests/nvm_has +++ b/test/fast/Unit tests/nvm_has @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh nvm_has cat && type cat > /dev/null || die 'nvm_has locates "cat" properly' diff --git a/test/fast/Unit tests/nvm_has_non_aliased b/test/fast/Unit tests/nvm_has_non_aliased index e42b2c6..03564d4 100755 --- a/test/fast/Unit tests/nvm_has_non_aliased +++ b/test/fast/Unit tests/nvm_has_non_aliased @@ -3,6 +3,7 @@ cleanup () { unalias foo; unalias grep; } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh alias foo='bar' diff --git a/test/fast/Unit tests/nvm_has_solaris_binary b/test/fast/Unit tests/nvm_has_solaris_binary index 9d949e4..5222312 100755 --- a/test/fast/Unit tests/nvm_has_solaris_binary +++ b/test/fast/Unit tests/nvm_has_solaris_binary @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/nvm_has_system_iojs b/test/fast/Unit tests/nvm_has_system_iojs index 0d4eadb..78dec06 100755 --- a/test/fast/Unit tests/nvm_has_system_iojs +++ b/test/fast/Unit tests/nvm_has_system_iojs @@ -5,6 +5,7 @@ cleanup () { } die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/nvm_has_system_node b/test/fast/Unit tests/nvm_has_system_node index 9a71979..8390a63 100755 --- a/test/fast/Unit tests/nvm_has_system_node +++ b/test/fast/Unit tests/nvm_has_system_node @@ -1,5 +1,6 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/nvm_install_binary_extract b/test/fast/Unit tests/nvm_install_binary_extract index 5dd2cc7..bd7eb27 100755 --- a/test/fast/Unit tests/nvm_install_binary_extract +++ b/test/fast/Unit tests/nvm_install_binary_extract @@ -40,6 +40,7 @@ test_archi() { [ "$(cat "${NVM_DIR}/versions/node/${version}/bin/node")" = "node ${version}" ] || die "Unable to extract ${ext} file" } +: nvm.sh \. ../../../nvm.sh set -ex diff --git a/test/fast/Unit tests/nvm_install_binary_nosource b/test/fast/Unit tests/nvm_install_binary_nosource index e425b15..2034658 100755 --- a/test/fast/Unit tests/nvm_install_binary_nosource +++ b/test/fast/Unit tests/nvm_install_binary_nosource @@ -9,6 +9,7 @@ cleanup () { die () { echo "$@" ; cleanup; exit 1;} +: nvm.sh \. ../../../nvm.sh nvm_binary_available() { diff --git a/test/fast/Unit tests/nvm_install_latest_npm b/test/fast/Unit tests/nvm_install_latest_npm index ecf9c74..c65ccf3 100755 --- a/test/fast/Unit tests/nvm_install_latest_npm +++ b/test/fast/Unit tests/nvm_install_latest_npm @@ -4,6 +4,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh nvm deactivate >/dev/null 2>&1 diff --git a/test/fast/Unit tests/nvm_install_no_progress_bar b/test/fast/Unit tests/nvm_install_no_progress_bar index d5c9c27..18f2d04 100755 --- a/test/fast/Unit tests/nvm_install_no_progress_bar +++ b/test/fast/Unit tests/nvm_install_no_progress_bar @@ -11,6 +11,7 @@ cleanup () { die () { >&2 echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh cleanup diff --git a/test/fast/Unit tests/nvm_install_source SHELL override b/test/fast/Unit tests/nvm_install_source SHELL override index f544948..f92b0b9 100755 --- a/test/fast/Unit tests/nvm_install_source SHELL override +++ b/test/fast/Unit tests/nvm_install_source SHELL override @@ -6,6 +6,7 @@ cleanup () { } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh # Create a fake directory structure for the build diff --git a/test/fast/Unit tests/nvm_iojs_prefix b/test/fast/Unit tests/nvm_iojs_prefix index fef2373..d5d9f2e 100755 --- a/test/fast/Unit tests/nvm_iojs_prefix +++ b/test/fast/Unit tests/nvm_iojs_prefix @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh [ "$(nvm_iojs_prefix)" = "iojs" ] || die '"nvm_iojs_prefix" did not return the string "iojs". why did this fail?!' diff --git a/test/fast/Unit tests/nvm_iojs_version_has_solaris_binary b/test/fast/Unit tests/nvm_iojs_version_has_solaris_binary index 8048fa3..6394b1d 100755 --- a/test/fast/Unit tests/nvm_iojs_version_has_solaris_binary +++ b/test/fast/Unit tests/nvm_iojs_version_has_solaris_binary @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/nvm_is_alias b/test/fast/Unit tests/nvm_is_alias index eba9506..1fb69e9 100755 --- a/test/fast/Unit tests/nvm_is_alias +++ b/test/fast/Unit tests/nvm_is_alias @@ -3,6 +3,7 @@ cleanup () { unalias foo; unalias grep; } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh alias foo='bar' diff --git a/test/fast/Unit tests/nvm_is_iojs_version b/test/fast/Unit tests/nvm_is_iojs_version index d846e71..b1b75fc 100755 --- a/test/fast/Unit tests/nvm_is_iojs_version +++ b/test/fast/Unit tests/nvm_is_iojs_version @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh nvm_is_iojs_version 'iojs-' || die '"nvm_is_iojs_version iojs- was not true' diff --git a/test/fast/Unit tests/nvm_is_merged_node_version b/test/fast/Unit tests/nvm_is_merged_node_version index 7501c2a..897b943 100755 --- a/test/fast/Unit tests/nvm_is_merged_node_version +++ b/test/fast/Unit tests/nvm_is_merged_node_version @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh nvm_is_merged_node_version '4.0' || die '"nvm_is_merged_node_version 4.0 was not true' diff --git a/test/fast/Unit tests/nvm_is_natural_num b/test/fast/Unit tests/nvm_is_natural_num index d66d6c8..caf56cf 100755 --- a/test/fast/Unit tests/nvm_is_natural_num +++ b/test/fast/Unit tests/nvm_is_natural_num @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh ! nvm_is_natural_num || die 'no args is not false' diff --git a/test/fast/Unit tests/nvm_is_valid_version b/test/fast/Unit tests/nvm_is_valid_version index edfe537..8bdf941 100755 --- a/test/fast/Unit tests/nvm_is_valid_version +++ b/test/fast/Unit tests/nvm_is_valid_version @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh nvm_is_valid_version 0.1.2 || die "nvm_is_valid_version 0.1.2 did not return 0" diff --git a/test/fast/Unit tests/nvm_is_version_installed b/test/fast/Unit tests/nvm_is_version_installed index 3d7de4f..8b6e775 100755 --- a/test/fast/Unit tests/nvm_is_version_installed +++ b/test/fast/Unit tests/nvm_is_version_installed @@ -7,6 +7,7 @@ cleanup () { } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh set -ex diff --git a/test/fast/Unit tests/nvm_ls handles hash in pattern b/test/fast/Unit tests/nvm_ls handles hash in pattern index 815169e..cb3a0c9 100755 --- a/test/fast/Unit tests/nvm_ls handles hash in pattern +++ b/test/fast/Unit tests/nvm_ls handles hash in pattern @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh # Test: nvm_ls with pattern containing # should not cause sed error diff --git a/test/fast/Unit tests/nvm_ls_current b/test/fast/Unit tests/nvm_ls_current index f2c5e65..69de68e 100755 --- a/test/fast/Unit tests/nvm_ls_current +++ b/test/fast/Unit tests/nvm_ls_current @@ -6,6 +6,7 @@ TEST_DIR="$TEST_PWD/nvm_ls_current_tmp" cleanup() { rm -rf "$TEST_DIR"; unset -f return_zero; alias node='node' ; unalias node; } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh return_zero () { return 0; } diff --git a/test/fast/Unit tests/nvm_ls_remote b/test/fast/Unit tests/nvm_ls_remote index be61cc4..f0cf363 100755 --- a/test/fast/Unit tests/nvm_ls_remote +++ b/test/fast/Unit tests/nvm_ls_remote @@ -6,6 +6,7 @@ cleanup() { unset -f nvm_download } +: nvm.sh \. ../../../nvm.sh MOCKS_DIR="$PWD/mocks" diff --git a/test/fast/Unit tests/nvm_ls_remote LTS aliases b/test/fast/Unit tests/nvm_ls_remote LTS aliases index e03cb99..e6037b3 100755 --- a/test/fast/Unit tests/nvm_ls_remote LTS aliases +++ b/test/fast/Unit tests/nvm_ls_remote LTS aliases @@ -14,6 +14,7 @@ cleanup() { rm -rf "$TEST_PATH" } +: nvm.sh \. ../../../nvm.sh set -ex diff --git a/test/fast/Unit tests/nvm_ls_remote nightly b/test/fast/Unit tests/nvm_ls_remote nightly index 47ba759..83e95ec 100755 --- a/test/fast/Unit tests/nvm_ls_remote nightly +++ b/test/fast/Unit tests/nvm_ls_remote nightly @@ -6,6 +6,7 @@ cleanup() { unset -f nvm_download } +: nvm.sh \. ../../../nvm.sh MOCKS_DIR="$PWD/mocks" diff --git a/test/fast/Unit tests/nvm_ls_remote_iojs b/test/fast/Unit tests/nvm_ls_remote_iojs index 553aefd..7dd6ad3 100755 --- a/test/fast/Unit tests/nvm_ls_remote_iojs +++ b/test/fast/Unit tests/nvm_ls_remote_iojs @@ -6,6 +6,7 @@ cleanup() { unset -f nvm_download } +: nvm.sh \. ../../../nvm.sh # sample output at the time the test was written diff --git a/test/fast/Unit tests/nvm_make_alias b/test/fast/Unit tests/nvm_make_alias index f04e518..dd3f794 100755 --- a/test/fast/Unit tests/nvm_make_alias +++ b/test/fast/Unit tests/nvm_make_alias @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh OUTPUT="$(nvm_make_alias 2>&1)" diff --git a/test/fast/Unit tests/nvm_node_prefix b/test/fast/Unit tests/nvm_node_prefix index c0ffd1d..d186a9d 100755 --- a/test/fast/Unit tests/nvm_node_prefix +++ b/test/fast/Unit tests/nvm_node_prefix @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh [ "$(nvm_node_prefix)" = "node" ] || die '"nvm_node_prefix" did not return the string "node". why did this fail?!' diff --git a/test/fast/Unit tests/nvm_node_version_has_solaris_binary b/test/fast/Unit tests/nvm_node_version_has_solaris_binary index 95ed5af..a9237c0 100755 --- a/test/fast/Unit tests/nvm_node_version_has_solaris_binary +++ b/test/fast/Unit tests/nvm_node_version_has_solaris_binary @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/nvm_normalize_lts b/test/fast/Unit tests/nvm_normalize_lts index 2e5b3b2..1e0722b 100755 --- a/test/fast/Unit tests/nvm_normalize_lts +++ b/test/fast/Unit tests/nvm_normalize_lts @@ -8,6 +8,7 @@ cleanup() { die () { cleanup; echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh MOCKS_DIR="../Unit tests/mocks" diff --git a/test/fast/Unit tests/nvm_num_version_groups b/test/fast/Unit tests/nvm_num_version_groups index ab09f0c..282da15 100755 --- a/test/fast/Unit tests/nvm_num_version_groups +++ b/test/fast/Unit tests/nvm_num_version_groups @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh [ "~$(nvm_num_version_groups)" = "~0" ] || die "no args should give 0" diff --git a/test/fast/Unit tests/nvm_print_alias_path b/test/fast/Unit tests/nvm_print_alias_path index 14cf152..a3fdf50 100755 --- a/test/fast/Unit tests/nvm_print_alias_path +++ b/test/fast/Unit tests/nvm_print_alias_path @@ -7,6 +7,7 @@ cleanup () { unset -f nvm_alias nvm_version } +: nvm.sh \. ../../../nvm.sh NVM_ALIAS_DIR='path/to/the alias/dir' diff --git a/test/fast/Unit tests/nvm_print_color_code b/test/fast/Unit tests/nvm_print_color_code index 5b49e9c..4b9cfc8 100755 --- a/test/fast/Unit tests/nvm_print_color_code +++ b/test/fast/Unit tests/nvm_print_color_code @@ -4,6 +4,7 @@ set -ex die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh # Testing valid input diff --git a/test/fast/Unit tests/nvm_print_default_alias b/test/fast/Unit tests/nvm_print_default_alias index fcb3ab2..b15f944 100755 --- a/test/fast/Unit tests/nvm_print_default_alias +++ b/test/fast/Unit tests/nvm_print_default_alias @@ -7,6 +7,7 @@ cleanup () { unset -f nvm_print_implicit_alias nvm_version } +: nvm.sh \. ../../../nvm.sh nvm_print_implicit_alias() { diff --git a/test/fast/Unit tests/nvm_print_implicit_alias errors b/test/fast/Unit tests/nvm_print_implicit_alias errors index 5565eea..c142406 100755 --- a/test/fast/Unit tests/nvm_print_implicit_alias errors +++ b/test/fast/Unit tests/nvm_print_implicit_alias errors @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh EXPECTED_FIRST_MSG="nvm_print_implicit_alias must be specified with local or remote as the first argument." diff --git a/test/fast/Unit tests/nvm_print_implicit_alias success b/test/fast/Unit tests/nvm_print_implicit_alias success index ded8174..8a0d22e 100755 --- a/test/fast/Unit tests/nvm_print_implicit_alias success +++ b/test/fast/Unit tests/nvm_print_implicit_alias success @@ -13,6 +13,7 @@ cleanup() { unset -f nvm_ls_remote nvm_ls_remote_iojs } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/nvm_print_npm_version b/test/fast/Unit tests/nvm_print_npm_version index a9cbc2c..65409ad 100755 --- a/test/fast/Unit tests/nvm_print_npm_version +++ b/test/fast/Unit tests/nvm_print_npm_version @@ -7,6 +7,7 @@ cleanup () { } die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh nvm_has() { return 1; } diff --git a/test/fast/Unit tests/nvm_process_nvmrc b/test/fast/Unit tests/nvm_process_nvmrc index 5102c57..5423cb3 100755 --- a/test/fast/Unit tests/nvm_process_nvmrc +++ b/test/fast/Unit tests/nvm_process_nvmrc @@ -6,6 +6,7 @@ cleanup() { echo 'cleaned up' } +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/Unit tests/nvm_remote_version b/test/fast/Unit tests/nvm_remote_version index 96f33f5..3aa5c11 100755 --- a/test/fast/Unit tests/nvm_remote_version +++ b/test/fast/Unit tests/nvm_remote_version @@ -6,6 +6,7 @@ cleanup() { unset -f nvm_ls_remote nvm_ls_remote_iojs } +: nvm.sh \. ../../../nvm.sh nvm_ls_remote() { diff --git a/test/fast/Unit tests/nvm_remote_versions b/test/fast/Unit tests/nvm_remote_versions index e4136b2..02a0464 100755 --- a/test/fast/Unit tests/nvm_remote_versions +++ b/test/fast/Unit tests/nvm_remote_versions @@ -6,6 +6,7 @@ cleanup() { unset -f nvm_ls_remote nvm_ls_remote_iojs } +: nvm.sh \. ../../../nvm.sh OUTPUT="$(nvm_remote_versions stable 2>&1)" diff --git a/test/fast/Unit tests/nvm_stdout_is_terminal b/test/fast/Unit tests/nvm_stdout_is_terminal index 31b4666..d6acb42 100755 --- a/test/fast/Unit tests/nvm_stdout_is_terminal +++ b/test/fast/Unit tests/nvm_stdout_is_terminal @@ -5,6 +5,7 @@ tempfile=$(mktemp) die () { echo "$@" ; cleanup; exit 1; } cleanup() { rm -f "$tempfile"; } +: nvm.sh \. ../../../nvm.sh if [ -t 1 ] ; then diff --git a/test/fast/Unit tests/nvm_strip_iojs_prefix b/test/fast/Unit tests/nvm_strip_iojs_prefix index 6924b5f..cd4e846 100755 --- a/test/fast/Unit tests/nvm_strip_iojs_prefix +++ b/test/fast/Unit tests/nvm_strip_iojs_prefix @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh [ "_$(nvm_strip_iojs_prefix iojs)" = "_" ] || die '"nvm_strip_iojs_prefix iojs" did not return an empty string' diff --git a/test/fast/Unit tests/nvm_strip_path b/test/fast/Unit tests/nvm_strip_path index 6f00da0..a900cab 100755 --- a/test/fast/Unit tests/nvm_strip_path +++ b/test/fast/Unit tests/nvm_strip_path @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh TEST_PATH=$NVM_DIR/v0.10.5/bin:/usr/bin:$NVM_DIR/v0.11.5/bin:$NVM_DIR/v0.9.5/bin:/usr/local/bin:$NVM_DIR/v0.2.5/bin:$NVM_DIR/versions/node/v0.12.0/bin:$NVM_DIR/versions/io.js/v1.0.0/bin diff --git a/test/fast/Unit tests/nvm_supports_xz b/test/fast/Unit tests/nvm_supports_xz index 97c5a38..19e001c 100755 --- a/test/fast/Unit tests/nvm_supports_xz +++ b/test/fast/Unit tests/nvm_supports_xz @@ -9,6 +9,7 @@ cleanup() { } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh OLDPATH=$PATH diff --git a/test/fast/Unit tests/nvm_tree_contains_path b/test/fast/Unit tests/nvm_tree_contains_path index 9b40854..efaa908 100755 --- a/test/fast/Unit tests/nvm_tree_contains_path +++ b/test/fast/Unit tests/nvm_tree_contains_path @@ -8,6 +8,7 @@ cleanup () { } die () { echo "$@" ; cleanup; exit 1; } +: nvm.sh \. ../../../nvm.sh mkdir -p tmp diff --git a/test/fast/Unit tests/nvm_use_if_needed b/test/fast/Unit tests/nvm_use_if_needed index dd04ccf..04af1ba 100755 --- a/test/fast/Unit tests/nvm_use_if_needed +++ b/test/fast/Unit tests/nvm_use_if_needed @@ -3,6 +3,7 @@ cleanup() { unset -f nvm_ls_current nvm; } die () { echo "$@" ; cleanup ; exit 1; } +: nvm.sh \. ../../../nvm.sh nvm_ls_current() { echo foo; } diff --git a/test/fast/Unit tests/nvm_validate_implicit_alias b/test/fast/Unit tests/nvm_validate_implicit_alias index 8fd6ecf..961fb31 100755 --- a/test/fast/Unit tests/nvm_validate_implicit_alias +++ b/test/fast/Unit tests/nvm_validate_implicit_alias @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh EXPECTED_MSG="Only implicit aliases 'stable', 'unstable', 'iojs', and 'node' are supported." diff --git a/test/fast/Unit tests/nvm_version b/test/fast/Unit tests/nvm_version index 6c94d85..ce980de 100755 --- a/test/fast/Unit tests/nvm_version +++ b/test/fast/Unit tests/nvm_version @@ -5,6 +5,7 @@ cleanup () { unset -f nvm_ls_current nvm_ls } +: nvm.sh \. ../../../nvm.sh nvm_ls_current() { diff --git a/test/fast/Unit tests/nvm_version_dir b/test/fast/Unit tests/nvm_version_dir index ad4bd96..fc91dae 100755 --- a/test/fast/Unit tests/nvm_version_dir +++ b/test/fast/Unit tests/nvm_version_dir @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh [ "$(nvm_version_dir)" = "$NVM_DIR/versions/node" ] || die '"nvm_version_dir" did not return new dir path' diff --git a/test/fast/Unit tests/nvm_version_greater b/test/fast/Unit tests/nvm_version_greater index 2a345ea..e88c28d 100755 --- a/test/fast/Unit tests/nvm_version_greater +++ b/test/fast/Unit tests/nvm_version_greater @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh nvm_version_greater 0.10.0 0.2.12 || die '"nvm_version_greater 0.10.0 0.2.12" did not return true' diff --git a/test/fast/Unit tests/nvm_version_path b/test/fast/Unit tests/nvm_version_path index 2d4ad78..acf9aa1 100755 --- a/test/fast/Unit tests/nvm_version_path +++ b/test/fast/Unit tests/nvm_version_path @@ -2,6 +2,7 @@ die () { echo "$@" ; exit 1; } +: nvm.sh \. ../../../nvm.sh OUTPUT="$(nvm_version_path foo)" diff --git a/test/fast/Unit tests/nvm_write_nvmrc b/test/fast/Unit tests/nvm_write_nvmrc index 9e0d734..b98490b 100755 --- a/test/fast/Unit tests/nvm_write_nvmrc +++ b/test/fast/Unit tests/nvm_write_nvmrc @@ -1,4 +1,5 @@ #!/bin/sh +: nvm.sh \. ../../../nvm.sh \. ../../common.sh diff --git a/test/fast/nvm should remove the last trailing slash in $NVM_DIR b/test/fast/nvm should remove the last trailing slash in $NVM_DIR index 4babb54..0f9f804 100755 --- a/test/fast/nvm should remove the last trailing slash in $NVM_DIR +++ b/test/fast/nvm should remove the last trailing slash in $NVM_DIR @@ -7,12 +7,14 @@ die () { echo "$@" ; exit 1; } export NVM_DIR_BASE="/tmp" export NVM_DIR="${NVM_DIR_BASE}/" +: nvm.sh \. ../../nvm.sh [ "${NVM_DIR}" = "${NVM_DIR_BASE}" ] || die 'nvm should remove the last trailing slash in "$NVM_DIR"' export NVM_DIR="${NVM_DIR_BASE}//" +: nvm.sh \. ../../nvm.sh [ "${NVM_DIR}" = "${NVM_DIR_BASE}" ] || die 'nvm should remove all the last trailing slashes in "$NVM_DIR"'