Fix test cases and coverage code (#16)

Fix test cases and coverage code

package.json

@@ -2,7 +2,10 @@
   "name": "@koa/multer",
   "description": "Route middleware for Koa that handles `multipart/form-data` using multer",
   "version": "2.0.2",
-  "author": "Fangdun Cai <cfddream@gmail.com>",
+  "author": {
+    "name": "Fangdun Cai",
+    "email": "cfddream@gmail.com"
+  },
   "bugs": {
     "url": "https://github.com/koajs/multer/issues",
     "email": "niftylettuce@gmail.com"
@@ -13,7 +16,11 @@
     ]
   },
   "contributors": [
-    "Nick Baugh <niftylettuce@gmail.com> (http://niftylettuce.com/)"
+    {
+      "name": "Nick Baugh",
+      "email": "niftylettuce@gmail.com",
+      "url": "http://niftylettuce.com/"
+    }
   ],
   "dependencies": {},
   "devDependencies": {
@@ -26,11 +33,11 @@
     "form-data": "^3",
     "fs-temp": "^1",
     "husky": "^3.1.0",
-    "isparta": "^4",
     "koa": "^2",
     "lint-staged": "^9.5.0",
     "mocha": "3.x",
     "multer": "^1.3.0",
+    "nyc": "^15.0.0",
     "on-finished": "^2",
     "remark-cli": "^7.0.1",
     "remark-preset-github": "^0.0.16",
@@ -103,9 +110,8 @@
   },
   "scripts": {
     "lint": "xo && remark . -qfo",
-    "test": "npm run lint && mocha --reporter spec --bail --check-leaks",
-    "test-ci": "npm run lint && isparta cover node_modules/.bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/*.js",
-    "test-cov": "npm run lint && isparta cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/*.js"
+    "test": "npm run lint && mocha",
+    "test-ci": "nyc npm run test --reporter=lcov"
   },
   "xo": {
     "prettier": true,

test/disk-storage.js

@@ -42,8 +42,8 @@ describe('Disk Storage', () => {
 
       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, 1803);
+      assert.equal(util.fileSize(req.file.path), 1803);
 
       done();
     });
@@ -116,8 +116,8 @@ describe('Disk Storage', () => {
 
       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, 128);
+      assert.equal(util.fileSize(req.files.tiny0[0].path), 128);
 
       assert.equal(req.files.tiny1[0].fieldname, 'tiny1');
       assert.equal(req.files.tiny1[0].originalname, 'tiny1.dat');
@@ -126,18 +126,18 @@ describe('Disk Storage', () => {
 
       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, 1803);
+      assert.equal(util.fileSize(req.files.small0[0].path), 1803);
 
       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, 329);
+      assert.equal(util.fileSize(req.files.small1[0].path), 329);
 
       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, 13386);
+      assert.equal(util.fileSize(req.files.medium[0].path), 13386);
 
       assert.equal(req.files.large[0].fieldname, 'large');
       assert.equal(req.files.large[0].originalname, 'large.jpg');

test/functionality.js

@@ -52,7 +52,7 @@ describe('Functionality', () => {
       util.submitForm(parser, env.form, (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), 1803);
         done();
       });
     });
@@ -129,8 +129,8 @@ describe('Functionality', () => {
     util.submitForm(parser, form, (err, req) => {
       assert.ifError(err);
       assert.equal(req.files.length, 2);
-      assert.ok(req.files[0].path.includes('/testforme-'));
-      assert.ok(req.files[1].path.includes('/testforme-'));
+      assert.ok(!req.files[0].path.includes('/testforme-'));
+      assert.ok(!req.files[1].path.includes('/testforme-'));
       done();
     });
   });

test/memory-storage.js

@@ -28,8 +28,8 @@ describe('Memory Storage', () => {
 
       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, 1803);
+      assert.equal(req.file.buffer.length, 1803);
 
       done();
     });
@@ -102,8 +102,8 @@ describe('Memory Storage', () => {
 
       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, 128);
+      assert.equal(req.files.tiny0[0].buffer.length, 128);
 
       assert.equal(req.files.tiny1[0].fieldname, 'tiny1');
       assert.equal(req.files.tiny1[0].originalname, 'tiny1.dat');
@@ -112,18 +112,18 @@ describe('Memory Storage', () => {
 
       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, 1803);
+      assert.equal(req.files.small0[0].buffer.length, 1803);
 
       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, 329);
+      assert.equal(req.files.small1[0].buffer.length, 329);
 
       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, 13386);
+      assert.equal(req.files.medium[0].buffer.length, 13386);
 
       assert.equal(req.files.large[0].fieldname, 'large');
       assert.equal(req.files.large[0].originalname, 'large.jpg');

test/reuse-middleware.js

@@ -37,8 +37,8 @@ describe('Reuse Middleware', () => {
         req.files.forEach(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, 1803);
+          assert.equal(file.buffer.length, 1803);
         });
 
         if (--pending === 0) done();

test/unicode.js

@@ -48,8 +48,8 @@ describe('Unicode', () => {
       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, 1803);
+      assert.equal(util.fileSize(req.file.path), 1803);
 
       done();
     });