Merge pull request #401 from Schoonology/master

Resolve destinationRoot in prepCopy.
yeoman · Nov 14, 2013 · 41ffd6f · 41ffd6f
2 parents 97a7fbf + d8f76b2
commit 41ffd6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/actions/actions.js b/lib/actions/actions.js
@@ -43,6 +43,7 @@ function prepCopy(source, destination, process) {
   }
 
   source = this.isPathAbsolute(source) ? source : path.join(this.sourceRoot(), source);
+  destination = this.isPathAbsolute(destination) ? destination : path.join(this.destinationRoot(), destination);
 
   var encoding = null;
   var binary = isBinaryFile(source);

diff --git a/test/actions.js b/test/actions.js
@@ -77,13 +77,22 @@ describe('yeoman.generators.Base', function () {
 
         return contents;
       });
+
+      var oldDestRoot = this.dummy.destinationRoot();
+      this.dummy.destinationRoot('write/to');
+      this.dummy.copy('foo.js', 'foo-destRoot.js');
+      this.dummy.destinationRoot(oldDestRoot);
       this.dummy.conflicter.resolve(done);
     });
 
     it('should copy source files relative to the "sourceRoot" value', function (done) {
       fs.stat('write/to/foo.js', done);
     });
 
+    it('should copy to destination files relative to the "destinationRoot" value', function (done) {
+      fs.stat('write/to/foo-destRoot.js', done);
+    });
+
     it('should allow absolute path, and prevent the relative paths join', function (done) {
       fs.stat('write/to/bar.js', done);
     });