diff --git a/experimental/puppeteer-firefox/lib/DOMWorld.js b/experimental/puppeteer-firefox/lib/DOMWorld.js index 8d50da02..12cfc67d 100644 --- a/experimental/puppeteer-firefox/lib/DOMWorld.js +++ b/experimental/puppeteer-firefox/lib/DOMWorld.js @@ -134,7 +134,7 @@ class DOMWorld { async setContent(html) { await this.evaluate(base64html => { document.open(); - document.write(atob(base64html)); + document.write(decodeURIComponent(atob(base64html).split('').map(c => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)).join(''))); document.close(); }, Buffer.from(html).toString('base64')); } diff --git a/lib/DOMWorld.js b/lib/DOMWorld.js index 503df690..0a0210fe 100644 --- a/lib/DOMWorld.js +++ b/lib/DOMWorld.js @@ -205,7 +205,7 @@ class DOMWorld { // lifecycle event. @see https://crrev.com/608658 await this.evaluate(base64html => { document.open(); - document.write(atob(base64html)); + document.write(decodeURIComponent(atob(base64html).split('').map(c => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)).join(''))); document.close(); }, Buffer.from(html).toString('base64')); const watcher = new LifecycleWatcher(this._frameManager, this._frame, waitUntil, timeout); diff --git a/test/page.spec.js b/test/page.spec.js index cf78ce1c..bc2a065d 100644 --- a/test/page.spec.js +++ b/test/page.spec.js @@ -760,6 +760,18 @@ module.exports.addTests = function({testRunner, expect, headless, puppeteer, CHR await page.setContent('
hello world
' + '\x7F'); expect(await page.$eval('div', div => div.textContent)).toBe('hello world'); }); + it('should work with accents', async({page, server}) => { + await page.setContent('
aberración
'); + expect(await page.$eval('div', div => div.textContent)).toBe('aberración'); + }); + it('should work with emojis', async({page, server}) => { + await page.setContent('
🐥
'); + expect(await page.$eval('div', div => div.textContent)).toBe('🐥'); + }); + it('should work with newline', async({page, server}) => { + await page.setContent('
\n
'); + expect(await page.$eval('div', div => div.textContent)).toBe('\n'); + }); }); describe_fails_ffox('Page.setBypassCSP', function() {