Skip to content
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
4 changes: 3 additions & 1 deletion packages/goto/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ module.exports = ({ defaultDevice = 'Macbook Pro 13', timeout: globalTimeout, ..
)
}

const abortTypesSet = abortTypes.length > 0 ? new Set(abortTypes) : null

const enableInterception =
(onPageRequest || abortTypes.length > 0) &&
run({
Expand All @@ -245,7 +247,7 @@ module.exports = ({ defaultDevice = 'Macbook Pro 13', timeout: globalTimeout, ..
const resourceType = req.resourceType()
const url = truncate(req.url())

if (!abortTypes.includes(resourceType)) {
if (!abortTypesSet.has(resourceType)) {
debug.continue({ url, resourceType })
return req.continue(
req.continueRequestOverrides(),
Expand Down
29 changes: 28 additions & 1 deletion packages/goto/test/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const { getBrowserContext } = require('@browserless/test')
const { runServer, getBrowserContext } = require('@browserless/test')
const test = require('ava')

test('setup `scripts`', async t => {
Expand Down Expand Up @@ -72,3 +72,30 @@ test('handle page.goto hanging', async t => {

t.true(html.includes('<body></body>'))
})

test('abortTypes keeps behavior with duplicated resource types', async t => {
const browserless = await getBrowserContext(t)
const url = await runServer(t, ({ res }) => {
res.setHeader('content-type', 'text/html')
res.end('<html><body><img src="/asset.png"><h1>ok</h1></body></html>')
})

const run = browserless.withPage((page, goto) => async () => {
const outcomes = []

await goto(page, {
url,
abortTypes: ['image', 'image', 'font'],
onPageRequest: req => {
const resourceType = req.resourceType()
if (resourceType !== 'image') return
outcomes.push(resourceType)
}
})

return outcomes
})

const outcomes = await run()
t.true(outcomes.length >= 1)
})