code duplicates removed

form-data · Sep 30, 2016 · e9239fb · e9239fb
1 parent 4718dae
commit e9239fb
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 38 deletions.
diff --git a/test/common.js b/test/common.js
@@ -3,6 +3,7 @@ var path = require('path');
 var assert = require('assert');
 var fake = require('fake');
 var mime = require('mime-types');
+var http = require('http');
 
 var common = module.exports;
 
@@ -27,6 +28,21 @@ common.httpsPort = 9443;
 common.httpsServerKey = fs.readFileSync(path.join(__dirname, './fixture/key.pem'));
 common.httpsServerCert = fs.readFileSync(path.join(__dirname, './fixture/cert.pem'));
 
+common.createServer = function (form, FIELDS, callback) {
+  return http.createServer(function (req, res) {
+
+    form.parse(req);
+
+    var fieldsPassed = Object.keys(FIELDS).length;
+    common.actions.checkForm(form, FIELDS, function (fieldsChecked) {
+      // keep track of number of the processed fields
+      callback(fieldsPassed - fieldsChecked);
+      // finish it
+      common.actions.formOnEnd(res);
+    });
+  });
+};
+
 // Actions
 
 common.actions = {};

diff --git a/test/integration/test-http-response.js b/test/integration/test-http-response.js
@@ -51,22 +51,14 @@ http.request(options, function(response) {
 }).end();
 
 // prepare form-receiving http server
-server = http.createServer(function(req, res) {
+var incomingForm = new IncomingForm({uploadDir: common.dir.tmp});
 
-  var form = new IncomingForm({uploadDir: common.dir.tmp});
-
-  form.parse(req);
-
-  common.actions.checkForm(form, FIELDS, function(fieldsChecked)
-  {
-    // keep track of number of the processed fields
-    fieldsPassed = fieldsPassed - fieldsChecked;
-    // finish it
-    common.actions.formOnEnd(res);
-  });
+server = common.createServer(incomingForm, FIELDS, function(fields){
+  fieldsPassed = fields;
 });
 
 
+
 process.on('exit', function() {
   assert.strictEqual(fieldsPassed, 0);
 });
diff --git a/test/integration/test-submit-custom.js b/test/integration/test-submit-custom.js
@@ -1,6 +1,5 @@
 var common = require('../common');
 var assert = common.assert;
-var http = require('http');
 var mime = require('mime-types');
 var request = require('request');
 var fs = require('fs');
@@ -30,19 +29,10 @@ var FIELDS = {
 };
 var fieldsPassed = Object.keys(FIELDS).length;
 
-var server = http.createServer(function(req, res) {
+var incomingForm = new IncomingForm({uploadDir: common.dir.tmp});
 
-  var form = new IncomingForm({uploadDir: common.dir.tmp});
-
-  form.parse(req);
-
-  common.actions.checkForm(form, FIELDS, function(fieldsChecked)
-  {
-    // keep track of number of the processed fields
-    fieldsPassed = fieldsPassed - fieldsChecked;
-    // finish it
-    common.actions.formOnEnd(res);
-  });
+var server = common.createServer(incomingForm, FIELDS, function(fields){
+  fieldsPassed = fields;
 });
 
 server.listen(common.port, function() {

diff --git a/test/integration/test-submit.js b/test/integration/test-submit.js
@@ -1,6 +1,5 @@
 var common = require('../common');
 var assert = common.assert;
-var http = require('http');
 var mime = require('mime-types');
 var request = require('request');
 var fs = require('fs');
@@ -30,21 +29,13 @@ var FIELDS = {
 };
 var fieldsPassed = Object.keys(FIELDS).length;
 
-var server = http.createServer(function(req, res) {
+var incomingForm = new IncomingForm({uploadDir: common.dir.tmp});
 
-  var form = new IncomingForm({uploadDir: common.dir.tmp});
-
-  form.parse(req);
-
-  common.actions.checkForm(form, FIELDS, function(fieldsChecked)
-  {
-    // keep track of number of the processed fields
-    fieldsPassed = fieldsPassed - fieldsChecked;
-    // finish it
-    common.actions.formOnEnd(res);
-  });
+var server = common.createServer(incomingForm, FIELDS, function(fields){
+  fieldsPassed = fields;
 });
 
+
 server.listen(common.port, function() {
 
   var form = new FormData();