chore(adblock): use adblock helpers

packages/goto/src/adblock.js

@@ -86,23 +86,11 @@ const setupAutoConsent = async page => {
 const runAutoConsent = page => page.evaluate(autoconsentPlaywrightScript)
 
 const enableBlockingInPage = (page, run, actionTimeout) => {
-  let adblockContext
-
-  page.disableAdblock = () => {
-    // TODO: drop this when https://github.com/ghostery/adblocker/pull/5161 is merged
-    engine.contexts.delete(page)
-
-    if (adblockContext.blocker.config.loadNetworkFilters) {
-      adblockContext.page.off('request', adblockContext.onRequest)
-    }
-
-    if (adblockContext.blocker.config.loadCosmeticFilters) {
-      adblockContext.page.off('frameattached', adblockContext.onFrameNavigated)
-      adblockContext.page.off('domcontentloaded', adblockContext.onDomContentLoaded)
-    }
-
-    debug('disabled')
-  }
+  page.disableAdblock = () =>
+    engine
+      .disableBlockingInPage(page, { keepRequestInterception: true })
+      .then(() => debug('disabled'))
+      .catch(() => {})
 
   return [
     run({
@@ -111,7 +99,7 @@ const enableBlockingInPage = (page, run, actionTimeout) => {
       debug: 'autoconsent:setup'
     }),
     run({
-      fn: engine.enableBlockingInPage(page).then(context => (adblockContext = context)),
+      fn: engine.enableBlockingInPage(page),
       timeout: actionTimeout,
       debug: 'adblock'
     })

packages/goto/test/unit/adblock/index.js

@@ -53,3 +53,44 @@ test('skip autoconsent setup when `adblock` is false', async t => {
 
   t.false(calls.includes('autoconsentSendMessage'))
 })
+
+test('`disableAdblock` removes blocker listeners and keeps request interception enabled', async t => {
+  const browserless = await getBrowserContext(t)
+  const url = await getUrl(t)
+
+  const run = browserless.withPage((page, goto) => async () => {
+    const interceptionCalls = []
+    const originalSetRequestInterception = page.setRequestInterception.bind(page)
+    page.setRequestInterception = enabled => {
+      interceptionCalls.push(enabled)
+      return originalSetRequestInterception(enabled)
+    }
+
+    await goto(page, { url, adblock: true })
+
+    const listenersBeforeDisable = {
+      request: page.listenerCount('request'),
+      frameattached: page.listenerCount('frameattached'),
+      domcontentloaded: page.listenerCount('domcontentloaded')
+    }
+
+    await page.disableAdblock()
+    const listenersAfterDisable = {
+      request: page.listenerCount('request'),
+      frameattached: page.listenerCount('frameattached'),
+      domcontentloaded: page.listenerCount('domcontentloaded')
+    }
+    await page.disableAdblock()
+
+    return { interceptionCalls, listenersBeforeDisable, listenersAfterDisable }
+  })
+
+  const { interceptionCalls, listenersBeforeDisable, listenersAfterDisable } = await run()
+
+  t.true(interceptionCalls.includes(true))
+  t.false(interceptionCalls.includes(false))
+
+  t.true(listenersAfterDisable.request < listenersBeforeDisable.request)
+  t.true(listenersAfterDisable.frameattached <= listenersBeforeDisable.frameattached)
+  t.true(listenersAfterDisable.domcontentloaded <= listenersBeforeDisable.domcontentloaded)
+})