Skip to content
This repository was archived by the owner on May 26, 2023. It is now read-only.

Commit 95a5a3d

Browse files
committedOct 9, 2019
Better aborted request Koa app error tests.
Resolves https://github.com/jaydenseric/graphql-upload/pull/162/files#r331846516 .
1 parent edf7fa4 commit 95a5a3d

3 files changed

+34
-10
lines changed
 

‎src/processRequest.test.mjs

+6-10
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,9 @@ t.test('Aborted request.', async t => {
775775

776776
const finished = new Promise(resolve => (finish = resolve))
777777
const app = new Koa()
778+
.on('error', error =>
779+
t.matchSnapshot(snapshotError(error), 'Middleware throws.')
780+
)
778781
.use(async (ctx, next) => {
779782
requestHasBeenReceived()
780783
await next()
@@ -800,9 +803,6 @@ t.test('Aborted request.', async t => {
800803
finish()
801804
})
802805

803-
let appErrors = 0
804-
app.on('error', () => appErrors++)
805-
806806
const port = await startServer(t, app)
807807

808808
await sendRequest(port, requestHasBeenReceivedPromise)
@@ -817,8 +817,6 @@ t.test('Aborted request.', async t => {
817817
if (!fileB.capacitor.closed)
818818
await new Promise(resolve => fileB.capacitor.once('close', resolve))
819819
t.false(fs.existsSync(fileB.capacitor.path), 'Cleanup B.')
820-
821-
await t.equals(appErrors, 1)
822820
})
823821

824822
await t.test('Express middleware.', async t => {
@@ -911,6 +909,9 @@ t.test('Aborted request.', async t => {
911909

912910
const finished = new Promise(resolve => (finish = resolve))
913911
const app = new Koa()
912+
.on('error', error =>
913+
t.matchSnapshot(snapshotError(error), 'Middleware throws.')
914+
)
914915
.use(async (ctx, next) => {
915916
requestHasBeenReceived()
916917
await next()
@@ -941,9 +942,6 @@ t.test('Aborted request.', async t => {
941942
finish()
942943
})
943944

944-
let appErrors = 0
945-
app.on('error', () => appErrors++)
946-
947945
const port = await startServer(t, app)
948946

949947
await sendRequest(port, requestHasBeenReceivedPromise)
@@ -958,8 +956,6 @@ t.test('Aborted request.', async t => {
958956
if (!fileB.capacitor.closed)
959957
await new Promise(resolve => fileB.capacitor.once('close', resolve))
960958
t.false(fs.existsSync(fileB.capacitor.path), 'Cleanup B.')
961-
962-
t.equals(appErrors, 1)
963959
})
964960

965961
await t.test('Express middleware.', async t => {

‎tap-snapshots/lib-processRequest.test.js-TAP.test.js

+14
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ exports[`lib/processRequest.test.js TAP Aborted request. Delayed stream creation
3535
}
3636
`
3737

38+
exports[`lib/processRequest.test.js TAP Aborted request. Delayed stream creation. Koa middleware. > Middleware throws. 1`] = `
39+
{
40+
"name": "Error",
41+
"message": "Parse Error"
42+
}
43+
`
44+
3845
exports[`lib/processRequest.test.js TAP Aborted request. Delayed stream creation. Koa middleware. Upload A. > Stream error. 1`] = `
3946
{
4047
"name": "BadRequestError",
@@ -93,6 +100,13 @@ exports[`lib/processRequest.test.js TAP Aborted request. Immediate stream creati
93100
}
94101
`
95102

103+
exports[`lib/processRequest.test.js TAP Aborted request. Immediate stream creation. Koa middleware. > Middleware throws. 1`] = `
104+
{
105+
"name": "Error",
106+
"message": "Parse Error"
107+
}
108+
`
109+
96110
exports[`lib/processRequest.test.js TAP Aborted request. Immediate stream creation. Koa middleware. Upload A. > Enumerable properties. 1`] = `
97111
{
98112
"filename": "a.txt",

‎tap-snapshots/lib-processRequest.test.mjs-TAP.test.js

+14
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ exports[`lib/processRequest.test.mjs TAP Aborted request. Delayed stream creatio
3535
}
3636
`
3737

38+
exports[`lib/processRequest.test.mjs TAP Aborted request. Delayed stream creation. Koa middleware. > Middleware throws. 1`] = `
39+
{
40+
"name": "Error",
41+
"message": "Parse Error"
42+
}
43+
`
44+
3845
exports[`lib/processRequest.test.mjs TAP Aborted request. Delayed stream creation. Koa middleware. Upload A. > Stream error. 1`] = `
3946
{
4047
"name": "BadRequestError",
@@ -93,6 +100,13 @@ exports[`lib/processRequest.test.mjs TAP Aborted request. Immediate stream creat
93100
}
94101
`
95102

103+
exports[`lib/processRequest.test.mjs TAP Aborted request. Immediate stream creation. Koa middleware. > Middleware throws. 1`] = `
104+
{
105+
"name": "Error",
106+
"message": "Parse Error"
107+
}
108+
`
109+
96110
exports[`lib/processRequest.test.mjs TAP Aborted request. Immediate stream creation. Koa middleware. Upload A. > Enumerable properties. 1`] = `
97111
{
98112
"filename": "a.txt",

0 commit comments

Comments
 (0)
This repository has been archived.