Fix Test Cases [tests pass on all os]

.gitignore

@@ -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

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -1,9 +1,9 @@
-sudo: false
 language: node_js
 node_js:
-  - "0.10"
-  - "0.12"
-  - "4"
-  - "6"
-  - "8"
-  - "10"
+  - 0.10
+  - 0.12
+  - 8
+  - 10
+  - 12
+  - 'lts/*'
+  - 'node'

package.json

@@ -29,6 +29,7 @@
     "xtend": "^4.0.0"
   },
   "devDependencies": {
+    "current-os": "^1.1.0",
     "deep-equal": "^2.0.3",
     "express": "^4.13.1",
     "form-data": "^1.0.0-rc1",

test/disk-storage.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 
 var assert = require('assert')
+var currentOS = require('current-os')
 var deepEqual = require('deep-equal')
 
 var fs = require('fs')
@@ -42,8 +43,8 @@ describe('Disk Storage', function () {
 
       assert.strictEqual(req.file.fieldname, 'small0')
       assert.strictEqual(req.file.originalname, 'small0.dat')
-      assert.strictEqual(req.file.size, 1778)
-      assert.strictEqual(util.fileSize(req.file.path), 1778)
+      assert.strictEqual(req.file.size, currentOS.isWindows ? 1803 : 1778)
+      assert.strictEqual(util.fileSize(req.file.path), currentOS.isWindows ? 1803 : 1778)
 
       done()
     })
@@ -116,8 +117,8 @@ describe('Disk Storage', function () {
 
       assert.strictEqual(req.files.tiny0[0].fieldname, 'tiny0')
       assert.strictEqual(req.files.tiny0[0].originalname, 'tiny0.dat')
-      assert.strictEqual(req.files.tiny0[0].size, 122)
-      assert.strictEqual(util.fileSize(req.files.tiny0[0].path), 122)
+      assert.strictEqual(req.files.tiny0[0].size, currentOS.isWindows ? 128 : 122)
+      assert.strictEqual(util.fileSize(req.files.tiny0[0].path), currentOS.isWindows ? 128 : 122)
 
       assert.strictEqual(req.files.tiny1[0].fieldname, 'tiny1')
       assert.strictEqual(req.files.tiny1[0].originalname, 'tiny1.dat')
@@ -126,18 +127,18 @@ describe('Disk Storage', function () {
 
       assert.strictEqual(req.files.small0[0].fieldname, 'small0')
       assert.strictEqual(req.files.small0[0].originalname, 'small0.dat')
-      assert.strictEqual(req.files.small0[0].size, 1778)
-      assert.strictEqual(util.fileSize(req.files.small0[0].path), 1778)
+      assert.strictEqual(req.files.small0[0].size, currentOS.isWindows ? 1803 : 1778)
+      assert.strictEqual(util.fileSize(req.files.small0[0].path), currentOS.isWindows ? 1803 : 1778)
 
       assert.strictEqual(req.files.small1[0].fieldname, 'small1')
       assert.strictEqual(req.files.small1[0].originalname, 'small1.dat')
-      assert.strictEqual(req.files.small1[0].size, 315)
-      assert.strictEqual(util.fileSize(req.files.small1[0].path), 315)
+      assert.strictEqual(req.files.small1[0].size, currentOS.isWindows ? 329 : 315)
+      assert.strictEqual(util.fileSize(req.files.small1[0].path), currentOS.isWindows ? 329 : 315)
 
       assert.strictEqual(req.files.medium[0].fieldname, 'medium')
       assert.strictEqual(req.files.medium[0].originalname, 'medium.dat')
-      assert.strictEqual(req.files.medium[0].size, 13196)
-      assert.strictEqual(util.fileSize(req.files.medium[0].path), 13196)
+      assert.strictEqual(req.files.medium[0].size, currentOS.isWindows ? 13386 : 13196)
+      assert.strictEqual(util.fileSize(req.files.medium[0].path), currentOS.isWindows ? 13386 : 13196)
 
       assert.strictEqual(req.files.large[0].fieldname, 'large')
       assert.strictEqual(req.files.large[0].originalname, 'large.jpg')

test/functionality.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 
 var assert = require('assert')
+var currentOS = require('current-os')
 
 var util = require('./_util')
 var multer = require('../')
@@ -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.strictEqual(util.fileSize(req.file.path), 1778)
+        assert.strictEqual(util.fileSize(req.file.path), currentOS.isWindows ? 1803 : 1778)
         done()
       })
     })
@@ -129,8 +130,8 @@ describe('Functionality', function () {
     util.submitForm(parser, form, function (err, req) {
       assert.ifError(err)
       assert.strictEqual(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()
     })
   })

test/memory-storage.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 
 var assert = require('assert')
+var currentOS = require('current-os')
 var deepEqual = require('deep-equal')
 
 var util = require('./_util')
@@ -29,8 +30,8 @@ describe('Memory Storage', function () {
 
       assert.strictEqual(req.file.fieldname, 'small0')
       assert.strictEqual(req.file.originalname, 'small0.dat')
-      assert.strictEqual(req.file.size, 1778)
-      assert.strictEqual(req.file.buffer.length, 1778)
+      assert.strictEqual(req.file.size, currentOS.isWindows ? 1803 : 1778)
+      assert.strictEqual(req.file.buffer.length, currentOS.isWindows ? 1803 : 1778)
 
       done()
     })
@@ -104,8 +105,8 @@ describe('Memory Storage', function () {
 
       assert.strictEqual(req.files.tiny0[0].fieldname, 'tiny0')
       assert.strictEqual(req.files.tiny0[0].originalname, 'tiny0.dat')
-      assert.strictEqual(req.files.tiny0[0].size, 122)
-      assert.strictEqual(req.files.tiny0[0].buffer.length, 122)
+      assert.strictEqual(req.files.tiny0[0].size, currentOS.isWindows ? 128 : 122)
+      assert.strictEqual(req.files.tiny0[0].buffer.length, currentOS.isWindows ? 128 : 122)
 
       assert.strictEqual(req.files.tiny1[0].fieldname, 'tiny1')
       assert.strictEqual(req.files.tiny1[0].originalname, 'tiny1.dat')
@@ -114,18 +115,18 @@ describe('Memory Storage', function () {
 
       assert.strictEqual(req.files.small0[0].fieldname, 'small0')
       assert.strictEqual(req.files.small0[0].originalname, 'small0.dat')
-      assert.strictEqual(req.files.small0[0].size, 1778)
-      assert.strictEqual(req.files.small0[0].buffer.length, 1778)
+      assert.strictEqual(req.files.small0[0].size, currentOS.isWindows ? 1803 : 1778)
+      assert.strictEqual(req.files.small0[0].buffer.length, currentOS.isWindows ? 1803 : 1778)
 
       assert.strictEqual(req.files.small1[0].fieldname, 'small1')
       assert.strictEqual(req.files.small1[0].originalname, 'small1.dat')
-      assert.strictEqual(req.files.small1[0].size, 315)
-      assert.strictEqual(req.files.small1[0].buffer.length, 315)
+      assert.strictEqual(req.files.small1[0].size, currentOS.isWindows ? 329 : 315)
+      assert.strictEqual(req.files.small1[0].buffer.length, currentOS.isWindows ? 329 : 315)
 
       assert.strictEqual(req.files.medium[0].fieldname, 'medium')
       assert.strictEqual(req.files.medium[0].originalname, 'medium.dat')
-      assert.strictEqual(req.files.medium[0].size, 13196)
-      assert.strictEqual(req.files.medium[0].buffer.length, 13196)
+      assert.strictEqual(req.files.medium[0].size, currentOS.isWindows ? 13386 : 13196)
+      assert.strictEqual(req.files.medium[0].buffer.length, currentOS.isWindows ? 13386 : 13196)
 
       assert.strictEqual(req.files.large[0].fieldname, 'large')
       assert.strictEqual(req.files.large[0].originalname, 'large.jpg')

test/reuse-middleware.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 
 var assert = require('assert')
+var currentOS = require('current-os')
 
 var util = require('./_util')
 var multer = require('../')
@@ -37,8 +38,8 @@ describe('Reuse Middleware', function () {
         req.files.forEach(function (file) {
           assert.strictEqual(file.fieldname, 'them-files')
           assert.strictEqual(file.originalname, 'small0.dat')
-          assert.strictEqual(file.size, 1778)
-          assert.strictEqual(file.buffer.length, 1778)
+          assert.strictEqual(file.size, currentOS.isWindows ? 1803 : 1778)
+          assert.strictEqual(file.buffer.length, currentOS.isWindows ? 1803 : 1778)
         })
 
         if (--pending === 0) done()

test/unicode.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 
 var assert = require('assert')
+var currentOS = require('current-os')
 
 var path = require('path')
 var util = require('./_util')
@@ -47,8 +48,8 @@ describe('Unicode', function () {
       assert.strictEqual(req.file.originalname, filename)
 
       assert.strictEqual(req.file.fieldname, 'small0')
-      assert.strictEqual(req.file.size, 1778)
-      assert.strictEqual(util.fileSize(req.file.path), 1778)
+      assert.strictEqual(req.file.size, currentOS.isWindows ? 1803 : 1778)
+      assert.strictEqual(util.fileSize(req.file.path), currentOS.isWindows ? 1803 : 1778)
 
       done()
     })