fix(koa-better-body): switch to use supertest#end in tests

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

Author: tunnckoCore

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

@@ -7,9 +7,13 @@
 
 import isBuffer from 'is-buffer';
 import request from 'supertest';
-import koa from 'koa';
+import Koa from 'koa';
 import betterBody from '../src';
 
+function koa() {
+  return new Koa();
+}
+
 test('should get the raw buffer body (options.buffer: true)', async () => {
   const server = koa().use(betterBody({ buffer: true }));
 
@@ -19,22 +23,28 @@ test('should get the raw buffer body (options.buffer: true)', async () => {
     this.body = this.request.body.toString('utf8');
   });
 
-  await request(server.callback())
-    .post('/')
-    .type('text')
-    .send('qux')
-    .expect(200)
-    .expect('qux');
+  await new Promise((resolve, reject) => {
+    request(server.callback())
+      .post('/')
+      .type('text')
+      .send('qux')
+      .expect(200)
+      .expect('qux')
+      .end((err) => (err ? reject(err) : resolve()));
+  });
 });
 
 test('should throw if the buffer body is too large (options.buffer: true)', async () => {
   const server = koa().use(betterBody({ buffer: true, bufferLimit: '2b' }));
 
-  await request(server.callback())
-    .post('/')
-    .type('text')
-    .send('too large')
-    .expect(413);
+  await new Promise((resolve, reject) => {
+    request(server.callback())
+      .post('/')
+      .type('text')
+      .send('too large')
+      .expect(413)
+      .end((err) => (err ? reject(err) : resolve()));
+  });
 });
 
 test('should get json if `options.buffer` is false (that is the default)', async () => {
@@ -45,9 +55,12 @@ test('should get json if `options.buffer` is false (that is the default)', async
     this.body = this.request.fields;
   });
 
-  await request(server.callback())
-    .post('/')
-    .send('too large')
-    .expect(200)
-    .expect(/"too large":/);
+  await new Promise((resolve, reject) => {
+    request(server.callback())
+      .post('/')
+      .send('too large')
+      .expect(200)
+      .expect(/"too large":/)
+      .end((err) => (err ? reject(err) : resolve()));
+  });
 });

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

@@ -6,28 +6,31 @@
  */
 
 import request from 'supertest';
-import koa from 'koa';
+import Koa from 'koa';
 import betterBody from '../src';
 
-test('should accept opts.extendTypes.custom `foo/bar-x` as text', async () => {
-  let app = koa().use(
-    betterBody({
-      extendTypes: {
-        custom: ['foo/bar-x'],
-      },
+function koa() {
+  return new Koa();
+}
 
-      handler: function* handler(ctx, opts) {
-        expect(typeof ctx).toStrictEqual('object');
-        expect(typeof this).toStrictEqual('object');
-        expect(typeof ctx.request.text).toStrictEqual('function');
-        expect(typeof this.request.text).toStrictEqual('function');
+test('should accept opts.extendTypes.custom `foo/bar-x` as text', async () => {
+  const server = koa()
+    .use(
+      betterBody({
+        extendTypes: {
+          custom: ['foo/bar-x'],
+        },
 
-        this.request.body = yield this.request.text(opts);
-      },
-    }),
-  );
+        handler: function* handler(ctx, opts) {
+          expect(typeof ctx).toStrictEqual('object');
+          expect(typeof this).toStrictEqual('object');
+          expect(typeof ctx.request.text).toStrictEqual('function');
+          expect(typeof this.request.text).toStrictEqual('function');
 
-  app = app
+          this.request.body = yield this.request.text(opts);
+        },
+      }),
+    )
     .use(function* abc(next) {
       expect(this.request.body).toStrictEqual('message=lol');
       this.body = this.request.body;
@@ -38,10 +41,13 @@ test('should accept opts.extendTypes.custom `foo/bar-x` as text', async () => {
       expect(this.body).toStrictEqual('message=lol');
     });
 
-  await request(app.callback())
-    .post('/')
-    .type('foo/bar-x')
-    .send('message=lol')
-    .expect(200)
-    .expect('message=lol');
+  await new Promise((resolve, reject) => {
+    request(server.callback())
+      .post('/')
+      .type('foo/bar-x')
+      .send('message=lol')
+      .expect(200)
+      .expect('message=lol')
+      .end((err) => (err ? reject(err) : resolve()));
+  });
 });

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

@@ -6,54 +6,78 @@
  */
 
 import request from 'supertest';
-import koa from 'koa';
+import Koa from 'koa';
 import betterBody from '../src';
 
+function koa() {
+  return new Koa();
+}
+
 function postBody() {
   return function* sasa(next) {
     this.body = this.request.fields;
     yield* next;
   };
 }
 
-const app = koa()
-  .use(betterBody())
-  .use(postBody());
-
 test('should parse a json body', async () => {
-  await request(app.callback())
-    .post('/')
-    .send({ foo: 'lol' })
-    .expect(200)
-    .expect({ foo: 'lol' });
+  const server = koa()
+    .use(betterBody())
+    .use(postBody());
+
+  await new Promise((resolve, reject) => {
+    request(server.callback())
+      .post('/')
+      .send({ foo: 'lol' })
+      .expect(200)
+      .expect({ foo: 'lol' })
+      .end((err) => (err ? reject(err) : resolve()));
+  });
 });
 
 test('should parse a string json body', async () => {
-  await request(app.callback())
-    .post('/')
-    .type('application/json')
-    .send('{"fao":"nato"}')
-    .expect(200)
-    .expect({ fao: 'nato' });
+  const server = koa()
+    .use(betterBody())
+    .use(postBody());
+
+  await new Promise((resolve, reject) => {
+    request(server.callback())
+      .post('/')
+      .type('application/json')
+      .send('{"fao":"nato"}')
+      .expect(200)
+      .expect({ fao: 'nato' })
+      .end((err) => (err ? reject(err) : resolve()));
+  });
 });
 
 test('should throw on json non-object body in strict mode (default)', async () => {
-  await request(app.callback())
-    .post('/')
-    .type('json')
-    .send('"lol"')
-    .expect(400);
+  const server = koa()
+    .use(betterBody())
+    .use(postBody());
+
+  await new Promise((resolve, reject) => {
+    request(server.callback())
+      .post('/')
+      .type('json')
+      .send('"lol"')
+      .expect(400)
+      .end((err) => (err ? reject(err) : resolve()));
+  });
 });
 
 test('should not throw on non-objects in non-strict mode', async () => {
   const server = koa()
     .use(betterBody({ jsonStrict: false }))
     .use(postBody());
 
-  await request(server.callback())
-    .post('/')
-    .type('json')
-    .send('"foobar"')
-    .expect(200)
-    .expect(/foobar/);
+  await new Promise((resolve, reject) => {
+    request(server.callback())
+      .post('/')
+      .type('json')
+      .send('"foobar"')
+      .expect(200)
+      .expect(/foobar/)
+      .end((err) => (err ? reject(err) : resolve()));
+  });
 });