Merge pull request #32 from 3imed-jaberi/make-test-pass

Make the test pass
koajs · May 27, 2020 · d414d3e · d414d3e
2 parents 8cde5de + 72304a1
commit d414d3e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/index.js b/index.js
@@ -33,8 +33,8 @@ function makePromise(multer, name) {
   multer[name] = function() {
     const middleware = Reflect.apply(fn, this, arguments);
 
-    return (ctx, next) => {
-      return new Promise((resolve, reject) => {
+    return async (ctx, next) => {
+      await new Promise((resolve, reject) => {
         middleware(ctx.req, ctx.res, err => {
           if (err) return reject(err);
           if ('request' in ctx) {
@@ -58,7 +58,9 @@ function makePromise(multer, name) {
 
           resolve(ctx);
         });
-      }).then(next); // eslint-disable-line promise/prefer-await-to-then
+      });
+
+      return next();
     };
   };
 }

diff --git a/test/disk-storage.js b/test/disk-storage.js
@@ -43,7 +43,7 @@ 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), 1803);
+      assert.equal(util.fileSize(req.file.path), 1778);
 
       done();
     });
@@ -117,7 +117,7 @@ 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), 128);
+      assert.equal(util.fileSize(req.files.tiny0[0].path), 122);
 
       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, 1803);
-      assert.equal(util.fileSize(req.files.small0[0].path), 1803);
+      assert.equal(req.files.small0[0].size, 1778);
+      assert.equal(util.fileSize(req.files.small0[0].path), 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, 329);
-      assert.equal(util.fileSize(req.files.small1[0].path), 329);
+      assert.equal(req.files.small1[0].size, 315);
+      assert.equal(util.fileSize(req.files.small1[0].path), 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, 13386);
-      assert.equal(util.fileSize(req.files.medium[0].path), 13386);
+      assert.equal(req.files.medium[0].size, 13196);
+      assert.equal(util.fileSize(req.files.medium[0].path), 13196);
 
       assert.equal(req.files.large[0].fieldname, 'large');
       assert.equal(req.files.large[0].originalname, 'large.jpg');

diff --git a/test/memory-storage.js b/test/memory-storage.js
@@ -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, 128);
-      assert.equal(req.files.tiny0[0].buffer.length, 128);
+      assert.equal(req.files.tiny0[0].size, 122);
+      assert.equal(req.files.tiny0[0].buffer.length, 122);
 
       assert.equal(req.files.tiny1[0].fieldname, 'tiny1');
       assert.equal(req.files.tiny1[0].originalname, 'tiny1.dat');
@@ -117,13 +117,13 @@ describe('Memory Storage', () => {
 
       assert.equal(req.files.small1[0].fieldname, 'small1');
       assert.equal(req.files.small1[0].originalname, 'small1.dat');
-      assert.equal(req.files.small1[0].size, 329);
-      assert.equal(req.files.small1[0].buffer.length, 329);
+      assert.equal(req.files.small1[0].size, 315);
+      assert.equal(req.files.small1[0].buffer.length, 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, 13386);
-      assert.equal(req.files.medium[0].buffer.length, 13386);
+      assert.equal(req.files.medium[0].size, 13196);
+      assert.equal(req.files.medium[0].buffer.length, 13196);
 
       assert.equal(req.files.large[0].fieldname, 'large');
       assert.equal(req.files.large[0].originalname, 'large.jpg');