Skip to content

Commit aa99246

Browse files
trierratrierra
committed
Changed according to requests
1 parent e9239fb commit aa99246

4 files changed

Lines changed: 24 additions & 20 deletions

File tree

‎test/common.js‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ var assert = require('assert');
44
var fake = require('fake');
55
var mime = require('mime-types');
66
var http = require('http');
7+
var IncomingForm = require('formidable').IncomingForm;
78

89
var common = module.exports;
910

@@ -14,7 +15,9 @@ common.dir = {
1415
tmp: path.join(rootDir, '/test/tmp')
1516
};
1617

17-
common.defaultTypeValue = function() { return new Buffer([1, 2, 3]); };
18+
common.defaultTypeValue = function () {
19+
return new Buffer([1, 2, 3]);
20+
};
1821

1922
common.assert = assert;
2023
common.fake = fake;
@@ -28,13 +31,17 @@ common.httpsPort = 9443;
2831
common.httpsServerKey = fs.readFileSync(path.join(__dirname, './fixture/key.pem'));
2932
common.httpsServerCert = fs.readFileSync(path.join(__dirname, './fixture/cert.pem'));
3033

31-
common.createServer = function (form, FIELDS, callback) {
34+
common.testFields = function (FIELDS, callback) {
35+
36+
var fieldsPassed = Object.keys(FIELDS).length;
37+
3238
return http.createServer(function (req, res) {
3339

34-
form.parse(req);
40+
var incomingForm = new IncomingForm({uploadDir: common.dir.tmp});
3541

36-
var fieldsPassed = Object.keys(FIELDS).length;
37-
common.actions.checkForm(form, FIELDS, function (fieldsChecked) {
42+
incomingForm.parse(req);
43+
44+
common.actions.checkForm(incomingForm, FIELDS, function (fieldsChecked) {
3845
// keep track of number of the processed fields
3946
callback(fieldsPassed - fieldsChecked);
4047
// finish it

‎test/integration/test-http-response.js‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var assert = common.assert;
33
var http = require('http');
44
var parseUrl = require('url').parse;
55
var FormData = require(common.dir.lib + '/form_data');
6-
var IncomingForm = require('formidable').IncomingForm;
76

87
// static server prepared for all tests
98
var remoteFile = 'http://localhost:' + common.staticPort + '/unicycle.jpg';
@@ -31,8 +30,6 @@ var FIELDS = {
3130
name: remoteFile
3231
}
3332
};
34-
// count total
35-
var fieldsPassed = Object.keys(FIELDS).length;
3633

3734
// request static file
3835
http.request(options, function(response) {
@@ -50,15 +47,15 @@ http.request(options, function(response) {
5047

5148
}).end();
5249

53-
// prepare form-receiving http server
54-
var incomingForm = new IncomingForm({uploadDir: common.dir.tmp});
50+
// count total
51+
var fieldsPassed = Object.keys(FIELDS).length;
5552

56-
server = common.createServer(incomingForm, FIELDS, function(fields){
53+
// prepare form-receiving http server
54+
server = common.testFields(FIELDS, function(fields){
5755
fieldsPassed = fields;
5856
});
5957

6058

61-
6259
process.on('exit', function() {
6360
assert.strictEqual(fieldsPassed, 0);
6461
});

‎test/integration/test-submit-custom.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ var mime = require('mime-types');
44
var request = require('request');
55
var fs = require('fs');
66
var FormData = require(common.dir.lib + '/form_data');
7-
var IncomingForm = require('formidable').IncomingForm;
87

98
var remoteFile = 'http://localhost:' + common.staticPort + '/unicycle.jpg';
109

@@ -27,11 +26,12 @@ var FIELDS = {
2726
value: function() { return request(remoteFile); }
2827
}
2928
};
30-
var fieldsPassed = Object.keys(FIELDS).length;
3129

32-
var incomingForm = new IncomingForm({uploadDir: common.dir.tmp});
30+
// count total
31+
var fieldsPassed = Object.keys(FIELDS).length;
3332

34-
var server = common.createServer(incomingForm, FIELDS, function(fields){
33+
// prepare form-receiving http server
34+
var server = common.testFields(FIELDS, function(fields){
3535
fieldsPassed = fields;
3636
});
3737

‎test/integration/test-submit.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ var mime = require('mime-types');
44
var request = require('request');
55
var fs = require('fs');
66
var FormData = require(common.dir.lib + '/form_data');
7-
var IncomingForm = require('formidable').IncomingForm;
87

98
var remoteFile = 'http://localhost:' + common.staticPort + '/unicycle.jpg';
109

@@ -27,11 +26,12 @@ var FIELDS = {
2726
value: function() { return request(remoteFile); }
2827
}
2928
};
30-
var fieldsPassed = Object.keys(FIELDS).length;
3129

32-
var incomingForm = new IncomingForm({uploadDir: common.dir.tmp});
30+
// count total
31+
var fieldsPassed = Object.keys(FIELDS).length;
3332

34-
var server = common.createServer(incomingForm, FIELDS, function(fields){
33+
// prepare form-receiving http server
34+
var server = common.testFields( FIELDS, function(fields){
3535
fieldsPassed = fields;
3636
});
3737

0 commit comments

Comments
 (0)