From a5f42d9cea7f9d13b38a9df9007ec3849483edf1 Mon Sep 17 00:00:00 2001
From: Joshua Li <joshua.r.li.98@gmail.com>
Date: Wed, 13 Jun 2018 10:38:19 -0700
Subject: [PATCH] [Tests] update most mkdirs to use make_fake_{node,iojs}

---
 ... instead of implicit aliases when present" |  6 +--
 ....0.2\" should display only version 0.0.2." |  7 ++--
 ....0.2\" should display only version 0.0.2." |  5 ++-
 ...0.2\" should display only 0.2.x versions." |  7 ++--
 ...uld return the appropriate implicit alias" | 13 ++++---
 ...hould include \"system\" when appropriate" | 13 ++++---
 ...\" should display all installed versions." | 39 ++++++++++---------
 ...ing \"nvm ls\" should filter out \".nvm\"" |  5 ++-
 ...\"nvm ls\" should filter out \"versions\"" |  6 +--
 ...hould include \"system\" when appropriate" | 13 ++++---
 ...st versions in the \"versions\" directory" |  5 ++-
 ...vx.x.x should only list a matched version" |  3 +-
 .../Using a nonstandard IFS should not break  | 21 +++++-----
 test/fast/Listing versions/teardown           |  1 +
 ...-packages-from\" requires a valid version" |  3 +-
 ...create and change the \"current\" symlink" |  9 +++--
 ... symlink if $NVM_SYMLINK_CURRENT is false" |  5 ++-
 .../Unit tests/nvm_ensure_version_installed   |  3 +-
 test/fast/Unit tests/nvm_has_system_iojs      |  9 ++---
 test/fast/Unit tests/nvm_has_system_node      |  6 +--
 .../nvm_print_implicit_alias success          | 18 +++++----
 21 files changed, 107 insertions(+), 90 deletions(-)

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 25871fd..1857f44 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"	
@@ -14,9 +14,9 @@ cleanup () {
   rm -rf "${NVM_DIR}/versions/io.js/v0.2.1"
 }
 
-mkdir "${NVM_DIR}/v0.8.1"
-mkdir "${NVM_DIR}/v0.9.1"
-mkdir -p "${NVM_DIR}/versions/io.js/v0.2.1"
+make_fake_node v0.8.1
+make_fake_node v0.9.1
+make_fake_iojs v0.2.1
 
 EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
 STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
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 adbdb8c..1f4eb11 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,10 +1,11 @@
 #!/bin/sh
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir -p "${NVM_DIR}/v0.0.2"
-mkdir -p "${NVM_DIR}/v0.0.20"
-mkdir -p "${NVM_DIR}/versions/node/v0.12.0"
+make_fake_node v0.0.2
+make_fake_node v0.0.20
+make_fake_node v0.12.0
 
 die () { echo "$@" ; exit 1; }
 
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 faed0a6..666a3f0 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,9 +1,10 @@
 #!/bin/sh
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir "${NVM_DIR}/v0.0.2"
-mkdir "${NVM_DIR}/v0.0.20"
+make_fake_node v0.0.2
+make_fake_node v0.0.20
 
 die () { echo "$@" ; exit 1; }
 
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 edddf01..b02efa3 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,10 +1,11 @@
 #!/bin/sh
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir "${NVM_DIR}/v0.1.3"
-mkdir "${NVM_DIR}/v0.2.3"
-mkdir "${NVM_DIR}/v0.20.3"
+make_fake_node v0.1.3
+make_fake_node v0.2.3
+make_fake_node v0.20.3
 
 die () { echo "$@" ; exit 1; }
 
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 61e890a..78d0a50 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,11 +1,12 @@
 #!/bin/sh
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
 die () { echo "$@" ; exit 1; }
 
-mkdir "${NVM_DIR}/v0.2.3"
-mkdir "${NVM_DIR}/v0.3.3"
+make_fake_node v0.2.3
+make_fake_node v0.3.3
 
 EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
 STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
@@ -19,10 +20,10 @@ nvm ls stable | \grep "$STABLE_VERSION" >/dev/null \
 nvm ls unstable | \grep "$UNSTABLE_VERSION" >/dev/null \
   || die "expected 'nvm ls unstable' to give $UNSTABLE_VERSION, got $(nvm ls unstable)"
 
-mkdir "${NVM_DIR}/v0.1.2"
+make_fake_node v0.1.4
 nvm alias stable 0.1
 
 nvm ls stable | \grep -v "$STABLE_VERSION" >/dev/null \
-  || die "'nvm ls stable' contained $STABLE_VERSION instead of v0.1.2"
-nvm ls stable | \grep v0.1.2 >/dev/null \
-  || die "'nvm ls stable' did not contain v0.1.2"
+  || die "'nvm ls stable' contained $STABLE_VERSION instead of v0.1.4"
+nvm ls stable | \grep v0.1.4 >/dev/null \
+  || die "'nvm ls stable' did not contain v0.1.4"
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 c858876..1d39a41 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"	
@@ -3,13 +3,14 @@
 die () { echo "$@" ; exit 1; }
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir -p "${NVM_DIR}/v0.0.1"
-mkdir -p "${NVM_DIR}/v0.0.3"
-mkdir -p "${NVM_DIR}/v0.0.9"
-mkdir -p "${NVM_DIR}/v0.3.1"
-mkdir -p "${NVM_DIR}/v0.3.3"
-mkdir -p "${NVM_DIR}/v0.3.9"
+make_fake_node v0.0.1
+make_fake_node v0.0.3
+make_fake_node v0.0.9
+make_fake_node v0.3.1
+make_fake_node v0.3.3
+make_fake_node v0.3.9
 
 nvm_has_system_node() { return 0; }
 nvm ls system | grep system 2>&1 > /dev/null
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 d9fdce0..6b71e1e 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,24 +1,27 @@
 #!/bin/sh
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir "${NVM_DIR}/v0.0.1"
-mkdir "${NVM_DIR}/v0.0.3"
-mkdir "${NVM_DIR}/v0.0.9"
-mkdir "${NVM_DIR}/v0.3.1"
-mkdir "${NVM_DIR}/v0.3.3"
-mkdir "${NVM_DIR}/v0.3.9"
-mkdir -p "${NVM_DIR}/versions/node/v0.12.87"
-mkdir -p "${NVM_DIR}/versions/node/v0.12.9"
-mkdir -p "${NVM_DIR}/versions/io.js/v0.1.2"
-mkdir -p "${NVM_DIR}/versions/io.js/v0.10.2"
+die () { echo "$@" ; exit 1; }
+
+make_fake_node v0.0.1
+make_fake_node v0.0.3
+make_fake_node v0.0.9
+make_fake_node v0.3.1
+make_fake_node v0.3.3
+make_fake_node v0.3.9
+make_fake_node v0.12.87
+make_fake_node v0.12.9
+make_fake_iojs v0.1.2
+make_fake_iojs v0.10.2
 
 # The result should contain the version numbers.
-nvm ls | grep v0.0.1 >/dev/null &&
-nvm ls | grep v0.0.3 >/dev/null &&
-nvm ls | grep v0.0.9 >/dev/null &&
-nvm ls | grep v0.3.1 >/dev/null &&
-nvm ls | grep v0.3.3 >/dev/null &&
-nvm ls | grep v0.3.9 >/dev/null &&
-nvm ls | grep v0.12.87 >/dev/null &&
-nvm ls | grep iojs-v0.1.2 >/dev/null
+nvm ls | grep v0.0.1 >/dev/null || die "v0.0.1 not found in: $(nvm ls)"
+nvm ls | grep v0.0.3 >/dev/null || die "v0.0.3 not found in: $(nvm ls)"
+nvm ls | grep v0.0.9 >/dev/null || die "v0.0.9 not found in: $(nvm ls)"
+nvm ls | grep v0.3.1 >/dev/null || die "v0.3.1 not found in: $(nvm ls)"
+nvm ls | grep v0.3.3 >/dev/null || die "v0.3.3 not found in: $(nvm ls)"
+nvm ls | grep v0.3.9 >/dev/null || die "v0.3.9 not found in: $(nvm ls)"
+nvm ls | grep v0.12.87 >/dev/null || die "v0.12.87 not found in: $(nvm ls)"
+nvm ls | grep iojs-v0.1.2 >/dev/null || die "iojs-v0.1.2 not found in: $(nvm ls)"
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 2946ad8..dedb541 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,9 +1,10 @@
 #!/bin/sh
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir "${NVM_DIR}/v0.1.3"
-mkdir "${NVM_DIR}/v0.2.3"
+make_fake_node v0.1.3
+make_fake_node v0.2.3
 
 [ -z `nvm ls | grep '^ *\.'` ]
 # The result should contain only the appropriate version numbers.
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 eae526a..bd0c709 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,10 +1,10 @@
 #!/bin/sh
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir "${NVM_DIR}/v0.1.3"
-mkdir "${NVM_DIR}/v0.2.3"
-mkdir -p "${NVM_DIR}/versions/node"
+make_fake_node v0.1.3
+make_fake_node v0.2.3
 
 [ -z "$(nvm ls | \grep 'versions')" ]
 # The result should contain only the appropriate version numbers.
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 3ab0f2d..9c465c0 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"	
@@ -3,13 +3,14 @@
 die () { echo "$@" ; exit 1; }
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir -p "${NVM_DIR}/v0.0.1"
-mkdir -p "${NVM_DIR}/v0.0.3"
-mkdir -p "${NVM_DIR}/v0.0.9"
-mkdir -p "${NVM_DIR}/v0.3.1"
-mkdir -p "${NVM_DIR}/v0.3.3"
-mkdir -p "${NVM_DIR}/v0.3.9"
+make_fake_node v0.0.1
+make_fake_node v0.0.3
+make_fake_node v0.0.9
+make_fake_node v0.3.1
+make_fake_node v0.3.3
+make_fake_node v0.3.9
 
 nvm_has_system_node() { return 0; }
 nvm ls | grep system 2>&1 > /dev/null
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 864494a..a2a31e2 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"	
@@ -3,9 +3,10 @@
 die () { echo "$@" ; exit 1; }
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir -p "${NVM_DIR}/versions/node/v0.12.1"
-mkdir "${NVM_DIR}/v0.1.3"
+make_fake_node v0.12.1
+make_fake_node v0.1.3
 
 nvm ls 0.12 | grep v0.12.1 || die '"nvm ls" did not list a version in the versions/ directory'
 nvm ls 0.1 | grep v0.1.3 || die '"nvm ls" did not list a version not in the versions/ directory'
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 2884531..cb54278 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,8 +1,9 @@
 #!/bin/sh
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir "${NVM_DIR}/v0.1.2"
+make_fake_node v0.1.2
 
 nvm ls v0.1 | grep v0.1.2 &&
 nvm ls v0.1.2 | grep v0.1.2 &&
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 c707dbc..27cf2de 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,17 +1,18 @@
 #!/bin/sh
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir "${NVM_DIR}/v0.0.1"
-mkdir "${NVM_DIR}/v0.0.3"
-mkdir "${NVM_DIR}/v0.0.9"
-mkdir "${NVM_DIR}/v0.3.1"
-mkdir "${NVM_DIR}/v0.3.3"
-mkdir "${NVM_DIR}/v0.3.9"
-mkdir -p "${NVM_DIR}/versions/node/v0.12.87"
-mkdir -p "${NVM_DIR}/versions/node/v0.12.9"
-mkdir -p "${NVM_DIR}/versions/io.js/v0.1.2"
-mkdir -p "${NVM_DIR}/versions/io.js/v0.10.2"
+make_fake_node v0.0.1
+make_fake_node v0.0.3
+make_fake_node v0.0.9
+make_fake_node v0.3.1
+make_fake_node v0.3.3
+make_fake_node v0.3.9
+make_fake_node v0.12.87
+make_fake_node v0.12.9
+make_fake_iojs v0.1.2
+make_fake_iojs v0.10.2
 
 set -e
 
diff --git a/test/fast/Listing versions/teardown b/test/fast/Listing versions/teardown
index 7c965ac..8ae7d96 100755
--- a/test/fast/Listing versions/teardown	
+++ b/test/fast/Listing versions/teardown	
@@ -5,6 +5,7 @@ rmdir ../../../v0.0.9 >/dev/null 2>&1
 rmdir ../../../v0.0.20 >/dev/null 2>&1
 rmdir ../../../v0.1.2 >/dev/null 2>&1
 rmdir ../../../v0.1.3 >/dev/null 2>&1
+rmdir ../../../v0.1.4 >/dev/null 2>&1
 rmdir ../../../v0.2.3 >/dev/null 2>&1
 rmdir ../../../v0.3.1 >/dev/null 2>&1
 rmdir ../../../v0.3.3 >/dev/null 2>&1
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 36e1127..41016da 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"	
@@ -8,8 +8,9 @@ cleanup () {
 }
 
 \. ../../nvm.sh
+\. ../common.sh
 
-mkdir "${NVM_DIR}/v0.10.4"
+make_fake_node v0.10.4
 
 nvm deactivate >/dev/null 2>&1
 
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 71f208c..fc1a086 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"	
@@ -4,11 +4,12 @@ set -ex
 
 export NVM_SYMLINK_CURRENT=true
 \. ../../nvm.sh
+\. ../common.sh
 
 rm -rf "${NVM_DIR}/v0.10.29"
-mkdir "${NVM_DIR}/v0.10.29"
+make_fake_node v0.10.29
 nvm use --delete-prefix 0.10.29
-rmdir "${NVM_DIR}/v0.10.29"
+rm -rf "${NVM_DIR}/v0.10.29"
 
 if [ ! -L "${NVM_DIR}/current" ];then
   echo "Expected 'current' symlink to be created!"
@@ -23,9 +24,9 @@ if [ "$(basename "${oldLink}")" != 'v0.10.29' ];then
 fi
 
 rm -rf "${NVM_DIR}/v0.11.13"
-mkdir "${NVM_DIR}/v0.11.13"
+make_fake_node v0.11.13
 nvm use --delete-prefix 0.11.13
-rmdir "${NVM_DIR}/v0.11.13"
+rm -rf "${NVM_DIR}/v0.11.13"
 
 newLink="$(readlink "${NVM_DIR}/current")"
 
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 be6284d..1450659 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"	
@@ -3,6 +3,7 @@
 set -ex
 
 \. ../../nvm.sh
+\. ../common.sh
 
 TEST_NODE_VERSION="v0.10.29"
 
@@ -35,9 +36,9 @@ cleanup() {
 }
 
 runNvmUse() {
-  mkdir "${NVM_DIR}/${TEST_NODE_VERSION}"
+  make_fake_node "$TEST_NODE_VERSION"
   nvm use --delete-prefix "${TEST_NODE_VERSION}" > /dev/null 2>&1
-  rmdir "${NVM_DIR}/${TEST_NODE_VERSION}"
+  rm -rf "${NVM_DIR}/${TEST_NODE_VERSION}"
 }
 
 isCurrentSymlinkPresent() {
diff --git a/test/fast/Unit tests/nvm_ensure_version_installed b/test/fast/Unit tests/nvm_ensure_version_installed
index e819657..e239e0e 100755
--- a/test/fast/Unit tests/nvm_ensure_version_installed	
+++ b/test/fast/Unit tests/nvm_ensure_version_installed	
@@ -7,8 +7,9 @@ cleanup () {
 }
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir -p "$(nvm_version_path v0.1.2)"
+make_fake_node v0.1.2
 
 OUTPUT="$(nvm_ensure_version_installed foo 2>&1)"
 EXIT_CODE=$?
diff --git a/test/fast/Unit tests/nvm_has_system_iojs b/test/fast/Unit tests/nvm_has_system_iojs
index 5d3240b..0d4eadb 100755
--- a/test/fast/Unit tests/nvm_has_system_iojs	
+++ b/test/fast/Unit tests/nvm_has_system_iojs	
@@ -1,17 +1,14 @@
 #!/bin/sh
 
 cleanup () {
-  rm "${NVM_DIR}/versions/io.js/v0.1.2/node"
-  rm "${NVM_DIR}/versions/io.js/v0.1.2/iojs"
-  rmdir "${NVM_DIR}/versions/io.js/v0.1.2"
+  rm -rf "${NVM_DIR}/versions/io.js/v0.1.2"
 }
 die () { echo "$@" ; exit 1; }
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir "${NVM_DIR}/versions/io.js/v0.1.2"
-touch "${NVM_DIR}/versions/io.js/v0.1.2/node"
-touch "${NVM_DIR}/versions/io.js/v0.1.2/iojs"
+make_fake_iojs v0.1.2
 
 nvm use iojs-v0.1.2
 
diff --git a/test/fast/Unit tests/nvm_has_system_node b/test/fast/Unit tests/nvm_has_system_node
index 86f6bbc..9a71979 100755
--- a/test/fast/Unit tests/nvm_has_system_node	
+++ b/test/fast/Unit tests/nvm_has_system_node	
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
 cleanup () {
-  rm -rf "${NVM_DIR}/v0.1.2/node"
+  rm -rf "${NVM_DIR}/v0.1.2"
 }
 die () { echo "$@" ; exit 1; }
 
-mkdir "${NVM_DIR}/v0.1.2"
-touch "${NVM_DIR}/v0.1.2/node"
+make_fake_node v0.1.2
 
 nvm use 0.1.2
 
diff --git a/test/fast/Unit tests/nvm_print_implicit_alias success b/test/fast/Unit tests/nvm_print_implicit_alias success
index fe99b58..ded8174 100755
--- a/test/fast/Unit tests/nvm_print_implicit_alias success	
+++ b/test/fast/Unit tests/nvm_print_implicit_alias success	
@@ -14,13 +14,14 @@ cleanup() {
 }
 
 \. ../../../nvm.sh
+\. ../../common.sh
 
-mkdir "${NVM_DIR}/v0.2.3"
-mkdir "${NVM_DIR}/v0.3.4"
-mkdir "${NVM_DIR}/v0.4.6"
-mkdir "${NVM_DIR}/v0.5.7"
-mkdir "${NVM_DIR}/v0.7.7"
-mkdir -p "${NVM_DIR}/versions/io.js/v0.98.0"
+make_fake_node v0.2.3
+make_fake_node v0.3.4
+make_fake_node v0.4.6
+make_fake_node v0.5.7
+make_fake_node v0.7.7
+make_fake_iojs v0.98.0
 
 LATEST_STABLE="$(nvm_print_implicit_alias local stable)"
 [ "_$LATEST_STABLE" = "_0.4" ] || die "local stable is not latest even minor: expected 0.4, got $LATEST_STABLE"
@@ -35,8 +36,9 @@ LATEST_IOJS="$(nvm_print_implicit_alias local iojs)"
 [ "_$LATEST_IOJS" = "_iojs-v0.98" ] || die "local iojs is not latest iojs: expected iojs-v0.98, got $LATEST_IOJS"
 
 ## node post v1.0/io.js merger ##
-mkdir -p "${NVM_DIR}/versions/node/v1.0.0"
-mkdir -p "${NVM_DIR}/versions/node/v1.1.0"
+make_fake_node v1.0.0
+make_fake_node v1.1.0
+
 
 LATEST_STABLE="$(nvm_print_implicit_alias local stable)"
 [ "_$LATEST_STABLE" = "_1.1" ] || die "local stable when post-v1.0 exists is not latest: expected 1.1, got $LATEST_STABLE"