Commit bb9f8611 authored by Hunter Loftis's avatar Hunter Loftis

Merge pull request #177 from heroku/always-show-npm-version

test and implementation for always showing npm version
parents 7784b44b 6d2db2ae
...@@ -31,6 +31,7 @@ testSpecificVersion() { ...@@ -31,6 +31,7 @@ testSpecificVersion() {
compile "specific-version" compile "specific-version"
assertNotCaptured "Resolving node version" assertNotCaptured "Resolving node version"
assertCaptured "Downloading and installing node 0.10.29" assertCaptured "Downloading and installing node 0.10.29"
assertCaptured "Using default npm version: 1.4.14"
assertCapturedSuccess assertCapturedSuccess
} }
...@@ -66,6 +67,21 @@ testSameNpm() { ...@@ -66,6 +67,21 @@ testSameNpm() {
assertCapturedSuccess assertCapturedSuccess
} }
testNpmVersionRange() {
compile "npm-version-range"
assertCaptured "Resolving npm version"
assertCaptured "installing npm 1.4."
assertCapturedSuccess
}
testNpmVersionSpecific() {
compile "npm-version-specific"
assertCaptured "installing npm 2.1.11"
assertNotCaptured "Resolving npm version"
assertNotCaptured "WARNING"
assertCapturedSuccess
}
testFailingBuild() { testFailingBuild() {
compile "failing-build" compile "failing-build"
assertCaptured "Build failed" assertCaptured "Build failed"
...@@ -301,21 +317,6 @@ testShrinkwrap() { ...@@ -301,21 +317,6 @@ testShrinkwrap() {
assertCapturedSuccess assertCapturedSuccess
} }
testNpmVersionRange() {
compile "npm-version-range"
assertCaptured "Resolving npm version"
assertCaptured "installing npm 1.4."
assertCapturedSuccess
}
testNpmVersionSpecific() {
compile "npm-version-specific"
assertCaptured "installing npm 2.1.11"
assertNotCaptured "Resolving npm version"
assertNotCaptured "WARNING"
assertCapturedSuccess
}
testProfileExport() { testProfileExport() {
compile "stable-node" compile "stable-node"
assertCaptured "Creating runtime environment" assertCaptured "Creating runtime environment"
......
...@@ -99,6 +99,8 @@ install_npm() { ...@@ -99,6 +99,8 @@ install_npm() {
npm install --quiet -g npm@$npm_engine 2>&1 >/dev/null | indent npm install --quiet -g npm@$npm_engine 2>&1 >/dev/null | indent
fi fi
warn_old_npm `npm --version` warn_old_npm `npm --version`
else
info "Using default npm version: `npm --version`"
fi fi
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment