Made https test local. Updated deps.

Alex Ivashchenko · Alex Ivashchenko · commit afe1959ec711 · 2015-06-13T00:53:24.000-07:00
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Felix Geisendörfer <felix@debuggable.com> (http://debuggable.com/)",
   "name": "form-data",
   "description": "A module to create readable \"multipart/form-data\" streams.  Can be used to submit forms and file uploads to other web applications.",
-  "version": "1.0.0-rc0",
+  "version": "1.0.0-rc1",
   "repository": {
     "type": "git",
     "url": "git://github.com/felixge/node-form-data.git"
@@ -15,9 +15,9 @@
     "node": ">= 0.10"
   },
   "dependencies": {
-    "async": "~0.9.0",
-    "combined-stream": "~0.0.4",
-    "mime-types": "~2.0.3"
+    "async": "^1.2.1",
+    "combined-stream": "^1.0.3",
+    "mime-types": "^2.1.1"
   },
   "licenses": [
     {
@@ -26,9 +26,9 @@
     }
   ],
   "devDependencies": {
-    "fake": "~0.2.2",
-    "far": "~0.0.7",
-    "formidable": "~1.0.14",
-    "request": "~2.36.0"
+    "fake": "^0.2.2",
+    "far": "^0.0.7",
+    "formidable": "^1.0.17",
+    "request": "^2.57.0"
   }
 }
diff --git a/test/common.js b/test/common.js
@@ -14,3 +14,4 @@ common.fake = require('fake');
 common.port = 8432;
 
 common.staticPort = 9432;
+common.httpsPort = 9443;
diff --git a/test/fixture/cert.pem b/test/fixture/cert.pem
@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB5jCCAZACCQD/wXFVwpLS+jANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJV
+UzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVBhbG8gQWx0bzERMA8GA1UEChMIRm9y
+bURhdGExFDASBgNVBAMTC0FsZXggSW5kaWdvMSEwHwYJKoZIhvcNAQkBFhJpYW1A
+YWxleGluZGlnby5jb20wHhcNMTUwNjEzMDcxNTQ3WhcNNDIxMDI4MDcxNTQ3WjB6
+MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVBhbG8gQWx0bzER
+MA8GA1UEChMIRm9ybURhdGExFDASBgNVBAMTC0FsZXggSW5kaWdvMSEwHwYJKoZI
+hvcNAQkBFhJpYW1AYWxleGluZGlnby5jb20wXDANBgkqhkiG9w0BAQEFAANLADBI
+AkEAswvOBQq8RWt3sOR4z4ak/3mkwaoVSzqiFF2DNXQpVSGyV9kgguotXkmLaI2c
+J7qAeVkDlRerDZVQafGazw6djwIDAQABMA0GCSqGSIb3DQEBBQUAA0EAGlVyp9sJ
+uV3Axo4FNkGN4BVFMfPShJzvvPZZ7BwNOIwdK5lS6Ah7YgkjnEhc7IwuqHQqzngs
+UwyLalyXFRhIbw==
+-----END CERTIFICATE-----
diff --git a/test/fixture/key.pem b/test/fixture/key.pem
@@ -0,0 +1,9 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIBOQIBAAJBALMLzgUKvEVrd7DkeM+GpP95pMGqFUs6ohRdgzV0KVUhslfZIILq
+LV5Ji2iNnCe6gHlZA5UXqw2VUGnxms8OnY8CAwEAAQJAYf2n96J0gBndG/cvF4U9
+cIUG4udPWCjy4+p6ERtOM8Se8zlez4bv+FSO5nRkVBIsuM/hlYeWNi1itqqqbFkq
+YQIhAN3vq+tuknOtgt7heQbaY/coMPfdI08eyfE3DsTveRz1AiEAzobkpkU00DiU
+mrEGLLHexGRzioYSI0AMUJTMuwtS/fMCIHi5A3p4Vh+odXTJjyzkJNZvvVtGpgtG
+wzB784O6g9X1AiAeUzJJs8nAdT5kxG+KqodyQOmyQmNxZ5snTeIN6OjDvwIgVBaJ
+FoVTTx4YEg9JOIKkE4qL/V4bPpqSDU+720lKWSw=
+-----END RSA PRIVATE KEY-----
diff --git a/test/integration/test-submit-https.js b/test/integration/test-submit-https.js
@@ -1,45 +1,34 @@
 var common = require('../common');
 var assert = common.assert;
 var FormData = require(common.dir.lib + '/form_data');
-var correctSocket = 'npmjs.org:443';
 
 // testing default https port
 
 // check params as string
-testRequest('https://npmjs.org/');
+testRequest('https://localhost:'+common.httpsPort+'/');
 
 // check params as object
-testRequest({protocol: 'https:', hostname: 'npmjs.org', pathname: '/'});
+testRequest({protocol: 'https:', hostname: 'localhost', port: common.httpsPort, pathname: '/'});
 
 // --- Santa's little helpers
 
 function testRequest(params)
 {
   var form;
-  var request;
-  var sockets;
 
   form = new FormData();
 
-  // break getLength – prevent submit() from actually submitting
-  form.getLength = function(){};
+  form.submit(params, function(err, res)
+  {
+    if (err) {
+      throw err;
+    }
 
-  request = form.submit(params);
+    assert.strictEqual(res.statusCode, 200);
+    assert.strictEqual(res.headers['x-success'], 'OK');
 
-  sockets = Object.keys(request.agent.sockets);
-
-  assert.equal(sockets.length, 1);
-
-  // in 0.10 it's "nodomain:443"
-  // in 0.11 it's "nodomain:443::::::::"
-  assert.equal(correctSocket, sockets[0].substr(0, correctSocket.length));
-
-  // stop here
-  request.abort();
-
-  request.on('error', function(err){
-    assert.equal(err.code, 'ECONNRESET');
+    // unstuck new streams
+    res.resume();
   });
 
-  return request;
 }
diff --git a/test/run.js b/test/run.js
@@ -11,7 +11,7 @@ far.add(__dirname);
 far.include(/test-.*\.js$/);
 
 // start static server for all tests
-static(function(staticServer)
+static(function()
 {
   far.execute();
 });
diff --git a/test/static.js b/test/static.js
@@ -1,12 +1,23 @@
 // serves static files
 var http = require('http');
+var https = require('https');
 var fs = require('fs');
 var path = require('path');
 var mime = require('mime-types');
 var common = require('./common');
 
+// make it work with self-signed
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0;
+
+var httpsOptions = {
+  key: fs.readFileSync(path.join(__dirname, './fixture/key.pem')),
+  cert: fs.readFileSync(path.join(__dirname, './fixture/cert.pem'))
+};
+
 module.exports = function(callback) {
-  var server = http.createServer(function(req, res) {
+
+  // create http server
+  var httpServer = http.createServer(function(req, res) {
 
     var target = path.join(common.dir.fixture, req.url);
     var stat = fs.statSync(target);
@@ -18,5 +29,13 @@ module.exports = function(callback) {
 
     fs.createReadStream(target).pipe(res);
   });
-  server.listen(common.staticPort, callback.bind(undefined, server));
+
+  // create https server
+  var httpsServer = https.createServer(httpsOptions, function(req, res) {
+    res.writeHead(200, {'x-success': 'OK'});
+    res.end('Great Success');
+  });
+
+  // dirty&simple
+  httpServer.listen(common.staticPort, httpsServer.listen.bind(httpsServer, common.httpsPort, callback.bind(undefined, httpServer, httpsServer)));
 };
diff --git a/test/tmp/.empty b/test/tmp/.empty

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@ common.fake = require('fake');`
`14`	`14`	`common.port = 8432;`
`15`	`15`
`16`	`16`	`common.staticPort = 9432;`
	`17`	`+common.httpsPort = 9443;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ far.add(__dirname);`
`11`	`11`	`far.include(/test-.*\.js$/);`
`12`	`12`
`13`	`13`	`// start static server for all tests`
`14`		`-static(function(staticServer)`
	`14`	`+static(function()`
`15`	`15`	`{`
`16`	`16`	`far.execute();`
`17`	`17`	`});`