Commit 4fbaca42 authored by Hunter Loftis's avatar Hunter Loftis

fix shrinkwrap test; update multibp export

parent 269dd87b
......@@ -176,12 +176,10 @@ status "Building runtime environment"
mkdir -p $build_dir/.profile.d
# Runtime & Multi-buildpack exports
export_path="export PATH=\"\$HOME/.heroku/node/bin:\$HOME/bin:\$HOME/node_modules/.bin:\$PATH\""
export_home="export NODE_HOME=\"\$HOME/.heroku/node\""
echo $export_path > $build_dir/.profile.d/nodejs.sh
echo $export_home >> $build_dir/.profile.d/nodejs.sh
echo $export_path > $bp_dir/export
echo $export_home >> $bp_dir/export
echo "export PATH=\"\$HOME/.heroku/node/bin:\$HOME/bin:\$HOME/node_modules/.bin:\$PATH\"" > $build_dir/.profile.d/nodejs.sh
echo "export NODE_HOME=\"\$HOME/.heroku/node\"" >> $build_dir/.profile.d/nodejs.sh
echo "export PATH=\"$build_dir/.heroku/node/bin:$build_dir/node_modules/.bin:\$PATH\"" > $bp_dir/export
echo "export NODE_HOME=\"$build_dir/.heroku/node\"" >> $bp_dir/export
####### Clean up
......
......@@ -31,6 +31,7 @@ testSpecificVersion() {
testStableVersion() {
compile "stable-node"
assertCaptured "Downloading and installing node 0.10"
assertNotCaptured "PRO TIP"
assertCapturedSuccess
}
......@@ -208,9 +209,7 @@ testNpmrc() {
testShrinkwrap() {
compile "shrinkwrap"
assertCaptured "express@4.10.4"
assertCaptured "mime-db@1.2.0"
assertCaptured "etag@1.5.1"
assertCaptured "lodash@2.4.1"
assertCaptured "lodash@2.4.0"
assertNotCaptured "mocha"
assertCapturedSuccess
}
......@@ -239,8 +238,11 @@ testProfileExport() {
testMultiExport() {
compile "stable-node"
assertFileContains "export PATH=\"\$HOME/.heroku/node/bin:\$HOME/bin:\$HOME/node_modules/.bin:\$PATH\"" "${bp_dir}/export"
assertFileContains "export NODE_HOME=\"\$HOME/.heroku/node\"" "${bp_dir}/export"
assertFileContains "export PATH=" "${bp_dir}/export"
assertFileContains "/.heroku/node/bin:" "${bp_dir}/export"
assertFileContains "/node_modules/.bin:\$PATH" "${bp_dir}/export"
assertFileContains "export NODE_HOME=" "${bp_dir}/export"
assertFileContains "/.heroku/node\"" "${bp_dir}/export"
assertCapturedSuccess
}
......
......@@ -213,9 +213,9 @@
}
},
"lodash": {
"version": "2.4.1",
"from": "lodash@2.4.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
"version": "2.4.0",
"from": "lodash@2.4.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.0.tgz"
}
}
}
......@@ -8,7 +8,7 @@
},
"dependencies": {
"express": "4.10.4",
"lodash": "2.4.1"
"lodash": "^2.4.0"
},
"engines": {
"node": "~0.10.0"
......
......@@ -11,5 +11,8 @@
},
"engines": {
"node": "~0.10.0"
},
"scripts": {
"start": "node foo.js"
}
}
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