fix and add tests

maxkorp · maxkorp · commit f0bebe4490d1 · 2014-12-04T13:04:30.000-07:00
diff --git a/test/tests/merge.js b/test/tests/merge.js
@@ -213,7 +213,10 @@ describe("Merge", function() {
       });
     })
     .then(function() {
-      return repository.mergeBranches(ourBranchName, theirBranchName);
+      return repository.mergeBranches(
+        ourBranchName,
+        theirBranchName,
+        ourSignature);
     })
     .then(function(oid) {
       assert.equal(oid.toString(),
diff --git a/test/tests/repository.js b/test/tests/repository.js
@@ -7,6 +7,7 @@ describe("Repository", function() {
 
   var Repository = require("../../lib/repository");
   var Index = require("../../lib/index");
+  var Signature = require("../../lib/signature");
 
   before(function() {
     var test = this;
@@ -58,4 +59,10 @@ describe("Repository", function() {
       assert.equal(branch.shorthand(), "master");
     });
   });
+
+  it("can get the default signature", function() {
+    var sig = this.repository.defaultSignature();
+
+    assert(sig instanceof Signature);
+  });
 });
