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.

Sign up for GitHub

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

Improve code coverage #162

Merged
merged 11 commits into from
Oct 9, 2019
Merged

Improve code coverage #162

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
46c9513
Remove impossible conditions
mike-marcacci Oct 7, 2019
a341dc1
Fix #130 - Error in test logs
mike-marcacci Oct 7, 2019
56cf53e
fix inadvertant only in test
mike-marcacci Oct 7, 2019
9059bde
Test processRequest with Node HTTP
mike-marcacci Oct 7, 2019
3ffacba
Ignore two lines for code coverage
mike-marcacci Oct 7, 2019
85e8435
Enforce 100% code coverage.
jaydenseric Oct 8, 2019
ab8a515
Tweak a test name and update the changelog.
jaydenseric Oct 8, 2019
3bca7fe
Add PR and issue links to the changelog entry.
jaydenseric Oct 8, 2019
aed243c
Better handling of events related to aborted requests.
jaydenseric Oct 9, 2019
edf7fa4
Remove unnecessary initial value.
jaydenseric Oct 9, 2019
95a5a3d
Better aborted request Koa app error tests.
jaydenseric Oct 9, 2019
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
4 changes: 1 addition & 3 deletions src/processRequest.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ export const processRequest = (

currentStream = stream
stream.on('end', () => {
if (currentStream === stream) currentStream = null
currentStream = null
})

const upload = map.get(fieldName)
Expand All @@ -295,7 +295,6 @@ export const processRequest = (
})

stream.on('limit', () => {
if (currentStream === stream) currentStream = null
stream.unpipe()
capacitor.destroy(
createError(
Expand All @@ -306,7 +305,6 @@ export const processRequest = (
})

stream.on('error', error => {
if (currentStream === stream) currentStream = null
stream.unpipe()
capacitor.destroy(exitError || error)
})
Expand Down
17 changes: 14 additions & 3 deletions src/processRequest.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ t.test('Handles unconsumed uploads.', async t => {
})
})

t.test('Aborted request.', async t => {
t.only('Aborted request.', async t => {
mike-marcacci marked this conversation as resolved.
Show resolved Hide resolved
const sendRequest = (port, requestHasBeenReceived) =>
new Promise((resolve, reject) => {
const body = new FormData()
Expand Down Expand Up @@ -720,7 +720,7 @@ t.test('Aborted request.', async t => {
}

await t.test('Koa middleware.', async t => {
t.plan(5)
t.plan(6)

let requestHasBeenReceived
const requestHasBeenReceivedPromise = new Promise(
Expand Down Expand Up @@ -757,6 +757,9 @@ t.test('Aborted request.', async t => {
finish()
})

let appErrors = 0
app.on('error', () => appErrors++)
jaydenseric marked this conversation as resolved.
Show resolved Hide resolved

const port = await startServer(t, app)

await sendRequest(port, requestHasBeenReceivedPromise)
Expand All @@ -771,6 +774,8 @@ t.test('Aborted request.', async t => {
if (!fileB.capacitor.closed)
await new Promise(resolve => fileB.capacitor.once('close', resolve))
t.false(fs.existsSync(fileB.capacitor.path), 'Cleanup B.')

await t.equals(appErrors, 1)
})

await t.test('Express middleware.', async t => {
Expand Down Expand Up @@ -851,7 +856,7 @@ t.test('Aborted request.', async t => {
}

await t.test('Koa middleware.', async t => {
t.plan(5)
t.plan(6)

let requestHasBeenReceived
const requestHasBeenReceivedPromise = new Promise(
Expand Down Expand Up @@ -893,7 +898,11 @@ t.test('Aborted request.', async t => {
finish()
})

let appErrors = 0
app.on('error', () => appErrors++)
jaydenseric marked this conversation as resolved.
Show resolved Hide resolved

const port = await startServer(t, app)

await sendRequest(port, requestHasBeenReceivedPromise)
await finished

Expand All @@ -906,6 +915,8 @@ t.test('Aborted request.', async t => {
if (!fileB.capacitor.closed)
await new Promise(resolve => fileB.capacitor.once('close', resolve))
t.false(fs.existsSync(fileB.capacitor.path), 'Cleanup B.')

t.equals(appErrors, 1)
})

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