test: use @browserless/test

package.json

@@ -56,6 +56,7 @@
     "top-sites": "~1.1.220"
   },
   "devDependencies": {
+    "@browserless/test": "latest",
     "@commitlint/cli": "latest",
     "@commitlint/config-conventional": "latest",
     "@ksmithut/prettier-standard": "latest",

test/encoding.js

@@ -1,30 +1,38 @@
 'use strict'
 
+const { getBrowserContext } = require('@browserless/test')
 const test = require('ava')
 
-const { runFixtureServer, initBrowserless } = require('./helpers')
+const { runFixtureServer } = require('./helpers')
 const getHTML = require('..')
 
-const getBrowserless = initBrowserless(test)
-
 ;[false, true].forEach(prerender => {
   const mode = prerender ? 'prerender' : 'fetch'
 
   test(`${mode} » Shift-JIS`, async t => {
     const url = await runFixtureServer(t, '51242_54045.html')
-    const { html } = await getHTML(url, { prerender, getBrowserless })
+    const { html } = await getHTML(url, {
+      prerender,
+      getBrowserless: () => getBrowserContext(t)
+    })
     t.true(html.includes('或る日の小せん'))
   })
 
   test(`${mode} » Windows-1250`, async t => {
     const url = await runFixtureServer(t, 'rp.pl.html')
-    const { html } = await getHTML(url, { prerender, getBrowserless })
+    const { html } = await getHTML(url, {
+      prerender,
+      getBrowserless: () => getBrowserContext(t)
+    })
     t.true(html.includes('majątków'))
   })
 
   test(`${mode} » UTF-8`, async t => {
     const url = await runFixtureServer(t, 'utf8.with.meta.html')
-    const { html } = await getHTML(url, { prerender, getBrowserless })
+    const { html } = await getHTML(url, {
+      prerender,
+      getBrowserless: () => getBrowserContext(t)
+    })
     t.true(html.includes('日本語'))
   })
 })

test/helpers.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const { default: listen } = require('async-listen')
-const createBrowserless = require('browserless')
 const dateRegex = require('regex-iso-date')
 const { createServer } = require('http')
 const pretty = require('pretty')
@@ -18,12 +17,6 @@ const closeServer = server =>
 const fixture = name =>
   fs.readFileSync(path.join(__dirname, '/fixtures/', name))
 
-const initBrowserless = test => {
-  const browserlessFactory = createBrowserless()
-  test.after.always(browserlessFactory.close)
-  return () => browserlessFactory.createContext()
-}
-
 const runServer = async (t, fn) => {
   const server = createServer(fn)
   const url = await listen(server)
@@ -42,7 +35,6 @@ const prettyHtml = html =>
 
 module.exports = {
   createHeaders,
-  initBrowserless,
   prettyHtml,
   runFixtureServer,
   runServer

test/index.js

@@ -1,14 +1,13 @@
 'use strict'
 
+const { getBrowserContext } = require('@browserless/test')
 const PCancelable = require('p-cancelable')
 const cheerio = require('cheerio')
 const test = require('ava')
 
-const { initBrowserless, runServer, prettyHtml } = require('./helpers')
+const { runServer, prettyHtml } = require('./helpers')
 const getHTML = require('..')
 
-const getBrowserless = initBrowserless(test)
-
 const wait = async (promise, prop) => {
   const res = await promise
   return prop ? res[prop] : res
@@ -37,17 +36,23 @@ test('promise is cancelable', async t => {
 test('reachable URL', async t => {
   const url = 'https://example.com'
   const [prerenderDisabled, prerenderEnabled] = await Promise.all([
-    getHTML(url, { prerender: false, getBrowserless }),
+    getHTML(url, {
+      prerender: false,
+      getBrowserless: () => getBrowserContext(t)
+    }),
     getHTML(url, {
       prerender: true,
-      getBrowserless,
+      getBrowserless: () => getBrowserContext(t),
       puppeteerOpts: { adblock: false }
     })
   ])
 
   t.is(
     await wait(
-      getHTML(url, { prerender: false, getBrowserless }),
+      getHTML(url, {
+        prerender: false,
+        getBrowserless: () => getBrowserContext(t)
+      }),
       'statusCode'
     ),
     200
@@ -56,7 +61,7 @@ test('reachable URL', async t => {
     await wait(
       getHTML(url, {
         prerender: true,
-        getBrowserless,
+        getBrowserless: () => getBrowserContext(t),
         puppeteerOpts: { adblock: false }
       }),
       'statusCode'
@@ -82,12 +87,12 @@ test('timeout URL', async t => {
   const [prerenderDisabled, prerenderEnabled] = await Promise.all([
     getHTML(url, {
       prerender: false,
-      getBrowserless,
+      getBrowserless: () => getBrowserContext(t),
       gotOpts: { timeout: 1000 }
     }),
     getHTML(url, {
       prerender: true,
-      getBrowserless,
+      getBrowserless: () => getBrowserContext(t),
       puppeteerOpts: { timeout: 2000, adblock: false }
     })
   ])
@@ -102,10 +107,13 @@ test('unreachable URL', async t => {
   const url = 'https://notexisturl.dev'
 
   const [prerenderDisabled, prerenderEnabled] = await Promise.all([
-    getHTML(url, { prerender: false, getBrowserless }),
+    getHTML(url, {
+      prerender: false,
+      getBrowserless: () => getBrowserContext(t)
+    }),
     getHTML(url, {
       prerender: true,
-      getBrowserless,
+      getBrowserless: () => getBrowserContext(t),
       puppeteerOpts: { adblock: false }
     })
   ])
@@ -120,7 +128,7 @@ test('from audio URL', async t => {
   const targetUrl =
     'https://audiodemos.github.io/vctk_set0/embedadapt_100sample.wav'
   const { url, stats, html } = await getHTML(targetUrl, {
-    getBrowserless,
+    getBrowserless: () => getBrowserContext(t),
     prerender: false
   })
 
@@ -131,7 +139,9 @@ test('from audio URL', async t => {
 
 test('from image URL', async t => {
   const targetUrl = 'https://kikobeats.com/images/avatar.jpg'
-  const { url, stats, html } = await getHTML(targetUrl, { getBrowserless })
+  const { url, stats, html } = await getHTML(targetUrl, {
+    getBrowserless: () => getBrowserContext(t)
+  })
 
   t.is(stats.mode, 'fetch')
   t.is(url, targetUrl)
@@ -144,15 +154,19 @@ test('from image URL', async t => {
 
 test('from SVG image URL', async t => {
   const targetUrl = 'https://cdn.microlink.io/file-examples/sample.svg'
-  const { stats } = await getHTML(targetUrl, { getBrowserless })
+  const { stats } = await getHTML(targetUrl, {
+    getBrowserless: () => getBrowserContext(t)
+  })
   t.true(stats.timing < 3000)
   t.is(stats.mode, 'fetch')
 })
 
 test('from big image URL', async t => {
   const targetUrl =
     'https://static.jutarnji.hr/images/live-multimedia/binary/2016/6/17/10/iStock_82744687_XXLARGE.jpg'
-  const { stats } = await getHTML(targetUrl, { getBrowserless })
+  const { stats } = await getHTML(targetUrl, {
+    getBrowserless: () => getBrowserContext(t)
+  })
   t.true(stats.timing < 3000)
   t.is(stats.mode, 'fetch')
 })
@@ -162,7 +176,7 @@ test('from URL with no content type', async t => {
     res.end('<!doctype html><title>.</title>')
   })
   const { stats } = await getHTML(targetUrl, {
-    getBrowserless,
+    getBrowserless: () => getBrowserContext(t),
     prerender: false
   })
   t.is(stats.mode, 'fetch')
@@ -171,7 +185,9 @@ test('from URL with no content type', async t => {
 test('from image URL that returns HTML markup', async t => {
   const targetUrl =
     'https://www.europapress.es/chance/gente/%7B%7BrutaFoto%7D%7D%7B%7Bfechor%7D%7D_%7B%7BanchoFoto%7D%7D_%7B%7BaltoFoto%7D%7D%7B%7BversionFoto%7D%7D.jpg'
-  const { stats } = await getHTML(targetUrl, { getBrowserless })
+  const { stats } = await getHTML(targetUrl, {
+    getBrowserless: () => getBrowserContext(t)
+  })
   t.true(stats.timing < 3000)
   t.is(stats.mode, 'fetch')
 })
@@ -180,7 +196,7 @@ test('from video URL', async t => {
   const targetUrl = 'https://cdn.microlink.io/file-examples/sample.mp4'
   const { url, stats, html } = await getHTML(targetUrl, {
     prerender: false,
-    getBrowserless
+    getBrowserless: () => getBrowserContext(t)
   })
 
   t.is(stats.mode, 'fetch')
@@ -192,7 +208,7 @@ test('from bad SSL URL', async t => {
   const targetUrl = 'https://self-signed.badssl.com/'
   const { url, stats, html } = await getHTML(targetUrl, {
     prerender: false,
-    getBrowserless,
+    getBrowserless: () => getBrowserContext(t),
     gotOpts: {
       https: { rejectUnauthorized: false }
     }

test/mode.js

@@ -1,28 +1,31 @@
 'use strict'
 
+const { getBrowserContext } = require('@browserless/test')
 const test = require('ava')
 
 const getHTML = require('../src')
-const { initBrowserless } = require('./helpers')
-
-const getBrowserless = initBrowserless(test)
 
 test('`{ prerender: true }`', async t => {
   const url = 'https://example.com'
-  const { stats } = await getHTML(url, { getBrowserless })
+  const { stats } = await getHTML(url, {
+    getBrowserless: () => getBrowserContext(t)
+  })
   t.is(stats.mode, 'prerender')
 })
 
 test('`{ prerender: false }`', async t => {
   const url = 'https://example.com'
-  const { stats } = await getHTML(url, { prerender: false, getBrowserless })
+  const { stats } = await getHTML(url, {
+    prerender: false,
+    getBrowserless: () => getBrowserContext(t)
+  })
   t.is(stats.mode, 'fetch')
 })
 
 test("`{ prerender: 'auto' }`", async t => {
   const url = 'https://google.com'
   const { stats } = await getHTML(url, {
-    getBrowserless,
+    getBrowserless: () => getBrowserContext(t),
     puppeteerOpts: { adblock: false }
   })
   t.is(stats.mode, 'fetch')
@@ -33,7 +36,7 @@ test.skip('prerender error fallback into fetch mode', async t => {
     'https://www.sportsnet.ca/hockey/nhl/leafs-john-tavares-return-new-york-hope-positive/'
   const { stats, html } = await getHTML(url, {
     prerender: true,
-    getBrowserless,
+    getBrowserless: () => getBrowserContext(t),
     puppeteerOpts: { adblock: false }
   })
   t.true(!!html)

test/pdf.js

@@ -1,21 +1,20 @@
 'use strict'
 
+const { getBrowserContext } = require('@browserless/test')
 const cheerio = require('cheerio')
 const test = require('ava')
 
-const { initBrowserless, prettyHtml } = require('./helpers')
+const { prettyHtml } = require('./helpers')
 const getHTML = require('..')
 
-const getBrowserless = initBrowserless(test)
-
 const PDF_OVER_TRESHOLD = 'https://cdn.microlink.io/file-examples/sample.pdf'
 const PDF_UNDER_TRESHOLD = 'https://pdfobject.com/pdf/sample.pdf'
 
 test('disable if `mutool` is not installed', async t => {
   const targetUrl = 'https://cdn.microlink.io/file-examples/sample.pdf'
   const { url, stats, html } = await getHTML(targetUrl, {
     mutool: false,
-    getBrowserless
+    getBrowserless: () => getBrowserContext(t)
   })
 
   const $ = cheerio.load(html)
@@ -29,7 +28,7 @@ test('disable if `mutool` is not installed', async t => {
 test('turn PDF into HTML markup over the treshold', async t => {
   const targetUrl = PDF_OVER_TRESHOLD
   const { url, stats, html } = await getHTML(targetUrl, {
-    getBrowserless
+    getBrowserless: () => getBrowserContext(t)
   })
 
   const $ = cheerio.load(html)
@@ -44,7 +43,7 @@ test('turn PDF into HTML markup over the treshold', async t => {
 test('turn PDF into HTML markup under the treshold', async t => {
   const targetUrl = PDF_UNDER_TRESHOLD
   const { url, stats, html } = await getHTML(targetUrl, {
-    getBrowserless
+    getBrowserless: () => getBrowserContext(t)
   })
   const $ = cheerio.load(html)
   t.is(url, targetUrl)

test/redirects.js

@@ -1,12 +1,10 @@
 'use strict'
 
+const { getBrowserContext } = require('@browserless/test')
 const test = require('ava')
 
-const { initBrowserless } = require('./helpers')
 const getHTML = require('..')
 
-const getBrowserless = initBrowserless(test)
-
 ;[true, false].forEach(prerender => {
   const mode = prerender ? 'prerender' : 'fetch'
 
@@ -16,7 +14,7 @@ const getBrowserless = initBrowserless(test)
 
     const { redirects } = await getHTML(targetUrl, {
       prerender,
-      getBrowserless
+      getBrowserless: () => getBrowserContext(t)
     })
 
     t.deepEqual(redirects, [

test/url.js

@@ -1,20 +1,19 @@
 'use strict'
 
+const { getBrowserContext } = require('@browserless/test')
 const test = require('ava')
 
-const { initBrowserless, runServer, prettyHtml } = require('./helpers')
+const { runServer, prettyHtml } = require('./helpers')
 const getHTML = require('..')
 
-const getBrowserless = initBrowserless(test)
-
 ;[false, true].forEach(prerender => {
   const mode = prerender ? 'prerender' : 'fetch'
   test(`${mode} » as string`, async t => {
     const url = await runServer(t, (_, res) =>
       res.end('<!doctype html><title>.</title>')
     )
     const { html } = await getHTML(url.toString(), {
-      getBrowserless,
+      getBrowserless: () => getBrowserContext(t),
       prerender,
       puppeteerOpts: { adblock: false, animations: true }
     })
@@ -38,7 +37,7 @@ const getBrowserless = initBrowserless(test)
       res.end('<!doctype html><title>.</title>')
     )
     const { html } = await getHTML(url, {
-      getBrowserless,
+      getBrowserless: () => getBrowserContext(t),
       prerender,
       puppeteerOpts: { adblock: false, animations: true }
     })