Fixed remote tests

John Haley · John Haley · commit de6772e5cd75 · 2015-02-14T08:43:19.000-07:00
diff --git a/lib/remote.js b/lib/remote.js
@@ -5,12 +5,6 @@ var lookupWrapper = require("./util/lookupWrapper");
 var Remote = NodeGit.Remote;
 var setCallbacks = Remote.prototype.setCallbacks;
 
-Remote.prototype.setCallbacks = function(callbacks) {
-  callbacks = normalizeOptions(callbacks, NodeGit.RemoteCallbacks);
-
-  return setCallbacks.call(this, callbacks);
-};
-
 /**
  * Retrieves the remote by name
  * @param {Repository} repo The repo that the remote lives in
@@ -20,4 +14,10 @@ Remote.prototype.setCallbacks = function(callbacks) {
  */
 Remote.lookup = lookupWrapper(Remote);
 
+Remote.prototype.setCallbacks = function(callbacks) {
+  callbacks = normalizeOptions(callbacks, NodeGit.RemoteCallbacks);
+
+  return setCallbacks.call(this, callbacks);
+};
+
 module.exports = Remote;
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -83,12 +83,8 @@ describe("Remote", function() {
     var repository = this.repository;
 
     return Remote.create(repository, "origin3", url)
-      .then(function() {
-        })
       .then(function(remote) {
-        remote.delete();
-      })
-      .then(function() {
+        Remote.delete(repository, "origin3");
         return Remote.lookup(repository, "origin3");
       })
       .then(Promise.reject, Promise.resolve);
@@ -132,8 +128,11 @@ describe("Remote", function() {
     return this.repository.fetchAll({
       credentials: function(url, userName) {
         return NodeGit.Cred.sshKeyFromAgent(userName);
+      },
+      certificateCheck: function() {
+        return 1;
       }
-    }, true);
+    });
   });
 
 });
