Converted to beforeEach for all tests

tbranyen · tbranyen · commit 342b6e68d046 · 2015-02-25T19:20:14.000-05:00
Added a new `beforeEach` to ensure repositories are cleaned in clone,
not sure why this is required.
diff --git a/test/tests/attr.js b/test/tests/attr.js
@@ -9,7 +9,7 @@ describe("Attr", function() {
 
   var reposPath = local("../repos/workdir/.git");
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath)
diff --git a/test/tests/blob.js b/test/tests/blob.js
@@ -10,7 +10,7 @@ describe("Blob", function() {
   var reposPath = local("../repos/workdir/.git");
   var oid = "111dd657329797f6165f52f5085f61ac976dcf04";
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath)
diff --git a/test/tests/branch.js b/test/tests/branch.js
@@ -11,24 +11,18 @@ describe("Branch", function() {
 
   var reposPath = local("../repos/workdir/.git");
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath)
       .then(function(repository) {
         test.repository = repository;
-      });
-  });
-
-  beforeEach(function() {
-    var test = this;
-    var repo = test.repository;
-
-    return repo.getMasterCommit()
+        return repository.getMasterCommit();
+      })
       .then(function(masterCommit) {
         test.masterCommit = masterCommit;
 
-        return repo.createBranch(branchName, masterCommit, true);
+        return test.repository.createBranch(branchName, masterCommit, true);
       })
       .then(function(branch) {
         test.branch = branch;
diff --git a/test/tests/checkout.js b/test/tests/checkout.js
@@ -9,7 +9,7 @@ describe("Checkout", function() {
   var packageJsonOid = "0fa56e90e096a4c24c785206b826ab914ea3de1e";
   var reposPath = local("../repos/workdir/.git");
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath)
diff --git a/test/tests/clone.js b/test/tests/clone.js
@@ -17,6 +17,21 @@ describe("Clone", function() {
   // Set a reasonable timeout here now that our repository has grown.
   this.timeout(30000);
 
+  beforeEach(function(done) {
+    // In Windows if you do not clean up the repository, there may become a
+    // conflict with file locking.
+    if (this.repository && process.platform === "win32") {
+      this.repository.stateCleanup();
+      this.repository.free();
+      delete this.repository;
+    }
+
+    process.nextTick(function() {
+      global.gc();
+      done();
+    });
+  });
+
   beforeEach(function() {
     return fse.remove(clonePath).catch(function(err) {
       console.log(err);
diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -24,7 +24,7 @@ describe("Commit", function() {
       });
   }
 
-  before(function() {
+  beforeEach(function() {
     return reinitialize(this);
   });
 
diff --git a/test/tests/diff.js b/test/tests/diff.js
@@ -14,7 +14,7 @@ describe("Diff", function() {
   var diffFilename = "wddiff.txt";
   var diffFilepath = local("../repos/workdir", diffFilename);
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath).then(function(repository) {
diff --git a/test/tests/index.js b/test/tests/index.js
@@ -14,7 +14,7 @@ describe("Index", function() {
 
   var reposPath = local("../repos/workdir/.git");
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath)
diff --git a/test/tests/odb.js b/test/tests/odb.js
@@ -9,7 +9,7 @@ describe("Odb", function() {
 
   var reposPath = local("../repos/workdir/.git");
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath).then(function(repo) {
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -19,7 +19,7 @@ describe("Remote", function() {
     Remote.delete(repository, "test2");
   }
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath)
diff --git a/test/tests/repository.js b/test/tests/repository.js
@@ -13,7 +13,7 @@ describe("Repository", function() {
   var Index = require(local("../../lib/index"));
   var Signature = require(local("../../lib/signature"));
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath)
diff --git a/test/tests/reset.js b/test/tests/reset.js
@@ -13,7 +13,7 @@ describe("Reset", function() {
   var previousCommitOid = "c82fb078a192ea221c9f1093c64321c60d64aa0d";
   var filePath = "package.json";
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath)
diff --git a/test/tests/revwalk.js b/test/tests/revwalk.js
@@ -12,7 +12,7 @@ describe("Revwalk", function() {
   // Set a reasonable timeout here now that our repository has grown.
   this.timeout(60000);
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
     return Repository.open(reposPath)
       .then(function(repository) {
@@ -152,7 +152,7 @@ describe("Revwalk", function() {
       }
     }
     return promise;
-    
+
     function getNext() {
       return walker.next();
     }
diff --git a/test/tests/tag.js b/test/tests/tag.js
@@ -26,31 +26,31 @@ describe("Tag", function() {
     assert.equal(target.id().toString(), commitPointedTo);
   }
 
-  before(function() {
+  beforeEach(function() {
     var test = this;
 
     return Repository.open(reposPath)
       .then(function(repo) {
-        test.repo = repo;
+        test.repository = repo;
       });
   });
 
   it("can get a tag from a repo via the tag name", function() {
-    return this.repo.getTagByName(tagName)
+    return this.repository.getTagByName(tagName)
       .then(function(tag) {
         testTag(tag);
       });
   });
 
   it("can get a tag from a repo via the long tag name", function() {
-    return this.repo.getTagByName(tagFullName)
+    return this.repository.getTagByName(tagFullName)
       .then(function(tag) {
         testTag(tag);
       });
   });
 
   it("can get a tag from a repo via the tag's OID as a string", function() {
-    return this.repo.getTag(tagOid)
+    return this.repository.getTag(tagOid)
       .then(function(tag) {
         testTag(tag);
       });
@@ -59,14 +59,14 @@ describe("Tag", function() {
   it("can get a tag from a repo via the tag's OID object", function() {
     var oid = Oid.fromString(tagOid);
 
-    return this.repo.getTag(oid)
+    return this.repository.getTag(oid)
       .then(function(tag) {
         testTag(tag);
       });
   });
 
   it("can list tags in a repo", function() {
-    return Tag.list(this.repo)
+    return Tag.list(this.repository)
       .then(function(tagNames) {
         tagNames = tagNames.filter(function(tagNameTest) {
           return tagNameTest == tagName;

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ describe("Commit", function() {`
`24`	`24`	`});`
`25`	`25`	`}`
`26`	`26`
`27`		`- before(function() {`
	`27`	`+ beforeEach(function() {`
`28`	`28`	`return reinitialize(this);`
`29`	`29`	`});`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ describe("Remote", function() {`
`19`	`19`	`Remote.delete(repository, "test2");`
`20`	`20`	`}`
`21`	`21`
`22`		`- before(function() {`
	`22`	`+ beforeEach(function() {`
`23`	`23`	`var test = this;`
`24`	`24`
`25`	`25`	`return Repository.open(reposPath)`