From 706607ea2bd89acb693f8f66814a4b780f694f2e Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Tue, 18 Oct 2022 14:54:33 +0800 Subject: [PATCH] Rebase main --- .../src/newsletters/cooper-press-handler.ts | 5 ++--- packages/content-handler/test/newsletter.test.ts | 9 +++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/content-handler/src/newsletters/cooper-press-handler.ts b/packages/content-handler/src/newsletters/cooper-press-handler.ts index 1740c39f8..d0f39f4c2 100644 --- a/packages/content-handler/src/newsletters/cooper-press-handler.ts +++ b/packages/content-handler/src/newsletters/cooper-press-handler.ts @@ -1,5 +1,4 @@ import { ContentHandler } from '../content-handler' -import { parseHTML } from 'linkedom' export class CooperPressHandler extends ContentHandler { constructor() { @@ -22,9 +21,9 @@ export class CooperPressHandler extends ContentHandler { postHeader: string from: string unSubHeader: string - html: string + dom: Document }): Promise { - const dom = parseHTML(input.html).document + const dom = input.dom return Promise.resolve( dom.querySelectorAll('a[href*="cooperpress.com"]').length > 0 ) diff --git a/packages/content-handler/test/newsletter.test.ts b/packages/content-handler/test/newsletter.test.ts index 8393bce0e..c3a628055 100644 --- a/packages/content-handler/test/newsletter.test.ts +++ b/packages/content-handler/test/newsletter.test.ts @@ -182,9 +182,10 @@ describe('Newsletter email test', () => { }) it('returns true for node-weekly newsletter', async () => { const html = load('./test/data/node-weekly-newsletter.html') + const dom = parseHTML(html).document await expect( new CooperPressHandler().isNewsletter({ - html, + dom, postHeader: '', from: '', unSubHeader: '', @@ -204,9 +205,9 @@ describe('Newsletter email test', () => { Location: 'https://newsletter.slowchinese.net/p/companies-that-eat-people-217', }) - nock('https://newsletter.slowchinese.net') - .head('/p/companies-that-eat-people-217') - .reply(200, '') + nock('https://newsletter.slowchinese.net') + .head('/p/companies-that-eat-people-217') + .reply(200, '') }) after(() => { nock.restore()