fix(koa-better-body): make tests passing, update deps

Signed-off-by: Charlike Mike Reagent <opensource@tunnckocore.com>

Author: tunnckoCore

jest/test.js

@@ -2,7 +2,7 @@ const path = require('path');
 const utils = require('../@tunnckocore/utils/src');
 
 const ROOT = path.dirname(__dirname);
-const { alias, workspaces } = utils.createAliases(ROOT, 'src');
+const { /* alias, */ workspaces } = utils.createAliases(ROOT, 'src');
 
 module.exports = {
   rootDir: ROOT,
@@ -13,10 +13,10 @@ module.exports = {
     /(?:__)?(?:fixtures?|supports?|shared)(?:__)?/.toString(),
 
     // ! todo remove when fixed
-    /koa-better-body/.toString(),
+    // /koa-better-body/.toString(),
     /jest-runner-rollup/.toString(),
   ],
-  moduleNameMapper: alias,
+  // moduleNameMapper: alias,
   moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx'],
   // runner: './@tunnckocore/jest-runner-babel/src/index.js',
 };

package.json

@@ -32,6 +32,7 @@
     "builtin-modules": "^3.1.0",
     "enquirer": "^2.3.2",
     "eslint": "^6.4.0",
+    "esm": "^3.2.25",
     "jest": "^24.9.0",
     "lerna": "^3.16.4",
     "prettier": "^1.18.2",

packages/koa-better-body/package.json

@@ -53,9 +53,9 @@
   ],
   "scripts": {},
   "dependencies": {
-    "extend-shallow": "3.0.2",
-    "formidable": "1.2.1",
-    "koa-body-parsers": "git+https://github.com/tunnckoCore/body-parsers.git"
+    "extend-shallow": "^3.0.2",
+    "formidable": "^1.2.1",
+    "koa-body-parsers": "tunnckoCore/body-parsers#patch-1"
   },
   "devDependencies": {
     "is-buffer": "2.0.3",

packages/koa-better-body/src/utils.js

@@ -114,6 +114,11 @@ export function setParsers(ctx, opts) {
     ctx.qs; // alias
 
   bodyParsers(ctx);
+
+  // to do: when using koa-body-parsers v3.1 - it adds support for this and
+  // probably will break us in some way.
+  // delete ctx.request.body;
+
   ctx.request.multipart = multipart.bind(ctx);
   return ctx;
 }

packages/koa-better-body/test/buffer.js

@@ -5,53 +5,49 @@
  * Released under the MIT license.
  */
 
-import { promisify } from 'util';
 import isBuffer from 'is-buffer';
 import request from 'supertest';
 import koa from 'koa';
 import betterBody from '../src';
 
 test('should get the raw buffer body (options.buffer: true)', async () => {
   const server = koa().use(betterBody({ buffer: true }));
+
   // eslint-disable-next-line require-yield
   server.use(function* koaCustomPlugin() {
-    test.strictEqual(isBuffer(this.request.body), true);
+    expect(isBuffer(this.request.body)).toStrictEqual(true);
     this.body = this.request.body.toString('utf8');
   });
-  await promisify(
-    request(server.callback())
-      .post('/')
-      .type('text')
-      .send('qux')
-      .expect(200)
-      .expect('qux').end,
-  )();
+
+  await request(server.callback())
+    .post('/')
+    .type('text')
+    .send('qux')
+    .expect(200)
+    .expect('qux');
 });
+
 test('should throw if the buffer body is too large (options.buffer: true)', async () => {
   const server = koa().use(betterBody({ buffer: true, bufferLimit: '2b' }));
 
-  await promisify(
-    request(server.callback())
-      .post('/')
-      .type('text')
-      .send('too large')
-      .expect(413).end,
-  )();
+  await request(server.callback())
+    .post('/')
+    .type('text')
+    .send('too large')
+    .expect(413);
 });
+
 test('should get json if `options.buffer` is false (that is the default)', async () => {
   const server = koa().use(betterBody());
   // eslint-disable-next-line require-yield
   server.use(function* koaCustomPlugin() {
-    test.strictEqual(typeof this.request.fields, 'object');
-    test.deepEqual(this.request.fields, { 'too large': '' });
+    expect(this.request.fields).toMatchObject({ 'too large': '' });
     this.body = this.request.fields;
   });
 
-  await promisify(
-    request(server.callback())
-      .post('/')
-      .send('too large')
-      .expect(200)
-      .expect(/"too large":/).end,
-  )();
+  await request(server.callback())
+    .post('/')
+    .send('too large')
+    .expect(200)
+    .expect(/"too large":/);
 });

packages/koa-better-body/test/custom.js

@@ -5,7 +5,6 @@
  * Released under the MIT license.
  */
 
-import { promisify } from 'util';
 import request from 'supertest';
 import koa from 'koa';
 import betterBody from '../src';
@@ -16,11 +15,12 @@ test('should accept opts.extendTypes.custom `foo/bar-x` as text', async () => {
       extendTypes: {
         custom: ['foo/bar-x'],
       },
+
       handler: function* handler(ctx, opts) {
-        test.strictEqual(typeof ctx, 'object');
-        test.strictEqual(typeof this, 'object');
-        test.strictEqual(typeof ctx.request.text, 'function');
-        test.strictEqual(typeof this.request.text, 'function');
+        expect(typeof ctx).toStrictEqual('object');
+        expect(typeof this).toStrictEqual('object');
+        expect(typeof ctx.request.text).toStrictEqual('function');
+        expect(typeof this.request.text).toStrictEqual('function');
 
         this.request.body = yield this.request.text(opts);
       },
@@ -29,22 +29,19 @@ test('should accept opts.extendTypes.custom `foo/bar-x` as text', async () => {
 
   app = app
     .use(function* abc(next) {
-      test.strictEqual(typeof this.request.body, 'string');
-      test.strictEqual(this.request.body, 'message=lol');
+      expect(this.request.body).toStrictEqual('message=lol');
       this.body = this.request.body;
       yield* next;
     })
     // eslint-disable-next-line require-yield
     .use(function* abc() {
-      test.strictEqual(this.body, 'message=lol');
+      expect(this.body).toStrictEqual('message=lol');
     });
 
-  await promisify(
-    request(app.callback())
-      .post('/')
-      .type('foo/bar-x')
-      .send('message=lol')
-      .expect(200)
-      .expect('message=lol').end,
-  )();
+  await request(app.callback())
+    .post('/')
+    .type('foo/bar-x')
+    .send('message=lol')
+    .expect(200)
+    .expect('message=lol');
 });

packages/koa-better-body/test/json.js

@@ -5,7 +5,6 @@
  * Released under the MIT license.
  */
 
-import { promisify } from 'util';
 import request from 'supertest';
 import koa from 'koa';
 import betterBody from '../src';
@@ -22,44 +21,39 @@ const app = koa()
   .use(postBody());
 
 test('should parse a json body', async () => {
-  await promisify(
-    request(app.callback())
-      .post('/')
-      .send({ foo: 'lol' })
-      .expect(200)
-      .expect({ foo: 'lol' }).end,
-  )();
+  await request(app.callback())
+    .post('/')
+    .send({ foo: 'lol' })
+    .expect(200)
+    .expect({ foo: 'lol' });
 });
+
 test('should parse a string json body', async () => {
-  await promisify(
-    request(app.callback())
-      .post('/')
-      .type('application/json')
-      .send('{"fao":"nato"}')
-      .expect(200)
-      .expect({ fao: 'nato' }).end,
-  )();
+  await request(app.callback())
+    .post('/')
+    .type('application/json')
+    .send('{"fao":"nato"}')
+    .expect(200)
+    .expect({ fao: 'nato' });
 });
+
 test('should throw on json non-object body in strict mode (default)', async () => {
-  await promisify(
-    request(app.callback())
-      .post('/')
-      .type('json')
-      .send('"lol"')
-      .expect(400).end,
-  )();
+  await request(app.callback())
+    .post('/')
+    .type('json')
+    .send('"lol"')
+    .expect(400);
 });
+
 test('should not throw on non-objects in non-strict mode', async () => {
   const server = koa()
     .use(betterBody({ jsonStrict: false }))
     .use(postBody());
 
-  await promisify(
-    request(server.callback())
-      .post('/')
-      .type('json')
-      .send('"foobar"')
-      .expect(200)
-      .expect(/foobar/).end,
-  )();
+  await request(server.callback())
+    .post('/')
+    .type('json')
+    .send('"foobar"')
+    .expect(200)
+    .expect(/foobar/);
 });