Skip to content

H
heroku-buildpack-nodejs
Commit 4fbaca42 authored by Hunter Loftis's avatar Hunter Loftis
Browse files
Options

fix shrinkwrap test; update multibp export

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