Merge pull request #249 from vmosyaykin/master

alexindigo · web-flow · commit 9bfb102cc29e · 2017-06-26T09:57:27.000-07:00
Allow form.submit with url string param to use https
diff --git a/lib/form_data.js b/lib/form_data.js
@@ -394,7 +394,8 @@ FormData.prototype.submit = function(params, cb) {
     options = populate({
       port: params.port,
       path: params.pathname,
-      host: params.hostname
+      host: params.hostname,
+      protocol: params.protocol
     }, defaults);
 
   // use custom params
diff --git a/test/integration/test-submit-url-parsing.js b/test/integration/test-submit-url-parsing.js
@@ -0,0 +1,33 @@
+var http = require('http');
+var https = require('https');
+var common = require('../common');
+var assert = common.assert;
+var FormData = require(common.dir.lib + '/form_data');
+
+/**
+ * Test url parsing during submission
+ */
+
+var req;
+var form = new FormData();
+form.append('field', 'value');
+
+// Basic parsing
+req = form.submit('http://localhost/path', function() {});
+assert.strictEqual(req.path, '/path');
+assert.ok(req.agent instanceof http.Agent, 'req.agent instanceof http.Agent');
+assert.strictEqual(req.getHeader('Host'), 'localhost');
+req.abort();
+
+// Non-default port handling
+req = form.submit('http://localhost:' + common.port, function() {});
+assert.strictEqual(req.getHeader('Host'), 'localhost:' + common.port);
+req.abort();
+
+// HTTPS protocol handling
+req = form.submit('https://localhost/path', function() {});
+assert.ok(req.agent instanceof https.Agent, 'req.agent instanceof https.Agent');
+assert.strictEqual(req.getHeader('Host'), 'localhost');
+req.abort();
+
+
