Skip to content

Fix problem prefixBase option adds prefix to absolute paths incorrectly #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
randing89 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix problem prefixBase option adds prefix to absolute paths incorrectly #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50aa17d
Fix problem prefixBase option adds prefix to absolute paths incorrectly
randing89 Nov 11, 2014
961ca24
Better test case for prefix base
randing89 Nov 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/globule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ globule.find = function() {
});
// If srcBase and prefixBase were specified, prefix srcBase to matched paths.
if (srcBase && options.prefixBase) {
var srcBaseAbsolute = path.resolve(process.cwd(), srcBase);

matches = matches.map(function(filepath) {
return path.join(srcBase, filepath);
return (filepath.indexOf(srcBaseAbsolute) === -1) ? path.join(srcBase, filepath) : filepath;
});
}
// Filter result set?
Expand Down
10 changes: 9 additions & 1 deletion test/globule_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,13 +303,21 @@ exports['find'] = {
test.done();
},
'options.prefixBase': function(test) {
test.expect(2);
test.expect(3);
test.deepEqual(globule.find(['**/deep*.txt'], {srcBase: 'deep', prefixBase: false}),
['deep.txt', 'deeper/deeper.txt', 'deeper/deepest/deepest.txt'],
'should not prefix srcBase to returned paths.');
test.deepEqual(globule.find(['**/deep*.txt'], {srcBase: 'deep', prefixBase: true}),
['deep/deep.txt', 'deep/deeper/deeper.txt', 'deep/deeper/deepest/deepest.txt'],
'should prefix srcBase to returned paths.');
var dir = path.resolve('deep');
test.deepEqual(globule.find([path.join(dir, '**/deep*.txt')], {srcBase: dir, prefixBase: true}),
[
path.join(dir, 'deep.txt'),
path.join(dir, 'deeper/deeper.txt'),
path.join(dir, 'deeper/deepest/deepest.txt')
],
'should not prefix srcBase to absolute paths.');
test.done();
},
'options.nonull': function(test) {
Expand Down