If cwd provided explicitly, force using it, fixes #1866

bower · Aug 23, 2015 · dd67cc7 · dd67cc7
1 parent 8531534
commit dd67cc7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/lib/commands/init.js b/lib/commands/init.js
@@ -13,6 +13,12 @@ var createError = require('../util/createError');
 function init(logger, config) {
     var project;
 
+    config = config || {};
+
+    if (!config.cwd) {
+        config.cwd = process.cwd();
+    }
+
     config = defaultConfig(config);
 
     // This command requires interactive to be enabled

diff --git a/lib/config.js b/lib/config.js
@@ -10,9 +10,9 @@ var cachedConfigs = {};
 function defaultConfig(config) {
     config = config || {};
 
-    var cwd = path.dirname(findup('bower.json', {
-        cwd: config.cwd || process.cwd()
-    })) || config.cwd || process.cwd();
+    var cwd = config.cwd || path.dirname(findup('bower.json', {
+        cwd: process.cwd()
+    })) || process.cwd();
 
     config.cwd = cwd;
 

diff --git a/lib/core/scripts.js b/lib/core/scripts.js
@@ -93,4 +93,4 @@ module.exports = {
     postinstall: mout.function.partial(hook, 'postinstall', true),
     //only exposed for test
     _orderByDependencies: orderByDependencies
-};
+};
diff --git a/test/commands/install.js b/test/commands/install.js
@@ -1,3 +1,4 @@
+var path = require('path');
 var expect = require('expect.js');
 var helpers = require('../helpers');
 
@@ -147,7 +148,9 @@ describe('bower install', function () {
             }
         });
 
-        return helpers.run(install, [undefined, undefined, { cwd: tempDir.path + '/foo/bar' }]).then(function() {
+        process.chdir(path.join(tempDir.path, '/foo/bar'));
+
+        return helpers.run(install).then(function() {
             expect(tempDir.read('assets/package/foo')).to.be('bar');
         });
     });