convenience methods for normalizing opts

jdgarcia · jdgarcia · commit ab50c82b85e2 · 2015-05-14T16:27:46.000-07:00
diff --git a/lib/rebase.js b/lib/rebase.js
@@ -0,0 +1,23 @@
+var NodeGit = require("../");
+var Rebase = NodeGit.Rebase;
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
+
+// Override Rebase.prototype.finish to normalize opts
+var finish = Rebase.prototype.finish;
+Rebase.prototype.finish = function(signature, opts) {
+  opts = normalizeOptions(opts || {}, NodeGit.RebaseOptions);
+  return finish.call(this, signature, opts);
+};
+
+// Override Rebase.prototype.next to normalize opts and provide good defaults
+var next = Rebase.prototype.next;
+Rebase.prototype.next = function(checkoutOpts) {
+  if (!checkoutOpts) {
+    checkoutOpts = {
+      checkoutStrategy: NodeGit.Checkout.STRATEGY.SAFE_CREATE
+    };
+  }
+
+  checkoutOpts = normalizeOptions(checkoutOpts, NodeGit.CheckoutOptions);
+  return next.call(this, checkoutOpts);
+};
diff --git a/test/tests/rebase.js b/test/tests/rebase.js
@@ -314,7 +314,7 @@ describe("Rebase", function() {
         // should be 0.
         assert.equal(rebase.operationCurrent(), 0);
 
-        return rebase.finish(ourSignature, new NodeGit.RebaseOptions());
+        return rebase.finish(ourSignature, {});
       })
       .then(function(result) {
         assert.equal(result, 0);
@@ -468,10 +468,7 @@ describe("Rebase", function() {
         // there should only be 1 rebase operation to perform
         assert.equal(rebase.operationEntrycount(), 1);
 
-        var opts = new NodeGit.CheckoutOptions();
-        opts.checkoutStrategy = NodeGit.Checkout.STRATEGY.SAFE_CREATE;
-
-        return rebase.next(opts);
+        return rebase.next();
       })
       .then(function(rebaseOperation) {
         assert.equal(rebaseOperation.type(),
@@ -508,7 +505,7 @@ describe("Rebase", function() {
         assert.equal(commitOid.toString(),
           "ef6d0e95167435b3d58f51ab165948c72f6f94b6");
 
-        return rebase.finish(ourSignature, new NodeGit.RebaseOptions());
+        return rebase.finish(ourSignature);
       })
       .then(function(result) {
         assert.equal(result, 0);
@@ -660,10 +657,7 @@ describe("Rebase", function() {
         // there should only be 1 rebase operation to perform
         assert.equal(rebase.operationEntrycount(), 1);
 
-        var opts = new NodeGit.CheckoutOptions();
-        opts.checkoutStrategy = NodeGit.Checkout.STRATEGY.SAFE_CREATE;
-
-        return rebase.next(opts);
+        return rebase.next();
       })
       .then(function(rebaseOperation) {
         assert.equal(rebaseOperation.type(),
