Install package.json dependencies missing from vendored node_modules

[#94525966]
cloudfoundry · May 22, 2015 · 24d68bd · 24d68bd
1 parent 1aec8fa
commit 24d68bd
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 0 deletions.
diff --git a/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/.gitignore b/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/.gitignore
diff --git a/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/.heroku/node-version b/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/.heroku/node-version
diff --git a/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/.npmrc b/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/.npmrc
diff --git a/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/.profile.d/nodejs.sh b/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/.profile.d/nodejs.sh
diff --git a/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/Procfile b/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/Procfile
diff --git a/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/README.md b/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/README.md
diff --git a/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/package.json b/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/package.json
diff --git a/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/package.sh b/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/package.sh
diff --git a/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/resolve b/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/resolve
diff --git a/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/server.js b/cf_spec/fixtures/node_web_app_with_incomplete_node_modules/server.js
diff --git a/cf_spec/integration/deploy_a_node_app_spec.rb b/cf_spec/integration/deploy_a_node_app_spec.rb
@@ -82,6 +82,17 @@
     end
   end
 
+  context 'with an incomplete node_modules directory' do
+    let (:app_name) { 'node_web_app_with_incomplete_node_modules' }
+
+    it 'downloads missing dependencies from package.json' do
+      expect(app).to be_running
+      expect(Dir).to_not exist("cf_spec/fixtures/node_web_app_with_incomplete_node_modules/node_modules/hashish")
+      expect(app).to have_file("app/node_modules/hashish")
+      expect(app).to have_file("app/node_modules/express")
+    end
+  end
+
   context 'with an incomplete package.json' do
     let (:app_name) { 'node_web_app_with_incomplete_package_json' }
 

diff --git a/lib/build.sh b/lib/build.sh
@@ -165,6 +165,8 @@ function build_dependencies() {
   elif [ "$modules_source" == "prebuilt" ]; then
     info "Rebuilding any native modules for this architecture"
     npm rebuild 2>&1 | indent
+    info "Installing any new modules"
+    npm install --unsafe-perm --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
 
   else
     restore_cache