Fixed tests and reimplemented missing functions on Repository

John Haley · John Haley · commit edf5bb2bd420 · 2014-12-05T10:42:55.000-07:00
diff --git a/lib/reference.js b/lib/reference.js
@@ -13,6 +13,15 @@ var Branch = NodeGit.Branch;
 */
 Reference.lookup = LookupWrapper(Reference);
 
+/**
+* Retrieves the reference by it's short name
+* @param {Repository} repo The repo that the reference lives in
+* @param {String|Reference} id The reference to lookup
+* @param {Function} callback
+* @return {Reference}
+*/
+Reference.dwim = LookupWrapper(Reference, Reference.dwim);
+
 /**
  * Returns true if this reference is valid
  * @return {Boolean}
diff --git a/lib/repository.js b/lib/repository.js
@@ -55,7 +55,8 @@ function(name, commit, force, signature, logMessage) {
 /**
  * Look up a refs's commit.
  *
- * @param {String|Ref} name Ref name, e.g. "master", "refs/heads/master" or Branch Ref
+ * @param {String|Ref} name Ref name, e.g. "master", "refs/heads/master"
+ *                          or Branch Ref
  * @param {Function} callback
  * @return {Commit}
  */
@@ -73,6 +74,30 @@ Repository.prototype.getReferenceCommit = function(name, callback) {
   }, callback);
 };
 
+/**
+* Look up a branch. Alias for `getReference`
+*
+* @param {String|Ref} name Ref name, e.g. "master", "refs/heads/master"
+*                          or Branch Ref
+* @param {Function} callback
+* @return {Ref}
+*/
+Repository.prototype.getBranch = function(name, callback) {
+  return this.getReference(name, callback);
+};
+
+/**
+* Look up a branch's most recent commit. Alias to `getReferenceCommit`
+*
+* @param {String|Ref} name Ref name, e.g. "master", "refs/heads/master"
+*                          or Branch Ref
+* @param {Function} callback
+* @return {Commit}
+*/
+Repository.prototype.getBranchCommit = function(name, callback) {
+  return this.getReferenceCommit(name, callback);
+};
+
 /**
  * Gets the branch that HEAD currently points to
  * Is an alias to head()
@@ -85,17 +110,15 @@ Repository.prototype.getCurrentBranch = function() {
 /**
  * Lookup the reference with the given name.
  *
- * @param {String} name
+ * @param {String|Ref} name Ref name, e.g. "master", "refs/heads/master"
+ *                          or Branch Ref
  * @param {Function} callback
  * @return {Reference}
  */
 Repository.prototype.getReference = function(name, callback) {
   var repository = this;
-  var lookup = name.indexOf("refs/") === 0
-    ? Reference.lookup(this, name)
-    : Reference.dwim(this, name);
 
-  return lookup.then(function(reference) {
+  return Reference.dwim(this, name).then(function(reference) {
     if (reference.isSymbolic()) {
       return reference.resolve(function (error, reference) {
         reference.repo = repository;
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -104,11 +104,10 @@ describe("Remote", function() {
   });
 
   it("can fetch from a remote", function() {
-    return this.repository.fetch("origin")
-    .then(function() {
-      assert(true);
-    }, function() {
-      assert(false);
+    return this.repository.fetch("origin", {
+      credentials: function(url, userName) {
+        return NodeGit.Cred.sshKeyFromAgent(userName);
+      }
     });
   });
 });
diff --git a/test/tests/repository.js b/test/tests/repository.js
@@ -49,8 +49,8 @@ describe("Repository", function() {
 
   it("can list remotes", function() {
     return this.repository.getRemotes().then(function(remotes) {
-      assert.equal(remotes.count(), 1);
-      assert.equal(remotes.strings(), "origin");
+      assert.equal(remotes.length, 1);
+      assert.equal(remotes[0], "origin");
     });
   });
 
