Ensure that clone is loaded and normalize works

tbranyen · tbranyen · commit c313718b86d2 · 2014-10-23T10:47:33.000-04:00
diff --git a/lib/clone.js b/lib/clone.js
@@ -13,8 +13,7 @@ var clone = Clone.clone;
  */
 Clone.clone = function(url, local_path, options) {
   options = normalizeOptions(options, NodeGit.CloneOptions);
-
-  return clone.apply(this, arguments);
+  return clone.call(this, url, local_path, options);
 };
 
 module.exports = Clone;
diff --git a/lib/nodegit.js b/lib/nodegit.js
@@ -41,6 +41,7 @@ exports.__proto__ = rawApi;
 // Import extensions
 require("./attr");
 require("./blob");
+require("./clone");
 require("./checkout");
 require("./commit");
 require("./diff");
diff --git a/lib/util/normalize_options.js b/lib/util/normalize_options.js
@@ -8,7 +8,7 @@ function normalizeOptions(options, Ctor) {
   var instance = new Ctor();
 
   if (!options) {
-    return instance;
+    return null;
   }
 
   Object.keys(options).forEach(function(key) {
diff --git a/test/tests/clone.js b/test/tests/clone.js
@@ -13,7 +13,6 @@ describe("Clone", function() {
 
   var Repository = require("../../lib/repository");
   var Clone = require("../../lib/clone");
-  var NodeGit = require("../../");
 
   before(function() {
     return Promise.all([
@@ -27,9 +26,7 @@ describe("Clone", function() {
 
   it("can clone with http", function() {
     var url = "http://github.com/nodegit/test.git";
-    var opts = new NodeGit.CloneOptions();
-
-    opts.ignoreCertErrors = 1;
+    var opts = { ignoreCertErrors: 1 };
 
     return Clone.clone(url, http, opts).then(function(repository) {
       assert.ok(repository instanceof Repository);
@@ -38,9 +35,7 @@ describe("Clone", function() {
 
   it("can clone with https", function() {
     var url = "https://github.com/nodegit/test.git";
-    var opts = new NodeGit.CloneOptions();
-
-    opts.ignoreCertErrors = 1;
+    var opts = { ignoreCertErrors: 1 };
 
     return Clone.clone(url, https, opts).then(function(repository) {
       assert.ok(repository instanceof Repository);
@@ -49,9 +44,7 @@ describe("Clone", function() {
 
   it("can clone with ssh", function() {
     var url = "git@github.com:nodegit/test.git";
-    var opts = new NodeGit.CloneOptions();
-
-    opts.ignoreCertErrors = 1;
+    var opts = { ignoreCertErrors: 1 };
 
     return Clone.clone(url, ssh, opts).then(function(repository) {
       assert.ok(repository instanceof Repository);
@@ -60,9 +53,7 @@ describe("Clone", function() {
 
   it("can clone with git", function() {
     var url = "git://github.com/nodegit/test.git";
-    var opts = new NodeGit.CloneOptions();
-
-    opts.ignoreCertErrors = 1;
+    var opts = { ignoreCertErrors: 1 };
 
     return Clone.clone(url, git, opts).then(function(repository) {
       assert.ok(repository instanceof Repository);
@@ -72,7 +63,7 @@ describe("Clone", function() {
   it("can clone with filesystem", function() {
     var url = "file://" + path.resolve("test/repos/empty");
 
-    return Clone.clone(url, file, null).then(function(repository) {
+    return Clone.clone(url, file).then(function(repository) {
       assert.ok(repository instanceof Repository);
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ function normalizeOptions(options, Ctor) {`
`8`	`8`	`var instance = new Ctor();`
`9`	`9`
`10`	`10`	`if (!options) {`
`11`		`- return instance;`
	`11`	`+ return null;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`Object.keys(options).forEach(function(key) {`