github/bower
1
1
Fork 0
mirror of https://github.com/bower/bower.git synced 2026-04-24 03:00:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38 from bower/revert-36-master

Browse Source 
Revert "updated to respect the bowerrc in the cwd passed in as command line argument"
This commit is contained in:
Adam Stankiewicz
2015-11-24 16:53:09 +01:00
parent 2137089a70 5a9c099188
commit cd8d397e63
2 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/bower-config/lib/util/rc.js
View File

@@ -31,8 +31,6 @@ function rc(name, cwd, argv) {
json(find('.' + name + 'rc', cwd)),
env('npm_package_config_' + name + '_'),
env(name + '_'),
// If we have specified a cwd then the bowerrc from there takes precedence
!argvConfig.cwd ? {} : json(path.join(argvConfig.cwd, '.' + name + 'rc')),
argvConfig
]);
} else {
@@ -44,8 +42,6 @@ function rc(name, cwd, argv) {
json(path.join(paths.config, name + 'rc')),
env('npm_package_config_' + name + '_'),
env(name + '_'),
// If we have specified a cwd then the bowerrc from there takes precedence
!argvConfig.cwd ? {} : json(path.join(argvConfig.cwd, '.' + name + 'rc')),
argvConfig
]);
}

18
packages/bower-config/test/util/rc.js
View File

@@ -20,16 +20,13 @@ describe('rc', function() {
'child3/bower.json': {
name: 'without-bowerrc'
},
'other_dir/.bowerrc': {
key: 'othervalue'
}
});
tempDirBowerrc.prepare({
'.bowerrc/foo': {
key: 'bar'
}
});
it('correctly reads .bowerrc files', function() {
@@ -60,19 +57,6 @@ describe('rc', function() {
expect(config.key2).to.eql(undefined);
});
it('loads the .bowerrc file from the cwd specified on the command line', function(){
var argv = {
'config': {
'cwd': tempDir.path + '/other_dir/'
}
};
var config = rc('bower', tempDir.path, argv);
expect(config.key).to.eql('othervalue');
});
it('throws an easy to understand error if .bowerrc is a dir', function() {
// Gotta wrap this to catch the error
var config = function () {