test: switch tests to jest

koajs · Aug 18, 2021 · 4545b59 · 4545b59
1 parent 596cfd5
commit 4545b59
Show file tree

Hide file tree

Showing 73 changed files with 9,537 additions and 10,401 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -23,5 +23,5 @@ jobs:
  node-version: ${{ matrix.node-version }}
  - run: npm ci
  - run: npm run lint
- - run: npm run test-cov
+ - run: npm test -- --coverage --maxWorkers 2
  - run: npx codecov
diff --git a/test/.eslintrc.yml → __tests__/.eslintrc.yml b/test/.eslintrc.yml → __tests__/.eslintrc.yml
@@ -1,5 +1,5 @@
 env:
- mocha: true
+ jest: true
 
 rules:
  space-before-blocks: [2, {functions: never, keywords: always}]

diff --git a/test/application/context.js → __tests__/application/context.js b/test/application/context.js → __tests__/application/context.js
diff --git a/test/application/index.js → __tests__/application/index.js b/test/application/index.js → __tests__/application/index.js
diff --git a/test/application/inspect.js → __tests__/application/inspect.js b/test/application/inspect.js → __tests__/application/inspect.js
diff --git a/test/application/onerror.js → __tests__/application/onerror.js b/test/application/onerror.js → __tests__/application/onerror.js
@@ -3,11 +3,8 @@
 
 const assert = require('assert');
 const Koa = require('../..');
-const mm = require('mm');
 
 describe('app.onerror(err)', () => {
- afterEach(mm.restore);
-
  it('should throw an error if a non-error is given', () => {
  const app = new Koa();
 
@@ -34,21 +31,21 @@ describe('app.onerror(err)', () => {
 
  err.status = 404;
 
- let called = false;
- mm(console, 'error', () => { called = true; });
+ const spy = jest.spyOn(console, 'error');
  app.onerror(err);
- assert(!called);
+ expect(spy).not.toHaveBeenCalled();
+ spy.mockRestore();
  });
 
  it('should do nothing if .silent', () => {
  const app = new Koa();
  app.silent = true;
  const err = new Error();
 
- let called = false;
- mm(console, 'error', () => { called = true; });
+ const spy = jest.spyOn(console, 'error');
  app.onerror(err);
- assert(!called);
+ expect(spy).not.toHaveBeenCalled();
+ spy.mockRestore();
  });
 
  it('should log the error to stderr', () => {
@@ -58,28 +55,9 @@ describe('app.onerror(err)', () => {
  const err = new Error();
  err.stack = 'Foo';
 
- let msg = '';
- mm(console, 'error', input => {
- if (input) msg = input;
- });
- app.onerror(err);
- assert(msg === '\n Foo\n');
- });
-
- it('should use err.toString() instead of err.stack', () => {
- const app = new Koa();
- app.env = 'dev';
-
- const err = new Error('mock stack null');
- err.stack = null;
-
- app.onerror(err);
-
- let msg = '';
- mm(console, 'error', input => {
- if (input) msg = input;
- });
+ const spy = jest.spyOn(console, 'error');
  app.onerror(err);
- assert(msg === '\n Error: mock stack null\n');
+ expect(spy).toHaveBeenCalled();
+ spy.mockRestore();
  });
 });
diff --git a/test/application/request.js → __tests__/application/request.js b/test/application/request.js → __tests__/application/request.js
diff --git a/test/application/respond.js → __tests__/application/respond.js b/test/application/respond.js → __tests__/application/respond.js
@@ -189,7 +189,7 @@ describe('app.respond', () => {
  .head('/')
  .expect(200);
 
- assert.strictEqual(res.header['content-length'], length);
+ assert.strictEqual(~~res.header['content-length'], length);
  assert(!res.text);
  });
 

diff --git a/test/application/response.js → __tests__/application/response.js b/test/application/response.js → __tests__/application/response.js
diff --git a/test/application/toJSON.js → __tests__/application/toJSON.js b/test/application/toJSON.js → __tests__/application/toJSON.js
diff --git a/test/application/use.js → __tests__/application/use.js b/test/application/use.js → __tests__/application/use.js
diff --git a/test/context/assert.js → __tests__/context/assert.js b/test/context/assert.js → __tests__/context/assert.js
@@ -1,7 +1,7 @@
 
 'use strict';
 
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 const assert = require('assert');
 
 describe('ctx.assert(value, status)', () => {

diff --git a/test/context/cookies.js → __tests__/context/cookies.js b/test/context/cookies.js → __tests__/context/cookies.js
diff --git a/test/context/inspect.js → __tests__/context/inspect.js b/test/context/inspect.js → __tests__/context/inspect.js
@@ -4,7 +4,7 @@
 const prototype = require('../../lib/context');
 const assert = require('assert');
 const util = require('util');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.inspect()', () => {
  it('should return a json representation', () => {

diff --git a/test/context/onerror.js → __tests__/context/onerror.js b/test/context/onerror.js → __tests__/context/onerror.js
@@ -3,7 +3,7 @@
 const assert = require('assert');
 const request = require('supertest');
 const Koa = require('../..');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.onerror(err)', () => {
  it('should respond', () => {
@@ -276,7 +276,7 @@ describe('ctx.onerror(err)', () => {
  const app = new Koa();
 
  app.on('error', err => {
- assert.strictEqual(err, 'Error: non-error thrown: {"key":"value"}');
+ assert.strictEqual(err.message, 'non-error thrown: {"key":"value"}');
  done();
  });
 

diff --git a/test/context/state.js → __tests__/context/state.js b/test/context/state.js → __tests__/context/state.js
diff --git a/test/context/throw.js → __tests__/context/throw.js b/test/context/throw.js → __tests__/context/throw.js
@@ -1,7 +1,7 @@
 
 'use strict';
 
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 const assert = require('assert');
 
 describe('ctx.throw(msg)', () => {

diff --git a/test/context/toJSON.js → __tests__/context/toJSON.js b/test/context/toJSON.js → __tests__/context/toJSON.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.toJSON()', () => {
  it('should return a json representation', () => {

diff --git a/test/load-with-esm.js → __tests__/load-with-esm.js b/test/load-with-esm.js → __tests__/load-with-esm.js
@@ -2,8 +2,8 @@ const assert = require('assert');
 
 let importESM = () => {};
 
-describe('Load with esm', () => {
- before(function(){
+describe.skip('Load with esm', () => {
+ beforeAll(function(){
  // ESM support is flagged on v12.x.
  const majorVersion = +process.version.split('.')[0].slice(1);
  if (majorVersion < 12) {

diff --git a/test/request/accept.js → __tests__/request/accept.js b/test/request/accept.js → __tests__/request/accept.js
@@ -3,7 +3,7 @@
 
 const Accept = require('accepts');
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.accept', () => {
  it('should return an Accept instance', () => {

diff --git a/test/request/accepts.js → __tests__/request/accepts.js b/test/request/accepts.js → __tests__/request/accepts.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.accepts(types)', () => {
  describe('with no arguments', () => {

diff --git a/test/request/acceptsCharsets.js → __tests__/request/acceptsCharsets.js b/test/request/acceptsCharsets.js → __tests__/request/acceptsCharsets.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.acceptsCharsets()', () => {
  describe('with no arguments', () => {

diff --git a/test/request/acceptsEncodings.js → __tests__/request/acceptsEncodings.js b/test/request/acceptsEncodings.js → __tests__/request/acceptsEncodings.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.acceptsEncodings()', () => {
  describe('with no arguments', () => {

diff --git a/test/request/acceptsLanguages.js → __tests__/request/acceptsLanguages.js b/test/request/acceptsLanguages.js → __tests__/request/acceptsLanguages.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.acceptsLanguages(langs)', () => {
  describe('with no arguments', () => {

diff --git a/test/request/charset.js → __tests__/request/charset.js b/test/request/charset.js → __tests__/request/charset.js
@@ -1,7 +1,7 @@
 
 'use strict';
 
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 const assert = require('assert');
 
 describe('req.charset', () => {

diff --git a/test/request/fresh.js → __tests__/request/fresh.js b/test/request/fresh.js → __tests__/request/fresh.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.fresh', () => {
  describe('the request method is not GET and HEAD', () => {

diff --git a/test/request/get.js → __tests__/request/get.js b/test/request/get.js → __tests__/request/get.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.get(name)', () => {
  it('should return the field value', () => {

diff --git a/test/request/header.js → __tests__/request/header.js b/test/request/header.js → __tests__/request/header.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 
 describe('req.header', () => {
  it('should return the request header object', () => {

diff --git a/test/request/headers.js → __tests__/request/headers.js b/test/request/headers.js → __tests__/request/headers.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 
 describe('req.headers', () => {
  it('should return the request header object', () => {

diff --git a/test/request/host.js → __tests__/request/host.js b/test/request/host.js → __tests__/request/host.js
@@ -1,7 +1,7 @@
 
 'use strict';
 
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 const assert = require('assert');
 
 describe('req.host', () => {

diff --git a/test/request/hostname.js → __tests__/request/hostname.js b/test/request/hostname.js → __tests__/request/hostname.js
@@ -1,7 +1,7 @@
 
 'use strict';
 
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 const assert = require('assert');
 
 describe('req.hostname', () => {

diff --git a/test/request/href.js → __tests__/request/href.js b/test/request/href.js → __tests__/request/href.js
@@ -5,7 +5,7 @@ const assert = require('assert');
 const Stream = require('stream');
 const http = require('http');
 const Koa = require('../../');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.href', () => {
  it('should return the full request url', () => {

diff --git a/test/request/idempotent.js → __tests__/request/idempotent.js b/test/request/idempotent.js → __tests__/request/idempotent.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 
 describe('ctx.idempotent', () => {
  describe('when the request method is idempotent', () => {

diff --git a/test/request/inspect.js → __tests__/request/inspect.js b/test/request/inspect.js → __tests__/request/inspect.js
@@ -1,7 +1,7 @@
 
 'use strict';
 
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 const assert = require('assert');
 const util = require('util');
 

diff --git a/test/request/ip.js → __tests__/request/ip.js b/test/request/ip.js → __tests__/request/ip.js
@@ -4,7 +4,7 @@
 const assert = require('assert');
 const Stream = require('stream');
 const Koa = require('../..');
-const Request = require('../helpers/context').request;
+const Request = require('../../test-helpers/context').request;
 
 describe('req.ip', () => {
  describe('with req.ips present', () => {

diff --git a/test/request/ips.js → __tests__/request/ips.js b/test/request/ips.js → __tests__/request/ips.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 
 describe('req.ips', () => {
  describe('when X-Forwarded-For is present', () => {

diff --git a/test/request/is.js → __tests__/request/is.js b/test/request/is.js → __tests__/request/is.js
@@ -1,7 +1,7 @@
 
 'use strict';
 
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 const assert = require('assert');
 
 describe('ctx.is(type)', () => {

diff --git a/test/request/length.js → __tests__/request/length.js b/test/request/length.js → __tests__/request/length.js
@@ -1,7 +1,7 @@
 
 'use strict';
 
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 const assert = require('assert');
 
 describe('ctx.length', () => {

diff --git a/test/request/origin.js → __tests__/request/origin.js b/test/request/origin.js → __tests__/request/origin.js
@@ -3,7 +3,7 @@
 
 const assert = require('assert');
 const Stream = require('stream');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.origin', () => {
  it('should return the origin of url', () => {

diff --git a/test/request/path.js → __tests__/request/path.js b/test/request/path.js → __tests__/request/path.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 const parseurl = require('parseurl');
 
 describe('ctx.path', () => {

diff --git a/test/request/protocol.js → __tests__/request/protocol.js b/test/request/protocol.js → __tests__/request/protocol.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 
 describe('req.protocol', () => {
  describe('when encrypted', () => {

diff --git a/test/request/query.js → __tests__/request/query.js b/test/request/query.js → __tests__/request/query.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.query', () => {
  describe('when missing', () => {

diff --git a/test/request/querystring.js → __tests__/request/querystring.js b/test/request/querystring.js → __tests__/request/querystring.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 const parseurl = require('parseurl');
 
 describe('ctx.querystring', () => {

diff --git a/test/request/search.js → __tests__/request/search.js b/test/request/search.js → __tests__/request/search.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const context = require('../helpers/context');
+const context = require('../../test-helpers/context');
 
 describe('ctx.search=', () => {
  it('should replace the search', () => {

diff --git a/test/request/secure.js → __tests__/request/secure.js b/test/request/secure.js → __tests__/request/secure.js
@@ -2,7 +2,7 @@
 'use strict';
 
 const assert = require('assert');
-const request = require('../helpers/context').request;
+const request = require('../../test-helpers/context').request;
 
 describe('req.secure', () => {
  it('should return true when encrypted', () => {