Change to a single clone path

tbranyen · tbranyen · commit 0e93e48639ec · 2015-02-24T17:32:51.000-08:00
diff --git a/test/tests/clone.js b/test/tests/clone.js
@@ -9,11 +9,7 @@ describe("Clone", function() {
   var Clone = require(local("../../lib/clone"));
   var NodeGit = require(local("../../"));
 
-  var http = local("../repos/http");
-  var https = local("../repos/https");
-  var ssh = local("../repos/ssh");
-  var git = local("../repos/git");
-  var file = local("../repos/file");
+  var clonePath = local("../repos/clone");
 
   var sshPublicKey = local("../id_rsa.pub");
   var sshPrivateKey = local("../id_rsa");
@@ -22,18 +18,23 @@ describe("Clone", function() {
   this.timeout(30000);
 
   beforeEach(function() {
-    return NodeGit.Promise.all([
-      fse.remove(http),
-      fse.remove(https),
-      fse.remove(ssh),
-      fse.remove(git),
-      fse.remove(file)
-    ]).catch(function unhandledFunction(ex) {
-      console.log(ex.message);
+    return fse.remove(clonePath);
+  });
+
+  afterEach(function(done) {
+    if (this.repository) {
+      this.repository.free();
+      delete this.repository;
+    }
+
+    process.nextTick(function() {
+      gc();
+      done();
     });
   });
 
   it.skip("can clone with http", function() {
+    var test = this;
     var url = "http://github.com/nodegit/test.git";
     var opts = {
       remoteCallbacks: {
@@ -43,13 +44,14 @@ describe("Clone", function() {
       }
     };
 
-    return Clone.clone(url, http, opts).then(function(repo) {
+    return Clone.clone(url, clonePath, opts).then(function(repo) {
       assert.ok(repo instanceof Repository);
-      repo.free();
+      test.repository = repo;
     });
   });
 
   it("can clone with https", function() {
+    var test = this;
     var url = "https://github.com/nodegit/test.git";
     var opts = {
       remoteCallbacks: {
@@ -59,14 +61,14 @@ describe("Clone", function() {
       }
     };
 
-    return Clone.clone(url, https, opts).then(function(repo) {
+    return Clone.clone(url, clonePath, opts).then(function(repo) {
       assert.ok(repo instanceof Repository);
-      repo.stateCleanup();
-      repo.free();
+      test.repository = repo;
     });
   });
 
   it("can clone with ssh", function() {
+    var test = this;
     var url = "git@github.com:nodegit/test.git";
     var opts = {
       remoteCallbacks: {
@@ -79,14 +81,14 @@ describe("Clone", function() {
       }
     };
 
-    return Clone.clone(url, ssh, opts).then(function(repo) {
+    return Clone.clone(url, clonePath, opts).then(function(repo) {
       assert.ok(repo instanceof Repository);
-      repo.stateCleanup();
-      repo.free();
+      test.repository = repo;
     });
   });
 
   it("can clone with ssh while manually loading a key", function() {
+    var test = this;
     var url = "git@github.com:nodegit/test.git";
     var opts = {
       remoteCallbacks: {
@@ -103,10 +105,9 @@ describe("Clone", function() {
       }
     };
 
-    return Clone.clone(url, ssh, opts).then(function(repo) {
+    return Clone.clone(url, clonePath, opts).then(function(repo) {
       assert.ok(repo instanceof Repository);
-      repo.stateCleanup();
-      repo.free();
+      test.repository = repo;
     });
   });
 
@@ -120,28 +121,26 @@ describe("Clone", function() {
       }
     };
 
-    return Clone.clone(url, git, opts).then(function(repo) {
+    return Clone.clone(url, clonePath, opts).then(function(repo) {
       assert.ok(repo instanceof Repository);
-      repo.stateCleanup();
-      repo.free();
     });
   });
 
   it("can clone with filesystem", function() {
+    var test = this;
     var prefix = process.platform === "win32" ? "" : "file://";
     var url = prefix + local("../repos/empty");
 
-    return Clone.clone(url, file).then(function(repo) {
+    return Clone.clone(url, clonePath).then(function(repo) {
       assert.ok(repo instanceof Repository);
-      repo.stateCleanup();
-      repo.free();
+      test.repository = repo;
     });
   });
 
   it("will not segfault when accessing a url without username", function() {
     var url = "https://github.com/nodegit/private";
 
-    return Clone.clone(url, git, {
+    return Clone.clone(url, clonePath, {
       remoteCallbacks: {
         certificateCheck: function() {
           return 1;
