Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/deployer.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ module.exports = function(args) {
const mapFn = function(dir) {
const opts = {};
const extendPath = pathFn.join(baseDir, dir);
const extendDist = pathFn.join(deployDir, dir);
const extendDist = pathFn.join(deployDir, pathFn.basename(dir));

if (typeof ignoreHidden === 'object') {
opts.ignoreHidden = ignoreHidden[dir];
Expand Down
24 changes: 24 additions & 0 deletions test/deployer.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,30 @@ describe('deployer', () => {
});
});

it('extend dirs - relative path', () => {
const extendDirInput = '../extendAsset';
const extendDir = pathFn.join(baseDir, extendDirInput);
const extendDirName = pathFn.basename(extendDir);

return fs.writeFile(pathFn.join(extendDir, 'extR.txt'), 'relative')
.then(() => {
return deployer({
repo: fakeRemote,
extend_dirs: extendDirInput,
silent: true
});
}).then(() => {
return validate();
}).then(() => {
const extTxtFile = pathFn.join(validateDir, extendDirName, 'extR.txt');

return fs.readFile(extTxtFile);
}).then(content => {
content.should.eql('relative');
return fs.rmdir(extendDir);
});
});

it('multi deployment', () => {
return deployer({
repo: {
Expand Down