Use a local bare repo for pushTransferProgress test

mitchheddles · mitchheddles · commit 8d62a0f7727f · 2018-05-23T18:14:42.000+10:00
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -5,13 +5,15 @@ var _ = require("lodash");
 var fp = require("lodash/fp");
 
 var garbageCollect = require("../utils/garbage_collect.js");
+var RepoUtils = require("../utils/repository_setup");
 
 describe("Remote", function() {
   var NodeGit = require("../../");
   var Repository = NodeGit.Repository;
   var Remote = NodeGit.Remote;
 
   var reposPath = local("../repos/workdir");
+  var bareReposPath = local("../repos/bare");
   var url = "https://github.com/nodegit/test";
   var url2 = "https://github.com/nodegit/test2";
   var privateUrl = "git@github.com:nodegit/private";
@@ -133,34 +135,33 @@ describe("Remote", function() {
     var repo = this.repository;
     var wasCalled = false;
 
-    // NOTE: This doesn't work, the credentials callback fails.
-    // Did manage to get it working by setting up a local bare repo and pushing to it.
-
-    return Remote.create(repo, "test2", url2)
-      .then(function(remote) {
-        var fetchOpts = {
-          callbacks: {
-            credentials: function(url, userName) {
-              return NodeGit.Cred.sshKeyFromAgent(userName);
-            },
-            certificateCheck: function() {
-              return 1;
-            },
-            pushTransferProgress: function() {
-              wasCalled = true;
-            }
-          }
-        };
-
-        var ref = "refs/heads/master";
-        var refs = [ref + ":" + ref];
-        return remote.push(refs, fetchOpts);
-      })
+    return RepoUtils.createRepository(bareReposPath, 1)
       .then(function() {
-        assert.ok(wasCalled);
+        return Remote.create(repo, "bare", bareReposPath)
+          .then(function(remote) {
+            var fetchOpts = {
+              callbacks: {
+                credentials: function(url, userName) {
+                  return 1;
+                },
+                certificateCheck: function() {
+                  return 1;
+                },
+                pushTransferProgress: function(a, b, c) {
+                  wasCalled = true;
+                }
+              }
+            };
 
-        return Remote.delete(repo, "test2");
-      });
+            var ref = "refs/heads/master";
+            var refs = [ref + ":" + ref];
+
+            return remote.push(refs, fetchOpts)
+            .then(function(res) {
+              assert.ok(wasCalled);
+            });
+          });
+        });
   });
 
   it("can monitor transfer progress while downloading", function() {
diff --git a/test/utils/repository_setup.js b/test/utils/repository_setup.js
@@ -49,14 +49,15 @@ var RepositorySetup = {
 	},
 
 	createRepository:
-	function createRepository(repoPath){
+	function createRepository(repoPath, isBare){
 		// Create a new repository in a clean directory
 		return fse.remove(repoPath)
 		.then(function() {
 			return fse.ensureDir(repoPath);
 		})
 		.then(function() {
-			return NodeGit.Repository.init(repoPath, 0);
+			var bare = typeof isBare !== "undefined" ? isBare : 0;
+			return NodeGit.Repository.init(repoPath, bare);
 		});
 	},
 
