Skip to content

Fix for issue #591. TreeEntry.path() throws when TreeEntry came from Tree.entries() #592

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

Merged
tbranyen merged 3 commits into from
May 29, 2015
Merged

Fix for issue #591. TreeEntry.path() throws when TreeEntry came from Tree.entries() #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a85825e
Sometimes dirtoparent is not defined. Parent.path() is though so it …
May 29, 2015
697ba01
Fix issue #591 - error when calling path() on a TreeEntry that was ob…
May 29, 2015
2434c75
Remove bluebird.
May 29, 2015
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
3 changes: 2 additions & 1 deletion lib/tree_entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ TreeEntry.prototype.getBlob = function(callback) {
* @return {String}
*/
TreeEntry.prototype.path = function(callback) {
return path.join(this.parent.path(), this.dirtoparent, this.filename());
var dirtoparent = this.dirtoparent || "";
return path.join(this.parent.path(), dirtoparent, this.filename());
};

/**
Expand Down
28 changes: 28 additions & 0 deletions test/tests/tree_entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var assert = require("assert");
var Promise = require("nodegit-promise");
var path = require("path");
var local = path.join.bind(path, __dirname);

Expand Down Expand Up @@ -52,6 +53,33 @@ describe("TreeEntry", function() {
});
});

it("provides the full path when the entry came from a tree", function(done) {
var testTree = function(tree, _dir) {
var dir = _dir || "",
testPromises = [];
tree.entries().forEach(function(entry) {
var currentPath = path.join(dir, entry.filename());
if (entry.isTree()) {
testPromises.push(
entry.getTree().then(function (subtree) {
return testTree(subtree, currentPath);
})
);
} else {
assert.equal(entry.path(), currentPath);
}
});

return Promise.all(testPromises);
};

return this.commit.getTree()
.then(testTree)
.done(function() {
done();
});
});

it("provides the blob representation of the entry", function() {
return this.commit.getEntry("test/raw-commit.js")
.then(function(entry) {
Expand Down