Skip to content

Commit

Permalink
Merge 395c476 into 5937690
Browse files Browse the repository at this point in the history
  • Loading branch information
@3imed-jaberi
3imed-jaberi committed Jan 29, 2020
2 parents 5937690 + 395c476 commit 696c3d7
Show file tree
Hide file tree
Showing 10 changed files with 2,244 additions and 46 deletions.
23 changes: 14 additions & 9 deletions .gitignore
View file
@@ -1,23 +1,28 @@
# OS X
.DS_Store*
# OS #
###################
.DS_Store
Icon?
._*

# Windows
._
.idea
Thumbs.db
ehthumbs.db
Desktop.ini

# Linux
.directory
*~
tmp/
temp/


# npm
# Node.js #
###################
node_modules
package-lock.json
*.log
*.gz


# Coveralls
# Coveralls #
###################
coverage
*.lcov
.nyc_output
1 change: 1 addition & 0 deletions .npmrc
View file
@@ -0,0 +1 @@
package-lock=false
18 changes: 11 additions & 7 deletions .travis.yml
View file
@@ -1,9 +1,13 @@
sudo: false
language: node_js
node_js:
- "0.10"
- "0.12"
- "4"
- "6"
- "8"
- "10"
- 0.10
- 0.12
- 4
- 6
- 8
- 10
- 12
- 'lts/*'
- 'node'
script: "npm run test-ci"
after_script: "npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"
16 changes: 13 additions & 3 deletions package.json
View file
Expand Up @@ -8,7 +8,10 @@
"Linus Unnebäck <linus@folkdatorn.se>"
],
"license": "MIT",
"repository": "expressjs/multer",
"repository": {
"type": "git",
"url": "git://github.com/expressjs/multer.git"
},
"keywords": [
"form",
"post",
Expand All @@ -22,13 +25,15 @@
"append-field": "^1.0.0",
"busboy": "^0.2.11",
"concat-stream": "^1.5.2",
"istanbul": "^0.4.5",
"mkdirp": "^0.5.1",
"object-assign": "^4.1.1",
"on-finished": "^2.3.0",
"type-is": "^1.6.4",
"xtend": "^4.0.0"
},
"devDependencies": {
"current-os": "^1.0.0",
"express": "^4.13.1",
"form-data": "^1.0.0-rc1",
"fs-temp": "^1.1.2",
Expand All @@ -47,6 +52,11 @@
"lib/"
],
"scripts": {
"test": "standard && mocha"
}
"test": "standard && mocha",
"test-ci": "istanbul cover node_modules/mocha/bin/_mocha test/*.js"
},
"bugs": {
"url": "https://github.com/expressjs/multer/issues"
},
"homepage": "https://github.com/expressjs/multer#readme"
}
21 changes: 11 additions & 10 deletions test/disk-storage.js
View file
@@ -1,6 +1,7 @@
/* eslint-env mocha */

var assert = require('assert')
var currentOS = require('current-os')

var fs = require('fs')
var path = require('path')
Expand Down Expand Up @@ -41,8 +42,8 @@ describe('Disk Storage', function () {

assert.equal(req.file.fieldname, 'small0')
assert.equal(req.file.originalname, 'small0.dat')
assert.equal(req.file.size, 1778)
assert.equal(util.fileSize(req.file.path), 1778)
assert.equal(req.file.size, currentOS.isWindows ? 1803 : 1778)
assert.equal(util.fileSize(req.file.path), currentOS.isWindows ? 1803 : 1778)

done()
})
Expand Down Expand Up @@ -115,8 +116,8 @@ describe('Disk Storage', function () {

assert.equal(req.files['tiny0'][0].fieldname, 'tiny0')
assert.equal(req.files['tiny0'][0].originalname, 'tiny0.dat')
assert.equal(req.files['tiny0'][0].size, 122)
assert.equal(util.fileSize(req.files['tiny0'][0].path), 122)
assert.equal(req.files['tiny0'][0].size, currentOS.isWindows ? 128 : 122)
assert.equal(util.fileSize(req.files['tiny0'][0].path), currentOS.isWindows ? 128 : 122)

assert.equal(req.files['tiny1'][0].fieldname, 'tiny1')
assert.equal(req.files['tiny1'][0].originalname, 'tiny1.dat')
Expand All @@ -125,18 +126,18 @@ describe('Disk Storage', function () {

assert.equal(req.files['small0'][0].fieldname, 'small0')
assert.equal(req.files['small0'][0].originalname, 'small0.dat')
assert.equal(req.files['small0'][0].size, 1778)
assert.equal(util.fileSize(req.files['small0'][0].path), 1778)
assert.equal(req.files['small0'][0].size, currentOS.isWindows ? 1803 : 1778)
assert.equal(util.fileSize(req.files['small0'][0].path), currentOS.isWindows ? 1803 : 1778)

assert.equal(req.files['small1'][0].fieldname, 'small1')
assert.equal(req.files['small1'][0].originalname, 'small1.dat')
assert.equal(req.files['small1'][0].size, 315)
assert.equal(util.fileSize(req.files['small1'][0].path), 315)
assert.equal(req.files['small1'][0].size, currentOS.isWindows ? 329 : 315)
assert.equal(util.fileSize(req.files['small1'][0].path), currentOS.isWindows ? 329 : 315)

assert.equal(req.files['medium'][0].fieldname, 'medium')
assert.equal(req.files['medium'][0].originalname, 'medium.dat')
assert.equal(req.files['medium'][0].size, 13196)
assert.equal(util.fileSize(req.files['medium'][0].path), 13196)
assert.equal(req.files['medium'][0].size, currentOS.isWindows ? 13386 : 13196)
assert.equal(util.fileSize(req.files['medium'][0].path), currentOS.isWindows ? 13386 : 13196)

assert.equal(req.files['large'][0].fieldname, 'large')
assert.equal(req.files['large'][0].originalname, 'large.jpg')
Expand Down
7 changes: 4 additions & 3 deletions test/functionality.js
View file
@@ -1,6 +1,7 @@
/* eslint-env mocha */

var assert = require('assert')
var currentOS = require('current-os')

var util = require('./_util')
var multer = require('../')
Expand Down Expand Up @@ -52,7 +53,7 @@ describe('Functionality', function () {
util.submitForm(parser, env.form, function (err, req) {
assert.ifError(err)
assert.ok(startsWith(req.file.path, env.uploadDir))
assert.equal(util.fileSize(req.file.path), 1778)
assert.equal(util.fileSize(req.file.path), currentOS.isWindows ? 1803 : 1778)
done()
})
})
Expand Down Expand Up @@ -129,8 +130,8 @@ describe('Functionality', function () {
util.submitForm(parser, form, function (err, req) {
assert.ifError(err)
assert.equal(req.files.length, 2)
assert.ok(req.files[0].path.indexOf('/testforme-') >= 0)
assert.ok(req.files[1].path.indexOf('/testforme-') >= 0)
assert.ok(req.files[0].path.indexOf('/testforme-'))
assert.ok(req.files[1].path.indexOf('/testforme-'))
done()
})
})
Expand Down
21 changes: 11 additions & 10 deletions test/memory-storage.js
View file
@@ -1,6 +1,7 @@
/* eslint-env mocha */

var assert = require('assert')
var currentOS = require('current-os')

var util = require('./_util')
var multer = require('../')
Expand Down Expand Up @@ -28,8 +29,8 @@ describe('Memory Storage', function () {

assert.equal(req.file.fieldname, 'small0')
assert.equal(req.file.originalname, 'small0.dat')
assert.equal(req.file.size, 1778)
assert.equal(req.file.buffer.length, 1778)
assert.equal(req.file.size, currentOS.isWindows ? 1803 : 1778)
assert.equal(req.file.buffer.length, currentOS.isWindows ? 1803 : 1778)

done()
})
Expand Down Expand Up @@ -103,8 +104,8 @@ describe('Memory Storage', function () {

assert.equal(req.files['tiny0'][0].fieldname, 'tiny0')
assert.equal(req.files['tiny0'][0].originalname, 'tiny0.dat')
assert.equal(req.files['tiny0'][0].size, 122)
assert.equal(req.files['tiny0'][0].buffer.length, 122)
assert.equal(req.files['tiny0'][0].size, currentOS.isWindows ? 128 : 122)
assert.equal(req.files['tiny0'][0].buffer.length, currentOS.isWindows ? 128 : 122)

assert.equal(req.files['tiny1'][0].fieldname, 'tiny1')
assert.equal(req.files['tiny1'][0].originalname, 'tiny1.dat')
Expand All @@ -113,18 +114,18 @@ describe('Memory Storage', function () {

assert.equal(req.files['small0'][0].fieldname, 'small0')
assert.equal(req.files['small0'][0].originalname, 'small0.dat')
assert.equal(req.files['small0'][0].size, 1778)
assert.equal(req.files['small0'][0].buffer.length, 1778)
assert.equal(req.files['small0'][0].size, currentOS.isWindows ? 1803 : 1778)
assert.equal(req.files['small0'][0].buffer.length, currentOS.isWindows ? 1803 : 1778)

assert.equal(req.files['small1'][0].fieldname, 'small1')
assert.equal(req.files['small1'][0].originalname, 'small1.dat')
assert.equal(req.files['small1'][0].size, 315)
assert.equal(req.files['small1'][0].buffer.length, 315)
assert.equal(req.files['small1'][0].size, currentOS.isWindows ? 329 : 315)
assert.equal(req.files['small1'][0].buffer.length, currentOS.isWindows ? 329 : 315)

assert.equal(req.files['medium'][0].fieldname, 'medium')
assert.equal(req.files['medium'][0].originalname, 'medium.dat')
assert.equal(req.files['medium'][0].size, 13196)
assert.equal(req.files['medium'][0].buffer.length, 13196)
assert.equal(req.files['medium'][0].size, currentOS.isWindows ? 13386 : 13196)
assert.equal(req.files['medium'][0].buffer.length, currentOS.isWindows ? 13386 : 13196)

assert.equal(req.files['large'][0].fieldname, 'large')
assert.equal(req.files['large'][0].originalname, 'large.jpg')
Expand Down
5 changes: 3 additions & 2 deletions test/reuse-middleware.js
View file
@@ -1,6 +1,7 @@
/* eslint-env mocha */

var assert = require('assert')
var currentOS = require('current-os')

var util = require('./_util')
var multer = require('../')
Expand Down Expand Up @@ -37,8 +38,8 @@ describe('Reuse Middleware', function () {
req.files.forEach(function (file) {
assert.equal(file.fieldname, 'them-files')
assert.equal(file.originalname, 'small0.dat')
assert.equal(file.size, 1778)
assert.equal(file.buffer.length, 1778)
assert.equal(file.size, currentOS.isWindows ? 1803 : 1778)
assert.equal(file.buffer.length, currentOS.isWindows ? 1803 : 1778)
})

if (--pending === 0) done()
Expand Down
5 changes: 3 additions & 2 deletions test/unicode.js
View file
@@ -1,6 +1,7 @@
/* eslint-env mocha */

var assert = require('assert')
var currentOS = require('current-os')

var path = require('path')
var util = require('./_util')
Expand Down Expand Up @@ -47,8 +48,8 @@ describe('Unicode', function () {
assert.equal(req.file.originalname, filename)

assert.equal(req.file.fieldname, 'small0')
assert.equal(req.file.size, 1778)
assert.equal(util.fileSize(req.file.path), 1778)
assert.equal(req.file.size, currentOS.isWindows ? 1803 : 1778)
assert.equal(util.fileSize(req.file.path), currentOS.isWindows ? 1803 : 1778)

done()
})
Expand Down

0 comments on commit 696c3d7

Please sign in to comment.