From 354be52672f228bd4e2a238e6b10769eeff20b25 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Sun, 14 Sep 2014 17:51:34 -0700 Subject: [PATCH] Correct installation test paths --- test/installation/install already installed uses it | 6 +++--- test/installation/install from binary | 6 +++--- test/installation/install from source | 6 +++--- .../install two versions and use the latest one | 10 +++++----- .../install version specified in .nvmrc from binary | 6 +++--- .../install version specified in .nvmrc from source | 6 +++--- test/installation/teardown_dir | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/test/installation/install already installed uses it b/test/installation/install already installed uses it index ffcbb02..8a7dd9a 100755 --- a/test/installation/install already installed uses it +++ b/test/installation/install already installed uses it @@ -2,13 +2,13 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +. ../../nvm.sh [ "$(nvm install invalid.invalid 2>&1)" = "Version 'invalid.invalid' not found - try \`nvm ls-remote\` to browse available versions." ] || die "nvm installing an invalid version did not print a nice error message" # Remove the stuff we're clobbering. -[ -e ../../../v0.9.7 ] && rm -R ../../../v0.9.7 -[ -e ../../../v0.9.12 ] && rm -R ../../../v0.9.12 +[ -e ../../v0.9.7 ] && rm -R ../../v0.9.7 +[ -e ../../v0.9.12 ] && rm -R ../../v0.9.12 # Install from binary nvm install 0.9.7 diff --git a/test/installation/install from binary b/test/installation/install from binary index 82124e0..9138933 100755 --- a/test/installation/install from binary +++ b/test/installation/install from binary @@ -1,17 +1,17 @@ #!/bin/sh set -e -. ../../../nvm.sh +. ../../nvm.sh NVM_TEST_VERSION=v0.10.7 # Remove the stuff we're clobbering. -[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION +[ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION # Install from binary nvm install $NVM_TEST_VERSION # Check -[ -d ../../../$NVM_TEST_VERSION ] +[ -d ../../$NVM_TEST_VERSION ] nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION diff --git a/test/installation/install from source b/test/installation/install from source index fdb5c0e..a535b75 100755 --- a/test/installation/install from source +++ b/test/installation/install from source @@ -1,17 +1,17 @@ #!/bin/sh set -e -. ../../../nvm.sh +. ../../nvm.sh NVM_TEST_VERSION=v0.10.7 # Remove the stuff we're clobbering. -[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION +[ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION # Install from source nvm install -s $NVM_TEST_VERSION # Check -[ -d ../../../$NVM_TEST_VERSION ] +[ -d ../../$NVM_TEST_VERSION ] nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION diff --git a/test/installation/install two versions and use the latest one b/test/installation/install two versions and use the latest one index df6670d..9f50510 100755 --- a/test/installation/install two versions and use the latest one +++ b/test/installation/install two versions and use the latest one @@ -1,19 +1,19 @@ #!/bin/sh set -e -. ../../../nvm.sh +. ../../nvm.sh # Remove the stuff we're clobbering. -[ -e ../../../v0.9.7 ] && rm -R ../../../v0.9.7 -[ -e ../../../v0.9.12 ] && rm -R ../../../v0.9.12 +[ -e ../../v0.9.7 ] && rm -R ../../v0.9.7 +[ -e ../../v0.9.12 ] && rm -R ../../v0.9.12 # Install from binary nvm install 0.9.7 nvm i 0.9.12 # Check -[ -d ../../../v0.9.7 ] -[ -d ../../../v0.9.12 ] +[ -d ../../v0.9.7 ] +[ -d ../../v0.9.12 ] # Use the first one nvm use 0.9.7 diff --git a/test/installation/install version specified in .nvmrc from binary b/test/installation/install version specified in .nvmrc from binary index 7758afe..b261970 100755 --- a/test/installation/install version specified in .nvmrc from binary +++ b/test/installation/install version specified in .nvmrc from binary @@ -1,12 +1,12 @@ #!/bin/sh set -e -. ../../../nvm.sh +. ../../nvm.sh NVM_TEST_VERSION=v0.10.7 # Remove the stuff we're clobbering. -[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION +[ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION # Install from binary echo "$NVM_TEST_VERSION" > .nvmrc @@ -14,7 +14,7 @@ echo "$NVM_TEST_VERSION" > .nvmrc nvm install # Check -[ -d ../../../$NVM_TEST_VERSION ] +[ -d ../../$NVM_TEST_VERSION ] nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION diff --git a/test/installation/install version specified in .nvmrc from source b/test/installation/install version specified in .nvmrc from source index 189fffa..5544d0e 100755 --- a/test/installation/install version specified in .nvmrc from source +++ b/test/installation/install version specified in .nvmrc from source @@ -1,12 +1,12 @@ #!/bin/sh set -e -. ../../../nvm.sh +. ../../nvm.sh NVM_TEST_VERSION=v0.10.7 # Remove the stuff we're clobbering. -[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION +[ -e ../../$NVM_TEST_VERSION ] && rm -R ../../$NVM_TEST_VERSION # Install from binary echo "$NVM_TEST_VERSION" > .nvmrc @@ -14,7 +14,7 @@ echo "$NVM_TEST_VERSION" > .nvmrc nvm install -s # Check -[ -d ../../../$NVM_TEST_VERSION ] +[ -d ../../$NVM_TEST_VERSION ] nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION diff --git a/test/installation/teardown_dir b/test/installation/teardown_dir index 3f107c9..7637390 100755 --- a/test/installation/teardown_dir +++ b/test/installation/teardown_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +. ../../nvm.sh nvm uninstall v0.10.7 if [ -f ".nvmrc" ]; then