Skip to content

Commit 850ba1b

Browse files
alexindigoalexindigo
committed
Spring cleaning.
1 parent 25782a3 commit 850ba1b

4 files changed

Lines changed: 81 additions & 254 deletions

File tree

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

Lines changed: 21 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -50,69 +50,31 @@ http.request(options, function(res) {
5050

5151
});
5252

53-
5453
}).end();
5554

5655
server = http.createServer(function(req, res) {
5756

58-
// formidable is broken so let's do it manual way
59-
//
60-
// var form = new IncomingForm();
61-
// form.uploadDir = common.dir.tmp;
62-
// form.parse(req);
63-
// form
64-
// .on('field', function(name, value) {
65-
// var field = FIELDS.shift();
66-
// assert.strictEqual(name, field.name);
67-
// assert.strictEqual(value, field.value+'');
68-
// })
69-
// .on('file', function(name, file) {
70-
// var field = FIELDS.shift();
71-
// assert.strictEqual(name, field.name);
72-
// assert.strictEqual(file.name, path.basename(field.value.path));
73-
// // mime.lookup file.NAME == 'my_file' ?
74-
// assert.strictEqual(file.type, mime.lookup(file.name));
75-
// })
76-
// .on('end', function() {
77-
// res.writeHead(200);
78-
// res.end('done');
79-
// });
80-
81-
// temp workaround
82-
var data = '';
83-
req.setEncoding('utf8');
84-
85-
req.on('data', function(d) {
86-
data += d;
87-
});
88-
89-
req.on('end', function() {
90-
91-
// check for the fields' traces
92-
93-
// 1st field : my_field
94-
var field = FIELDS.shift();
95-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
96-
assert.ok( data.indexOf(field.value) != -1 );
97-
98-
// 2nd field : my_buffer
99-
var field = FIELDS.shift();
100-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
101-
assert.ok( data.indexOf(field.value) != -1 );
102-
103-
// 3rd field : remote_file
104-
var field = FIELDS.shift();
105-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
106-
assert.ok( data.indexOf('; filename="'+path.basename(remoteFile)+'"') != -1 );
107-
// check for http://nodejs.org/images/logo.png traces
108-
assert.ok( data.indexOf('ImageReady') != -1 );
109-
assert.ok( data.indexOf('Content-Type: '+mime.lookup(remoteFile) ) != -1 );
110-
111-
res.writeHead(200);
112-
res.end('done');
113-
114-
});
115-
57+
var form = new IncomingForm({uploadDir: common.dir.tmp});
58+
59+
form.parse(req);
60+
61+
form
62+
.on('field', function(name, value) {
63+
var field = FIELDS.shift();
64+
assert.strictEqual(name, field.name);
65+
assert.strictEqual(value, field.value+'');
66+
})
67+
.on('file', function(name, file) {
68+
var field = FIELDS.shift();
69+
assert.strictEqual(name, field.name);
70+
// http response doesn't have path property
71+
assert.strictEqual(file.name, path.basename(field.value.path || remoteFile));
72+
assert.strictEqual(file.type, mime.lookup(file.name));
73+
})
74+
.on('end', function() {
75+
res.writeHead(200);
76+
res.end('done');
77+
});
11678
});
11779

11880

‎test/integration/test-pipe.js‎

Lines changed: 20 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -22,73 +22,26 @@ var FIELDS = [
2222

2323
var server = http.createServer(function(req, res) {
2424

25-
// formidable is fixed on github
26-
// but still 7 month old in npm
27-
//
28-
// var form = new IncomingForm();
29-
// form.uploadDir = common.dir.tmp;
30-
// form.parse(req);
31-
// form
32-
// .on('field', function(name, value) {
33-
// var field = FIELDS.shift();
34-
// assert.strictEqual(name, field.name);
35-
// assert.strictEqual(value, field.value+'');
36-
// })
37-
// .on('file', function(name, file) {
38-
// var field = FIELDS.shift();
39-
// assert.strictEqual(name, field.name);
40-
// assert.strictEqual(file.name, path.basename(field.value.path));
41-
// assert.strictEqual(file.type, mime.lookup(file.name));
42-
// })
43-
// .on('end', function() {
44-
// res.writeHead(200);
45-
// res.end('done');
46-
// });
47-
48-
// temp workaround
49-
var data = '';
50-
req.setEncoding('utf8');
51-
52-
req.on('data', function(d) {
53-
data += d;
54-
});
55-
56-
req.on('end', function() {
57-
// check for the fields' traces
58-
59-
// 1st field : my_field
60-
var field = FIELDS.shift();
61-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
62-
assert.ok( data.indexOf(field.value) != -1 );
63-
64-
// 2nd field : my_buffer
65-
var field = FIELDS.shift();
66-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
67-
assert.ok( data.indexOf(field.value) != -1 );
68-
69-
// 3rd field : my_file
70-
var field = FIELDS.shift();
71-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
72-
assert.ok( data.indexOf('; filename="'+path.basename(field.value.path)+'"') != -1 );
73-
74-
// check for unicycle.jpg traces
75-
assert.ok( data.indexOf('2005:06:21 01:44:12') != -1 );
76-
assert.ok( data.indexOf('Content-Type: '+mime.lookup(field.value.path) ) != -1 );
77-
78-
// 4th field : remote_file
79-
var field = FIELDS.shift();
80-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
81-
assert.ok( data.indexOf('; filename="'+path.basename(field.value.path)+'"') != -1 );
82-
// check for http://nodejs.org/images/logo.png traces
83-
assert.ok( data.indexOf('ImageReady') != -1 );
84-
assert.ok( data.indexOf('Content-Type: '+mime.lookup(remoteFile) ) != -1 );
85-
86-
res.writeHead(200);
87-
res.end('done');
88-
89-
});
90-
91-
25+
var form = new IncomingForm({uploadDir: common.dir.tmp});
26+
27+
form.parse(req);
28+
29+
form
30+
.on('field', function(name, value) {
31+
var field = FIELDS.shift();
32+
assert.strictEqual(name, field.name);
33+
assert.strictEqual(value, field.value+'');
34+
})
35+
.on('file', function(name, file) {
36+
var field = FIELDS.shift();
37+
assert.strictEqual(name, field.name);
38+
assert.strictEqual(file.name, path.basename(field.value.path));
39+
assert.strictEqual(file.type, mime.lookup(file.name));
40+
})
41+
.on('end', function() {
42+
res.writeHead(200);
43+
res.end('done');
44+
});
9245
});
9346

9447
server.listen(common.port, function() {

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

Lines changed: 20 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -22,70 +22,26 @@ var FIELDS = [
2222

2323
var server = http.createServer(function(req, res) {
2424

25-
// formidable is fixed on github
26-
// but still 7 month old in npm
27-
//
28-
// var form = new IncomingForm();
29-
// form.uploadDir = common.dir.tmp;
30-
// form.parse(req);
31-
// form
32-
// .on('field', function(name, value) {
33-
// var field = FIELDS.shift();
34-
// assert.strictEqual(name, field.name);
35-
// assert.strictEqual(value, field.value+'');
36-
// })
37-
// .on('file', function(name, file) {
38-
// var field = FIELDS.shift();
39-
// assert.strictEqual(name, field.name);
40-
// assert.strictEqual(file.name, path.basename(field.value.path));
41-
// // mime.lookup file.NAME == 'my_file' ?
42-
// assert.strictEqual(file.type, mime.lookup(file.name));
43-
// })
44-
// .on('end', function() {
45-
// res.writeHead(200);
46-
// res.end('done');
47-
// });
48-
49-
// temp workaround
50-
var data = '';
51-
req.setEncoding('utf8');
52-
req.on('data', function(d) {
53-
data += d;
54-
});
55-
req.on('end', function() {
56-
// check for the fields' traces
57-
58-
// 1st field : my_field
59-
var field = FIELDS.shift();
60-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
61-
assert.ok( data.indexOf(field.value) != -1 );
62-
63-
// 2nd field : my_buffer
64-
var field = FIELDS.shift();
65-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
66-
assert.ok( data.indexOf(field.value) != -1 );
67-
68-
// 3rd field : my_file
69-
var field = FIELDS.shift();
70-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
71-
assert.ok( data.indexOf('; filename="'+path.basename(field.value.path)+'"') != -1 );
72-
// check for unicycle.jpg traces
73-
assert.ok( data.indexOf('2005:06:21 01:44:12') != -1 );
74-
assert.ok( data.indexOf('Content-Type: '+mime.lookup(field.value.path) ) != -1 );
75-
76-
// 4th field : remote_file
77-
var field = FIELDS.shift();
78-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
79-
assert.ok( data.indexOf('; filename="'+path.basename(field.value.path)+'"') != -1 );
80-
// check for http://nodejs.org/images/logo.png traces
81-
assert.ok( data.indexOf('ImageReady') != -1 );
82-
assert.ok( data.indexOf('Content-Type: '+mime.lookup(remoteFile) ) != -1 );
83-
84-
res.writeHead(200);
85-
res.end('done');
86-
87-
});
88-
25+
var form = new IncomingForm({uploadDir: common.dir.tmp});
26+
27+
form.parse(req);
28+
29+
form
30+
.on('field', function(name, value) {
31+
var field = FIELDS.shift();
32+
assert.strictEqual(name, field.name);
33+
assert.strictEqual(value, field.value+'');
34+
})
35+
.on('file', function(name, file) {
36+
var field = FIELDS.shift();
37+
assert.strictEqual(name, field.name);
38+
assert.strictEqual(file.name, path.basename(field.value.path));
39+
assert.strictEqual(file.type, mime.lookup(file.name));
40+
})
41+
.on('end', function() {
42+
res.writeHead(200);
43+
res.end('done');
44+
});
8945
});
9046

9147
server.listen(common.port, function() {

‎test/integration/test-submit.js‎

Lines changed: 20 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -22,70 +22,26 @@ var FIELDS = [
2222

2323
var server = http.createServer(function(req, res) {
2424

25-
// formidable is fixed on github
26-
// but still 7 month old in npm
27-
//
28-
// var form = new IncomingForm();
29-
// form.uploadDir = common.dir.tmp;
30-
// form.parse(req);
31-
// form
32-
// .on('field', function(name, value) {
33-
// var field = FIELDS.shift();
34-
// assert.strictEqual(name, field.name);
35-
// assert.strictEqual(value, field.value+'');
36-
// })
37-
// .on('file', function(name, file) {
38-
// var field = FIELDS.shift();
39-
// assert.strictEqual(name, field.name);
40-
// assert.strictEqual(file.name, path.basename(field.value.path));
41-
// // mime.lookup file.NAME == 'my_file' ?
42-
// assert.strictEqual(file.type, mime.lookup(file.name));
43-
// })
44-
// .on('end', function() {
45-
// res.writeHead(200);
46-
// res.end('done');
47-
// });
48-
49-
// temp workaround
50-
var data = '';
51-
req.setEncoding('utf8');
52-
req.on('data', function(d) {
53-
data += d;
54-
});
55-
req.on('end', function() {
56-
// check for the fields' traces
57-
58-
// 1st field : my_field
59-
var field = FIELDS.shift();
60-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
61-
assert.ok( data.indexOf(field.value) != -1 );
62-
63-
// 2nd field : my_buffer
64-
var field = FIELDS.shift();
65-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
66-
assert.ok( data.indexOf(field.value) != -1 );
67-
68-
// 3rd field : my_file
69-
var field = FIELDS.shift();
70-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
71-
assert.ok( data.indexOf('; filename="'+path.basename(field.value.path)+'"') != -1 );
72-
// check for unicycle.jpg traces
73-
assert.ok( data.indexOf('2005:06:21 01:44:12') != -1 );
74-
assert.ok( data.indexOf('Content-Type: '+mime.lookup(field.value.path) ) != -1 );
75-
76-
// 4th field : remote_file
77-
var field = FIELDS.shift();
78-
assert.ok( data.indexOf('form-data; name="'+field.name+'"') != -1 );
79-
assert.ok( data.indexOf('; filename="'+path.basename(field.value.path)+'"') != -1 );
80-
// check for http://nodejs.org/images/logo.png traces
81-
assert.ok( data.indexOf('ImageReady') != -1 );
82-
assert.ok( data.indexOf('Content-Type: '+mime.lookup(remoteFile) ) != -1 );
83-
84-
res.writeHead(200);
85-
res.end('done');
86-
87-
});
88-
25+
var form = new IncomingForm({uploadDir: common.dir.tmp});
26+
27+
form.parse(req);
28+
29+
form
30+
.on('field', function(name, value) {
31+
var field = FIELDS.shift();
32+
assert.strictEqual(name, field.name);
33+
assert.strictEqual(value, field.value+'');
34+
})
35+
.on('file', function(name, file) {
36+
var field = FIELDS.shift();
37+
assert.strictEqual(name, field.name);
38+
assert.strictEqual(file.name, path.basename(field.value.path));
39+
assert.strictEqual(file.type, mime.lookup(file.name));
40+
})
41+
.on('end', function() {
42+
res.writeHead(200);
43+
res.end('done');
44+
});
8945
});
9046

9147
server.listen(common.port, function() {

0 commit comments

Comments
 (0)