Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from koajs:master #140

Merged
merged 2 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintrc.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [12.17.0, 12.x, 14.x, 16.x, 18.x]
node-version: [12.17.0, 12.x, 14.x, 16.x, 18.x, 20.x]

steps:
- uses: actions/checkout@v2
Expand Down
3 changes: 1 addition & 2 deletions __tests__/application/compose.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('supertest')
Expand Down Expand Up @@ -37,7 +36,7 @@ describe('app.compose', () => {
const calls = []
let count = 0
const app = new Koa({
compose (fns){
compose (fns) {
return async (ctx) => {
const dispatch = async () => {
count++
Expand Down
1 change: 0 additions & 1 deletion __tests__/application/context.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('supertest')
Expand Down
1 change: 0 additions & 1 deletion __tests__/application/currentContext.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('supertest')
Expand Down
1 change: 0 additions & 1 deletion __tests__/application/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('supertest')
Expand Down
1 change: 0 additions & 1 deletion __tests__/application/inspect.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/application/onerror.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/application/request.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('supertest')
Expand Down
1 change: 0 additions & 1 deletion __tests__/application/respond.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('supertest')
Expand Down
1 change: 0 additions & 1 deletion __tests__/application/response.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('supertest')
Expand Down
1 change: 0 additions & 1 deletion __tests__/application/toJSON.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/application/use.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('supertest')
Expand Down
1 change: 0 additions & 1 deletion __tests__/context/assert.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const context = require('../../test-helpers/context')
Expand Down
3 changes: 1 addition & 2 deletions __tests__/context/cookies.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down Expand Up @@ -100,7 +99,7 @@ describe('ctx.cookies', () => {

app.use((ctx, next) => {
ctx.cookies = {
set (key, value){
set (key, value) {
ctx.set(key, value)
}
}
Expand Down
1 change: 0 additions & 1 deletion __tests__/context/inspect.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const prototype = require('../../lib/context')
Expand Down
1 change: 0 additions & 1 deletion __tests__/context/state.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('supertest')
Expand Down
1 change: 0 additions & 1 deletion __tests__/context/throw.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const context = require('../../test-helpers/context')
Expand Down
1 change: 0 additions & 1 deletion __tests__/context/toJSON.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
2 changes: 1 addition & 1 deletion __tests__/load-with-esm.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const assert = require('assert')
let importESM = () => {}

describe.skip('Load with esm', () => {
beforeAll(function (){
beforeAll(function () {
// ESM support is flagged on v12.x.
const majorVersion = +process.version.split('.')[0].slice(1)
if (majorVersion < 12) {
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/accept.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const Accept = require('accepts')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/accepts.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/acceptsCharsets.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/acceptsEncodings.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/acceptsLanguages.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/charset.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('../../test-helpers/context').request
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/fresh.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/get.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/header.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/headers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/host.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('../../test-helpers/context').request
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/hostname.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('../../test-helpers/context').request
Expand Down
5 changes: 2 additions & 3 deletions __tests__/request/href.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand All @@ -15,7 +14,7 @@ describe('ctx.href', () => {
headers: {
host: 'localhost'
},
socket: socket,
socket,
__proto__: Stream.Readable.prototype
}
const ctx = context(req)
Expand All @@ -30,7 +29,7 @@ describe('ctx.href', () => {
app.use(ctx => {
ctx.body = ctx.href
})
app.listen(function (){
app.listen(function () {
const address = this.address()
http.get({
host: 'localhost',
Expand Down
3 changes: 1 addition & 2 deletions __tests__/request/idempotent.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand All @@ -8,7 +7,7 @@ describe('ctx.idempotent', () => {
describe('when the request method is idempotent', () => {
it('should return true', () => {
['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS', 'TRACE'].forEach(check)
function check (method){
function check (method) {
const req = request()
req.method = method
assert.strictEqual(req.idempotent, true)
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/inspect.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('../../test-helpers/context').request
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/ip.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/ips.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/is.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const context = require('../../test-helpers/context')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/length.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('../../test-helpers/context').request
Expand Down
3 changes: 1 addition & 2 deletions __tests__/request/origin.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand All @@ -13,7 +12,7 @@ describe('ctx.origin', () => {
headers: {
host: 'localhost'
},
socket: socket,
socket,
__proto__: Stream.Readable.prototype
}
const ctx = context(req)
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/path.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/protocol.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/query.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/querystring.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/search.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/secure.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/stale.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/subdomains.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/request/type.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('../../test-helpers/context').request
Expand Down
5 changes: 2 additions & 3 deletions __tests__/request/whatwg-url.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('../../test-helpers/context').request
Expand All @@ -7,14 +6,14 @@ const assert = require('assert')
describe('req.URL', () => {
it('should not throw when host is void', () => {
// Accessing the URL should not throw.
request().URL
request().URL // eslint-disable-line no-unused-expressions
})

it('should not throw when header.host is invalid', () => {
const req = request()
req.header.host = 'invalid host'
// Accessing the URL should not throw.
req.URL
req.URL // eslint-disable-line no-unused-expressions
})

it('should return empty object when invalid', () => {
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/append.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/attachment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/body.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const response = require('../../test-helpers/context').response
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/etag.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
3 changes: 1 addition & 2 deletions __tests__/response/flushHeaders.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const request = require('supertest')
Expand Down Expand Up @@ -100,7 +99,7 @@ describe('ctx.flushHeaders()', () => {
}, 10000)
})

app.listen(function (err){
app.listen(function (err) {
if (err) return done(err)

const port = this.address().port
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/get.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/has.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/header.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/headers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/inspect.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const response = require('../../test-helpers/context').response
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/is.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const context = require('../../test-helpers/context')
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/last-modified.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const assert = require('assert')
Expand Down
1 change: 0 additions & 1 deletion __tests__/response/length.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

'use strict'

const response = require('../../test-helpers/context').response
Expand Down
Loading
Loading