From e7a37f336df425dc178d05fe6874d2171d10343d Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Wed, 15 Aug 2018 15:01:47 -0700
Subject: [PATCH] [Tests] fix failing tests on master due to npm registry SSL
 changes

---
 test/installation_node/install latest npm     |  3 ++-
 .../install while reinstalling packages       | 22 +++++++++----------
 test/installation_node/teardown_dir           |  4 ++++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/test/installation_node/install latest npm b/test/installation_node/install latest npm
index bb7e57f..8bb7a62 100755
--- a/test/installation_node/install latest npm	
+++ b/test/installation_node/install latest npm	
@@ -26,6 +26,8 @@ nvm install-latest-npm || die 'nvm install-latest-npm failed: 3'
 NPM_VERSION="$(npm --version)"
 [ "${NPM_VERSION}" = '4.6.1' ] || die "io.js v1.x updates to ${NPM_VERSION}; expected v4.6.1"
 
+export NPM_CONFIG_STRICT_SSL=false # the npm registry tightened up their SSL certs
+
 nvm deactivate >/dev/null 2>&1 || die 'unable to deactivate: 4'
 nvm install 0.8.27 >/dev/null 2>&1 || die 'install v0.8 failed'
 nvm install-latest-npm || die 'nvm install-latest-npm failed: 4'
@@ -35,7 +37,6 @@ NPM_VERSION="$(npm --version)"
 ## Commented to work around travis-ci breaking 0,6 installs
 # nvm deactivate >/dev/null 2>&1 || die 'unable to deactivate: 5'
 # nvm install 0.6.21 >/dev/null 2>&1 || die 'install v0.6 failed'
-# export NPM_CONFIG_STRICT_SSL=false # npm 1 on travis can't handle SSL to npm
 # nvm install-latest-npm || die 'nvm install-latest-npm failed: 5'
 # NPM_VERSION="$(npm --version)"
 # [ "${NPM_VERSION}" = '1.3.26' ] || die "node 0.6.21 updates to ${NPM_VERSION}; expected v1.3.26"
diff --git a/test/installation_node/install while reinstalling packages b/test/installation_node/install while reinstalling packages
index 0c1046d..5588842 100755
--- a/test/installation_node/install while reinstalling packages	
+++ b/test/installation_node/install while reinstalling packages	
@@ -5,29 +5,29 @@ die () { echo "$@" ; exit 1; }
 \. ../../nvm.sh
 
 # Remove the stuff we're clobbering.
-[ -e "${NVM_DIR}/v0.9.7" ] && rm -R "${NVM_DIR}/v0.9.7"
-[ -e "${NVM_DIR}/v0.9.12" ] && rm -R "${NVM_DIR}/v0.9.12"
+[ -e "${NVM_DIR}/versions/node/v9.7.0" ] && rm -R "${NVM_DIR}/versions/node/v9.7.0"
+[ -e "${NVM_DIR}/versions/node/v9.10.0" ] && rm -R "${NVM_DIR}/versions/node/v9.10.0"
 
 # Install from binary
-nvm install 0.9.7
+nvm install 9.7.0
 
 # Check
-[ -d "${NVM_DIR}/v0.9.7" ] || die "nvm install 0.9.7 didn't install"
+[ -d "${NVM_DIR}/versions/node/v9.7.0" ] || die "nvm install 9.7.0 didn't install"
 
-nvm use 0.9.7
+nvm use 9.7.0
 
-node --version | grep v0.9.7 > /dev/null || die "nvm use 0.9.7 failed"
+node --version | grep v9.7.0 > /dev/null || die "nvm use 9.7.0 failed"
 
 npm install -g object-is@0.0.0 || die "npm install -g object-is failed"
 npm list --global | grep object-is > /dev/null || die "object-is isn't installed"
 
-nvm ls 0.9 | grep v0.9.7 > /dev/null || die "nvm ls 0.9 didn't show v0.9.7"
+nvm ls 9 | grep v9.7.0 > /dev/null || die "nvm ls 9 didn't show v9.7.0"
 
-nvm install 0.9.12 --reinstall-packages-from=0.9 || die "nvm install 0.9.12 --reinstall-packages-from=0.9 failed"
+nvm install 9.10.0 --reinstall-packages-from=9 || die "nvm install 9.10.0 --reinstall-packages-from=9 failed"
 
-[ -d "${NVM_DIR}/v0.9.12" ] || die "nvm install 0.9.12 didn't install"
+[ -d "${NVM_DIR}/versions/node/v9.10.0" ] || die "nvm install 9.10.0 didn't install"
 
-nvm use 0.9
-node --version | grep v0.9.12 > /dev/null || die "nvm ls 0.9 didn't use v0.9.12"
+nvm use 9
+node --version | grep v9.10.0 > /dev/null || die "nvm ls 9 didn't use v9.10.0"
 
 npm list --global | grep object-is > /dev/null || die "object-is isn't installed"
diff --git a/test/installation_node/teardown_dir b/test/installation_node/teardown_dir
index 2aad120..adb23c4 100755
--- a/test/installation_node/teardown_dir
+++ b/test/installation_node/teardown_dir
@@ -4,6 +4,10 @@
 nvm deactivate
 nvm uninstall v0.10.7
 nvm uninstall v4.2.2
+nvm uninstall v0.9.7
+nvm uninstall v9.7.0
+nvm uninstall v0.9.12
+nvm uninstall v9.10.0
 
 if [ -f ".nvmrc" ]; then
   rm .nvmrc