Finish updating tests for TreeEntry

tbranyen · tbranyen · commit 6b727d77b85f · 2014-07-11T15:06:03.000-04:00
diff --git a/lib/tree_entry.js b/lib/tree_entry.js
@@ -66,15 +66,17 @@ TreeEntry.prototype.sha = function() {
  * @return {Tree}
  */
 TreeEntry.prototype.getTree = function(callback) {
-  var self = this;
-  this.parent.repo.getTree(this.oid(), function(error, tree) {
-    if (error) {
-      return callback(error);
+  var entry = this;
+
+  return this.parent.repo.getTree(this.oid()).then(function(tree) {
+    tree.entry = entry;
+
+    if (callback) {
+      callback(null, tree);
     }
 
-    tree.entry = self;
-    callback(null, tree);
-  });
+    return tree;
+  }, callback);
 };
 
 /**
diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -21,8 +21,8 @@ describe("Commit", function() {
   });
 
   it("will fail with an invalid sha", function() {
-    return this.repository.getCommit("invalid").then(null, function(error) {
-      assert.ok(error instanceof Error);
+    return this.repository.getCommit("invalid").then(null, function(err) {
+      assert.ok(err instanceof Error);
     });
   });
 
@@ -99,7 +99,7 @@ describe("Commit", function() {
       done();
     });
     
-    history.on("error", function(error) {
+    history.on("error", function(err) {
       assert.ok(false);
     });
     
@@ -134,22 +134,22 @@ describe("Commit", function() {
     var expectedCommitTreeEntryCount = 198;
 
     this.commit.getTree().then(function(tree) {
-      var walk = tree.walk();
+      var treeWalker = tree.walk();
 
-      walk.on("entry", function(entry) {
+      treeWalker.on("entry", function(entry) {
         commitTreeEntryCount++;
       });
 
-      walk.on("error", function() {
+      treeWalker.on("error", function() {
         assert.ok(false);
       });
       
-      walk.on("end", function(error, entries) {
+      treeWalker.on("end", function(entries) {
         assert.equal(commitTreeEntryCount, expectedCommitTreeEntryCount);
         done();
       });
 
-      walk.start();
+      treeWalker.start();
     });
   });
 
diff --git a/test/tests/tree_entry.js b/test/tests/tree_entry.js
@@ -0,0 +1,79 @@
+var assert = require("assert");
+var path = require("path");
+
+describe("TreeEntry", function() {
+  var reposPath = path.resolve("test/repos/workdir/.git");
+  var oid = "5716e9757886eaf38d51c86b192258c960d9cfea";
+
+  var Repository = require("../../lib/repository");
+  var Tree = require("../../lib/tree");
+
+  beforeEach(function() {
+    var test = this;
+
+    return Repository.open(reposPath).then(function(repository) {
+      test.repository = repository;
+
+      return repository.getCommit(oid).then(function(commit) {
+        test.commit = commit;
+      });
+    });
+  });
+
+  it("will fail on a missing file", function() {
+    return this.commit.getEntry("test/-entry.js").then(null, function(err) {
+      assert.ok(err instanceof Error);
+    });
+  });
+
+  it("provides the correct sha for a file", function() {
+    return this.commit.getEntry("README.md").then(function(entry) {
+      var sha = entry.sha();
+
+      assert.equal(sha, "6cb45ba5d32532bf0d1310dc31ca4f20f59964bc");
+    });
+  });
+
+  it("provides the filename", function() {
+    return this.commit.getEntry("test/raw-commit.js").then(function(entry) {
+      var name = entry.name();
+
+      assert.equal(name, "raw-commit.js");
+    });
+  });
+
+  it("provides the blob representation of the entry", function() {
+    return this.commit.getEntry("test/raw-commit.js").then(function(entry) {
+      return entry.getBlob().then(function(blob) {
+        var size = blob.rawsize();
+
+        assert.equal(size, 2736);
+      });
+    });
+  });
+
+  it("provides the tree the entry is part of", function() {
+    return this.commit.getEntry("test").then(function(entry) {
+      return entry.getTree().then(function(tree) {
+        assert.ok(tree instanceof Tree);
+      });
+    });
+  });
+
+  it("can determine if an entry is a file", function() {
+    return this.commit.getEntry("README.md").then(function(entry) {
+      var isFile = entry.isFile();
+
+      assert.equal(isFile, true);
+    });
+  });
+
+  it("can determine if an entry is a directory", function() {
+    return this.commit.getEntry("example").then(function(entry) {
+      var isFile = entry.isFile();
+
+      assert.equal(isFile, false);
+    });
+  });
+});
+
diff --git a/test/tree_entry.js b/test/tree_entry.js
