From 0c7d71c02bc8201567c6fb8401ce22e31e5e451a Mon Sep 17 00:00:00 2001 From: Dmitry Gozman Date: Mon, 27 Jul 2020 17:29:46 -0700 Subject: [PATCH] fix(firefox): roll firefox for postdata fix --- browsers.json | 2 +- test/interception.jest.js | 19 +++++++++++-------- utils/testserver/index.js | 6 +++--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/browsers.json b/browsers.json index 58bb299822eb2..8cd9094656681 100644 --- a/browsers.json +++ b/browsers.json @@ -8,7 +8,7 @@ }, { "name": "firefox", - "revision": "1140", + "revision": "1144", "download": true }, { diff --git a/test/interception.jest.js b/test/interception.jest.js index 6ad423dda9201..deadf914f4922 100644 --- a/test/interception.jest.js +++ b/test/interception.jest.js @@ -442,7 +442,7 @@ describe('Page.route', function() { method: 'POST', headers: { 'Content-Type': 'application/json' }, mode: 'cors', - body: JSON.stringify({ 'number': 1 }) + body: JSON.stringify({ 'number': 1 }) }); return response.json(); }); @@ -466,11 +466,11 @@ describe('Page.route', function() { method: 'POST', headers: { 'Content-Type': 'application/json' }, mode: 'cors', - body: JSON.stringify({ 'number': 1 }) + body: JSON.stringify({ 'number': 1 }) }); return response.json(); }); - expect(resp).toEqual(['POST', 'electric', 'gas']); + expect(resp).toEqual(['POST', 'electric', 'gas']); } // Then DELETE { @@ -479,11 +479,11 @@ describe('Page.route', function() { method: 'DELETE', headers: {}, mode: 'cors', - body: '' + body: '' }); return response.json(); }); - expect(resp).toEqual(['DELETE', 'electric', 'gas']); + expect(resp).toEqual(['DELETE', 'electric', 'gas']); } }); }); @@ -534,7 +534,7 @@ describe('Request.continue', function() { ]); expect((await serverRequest.postBody).toString('utf8')).toBe('doggo'); }); - it.fail(FFOX)('should amend utf8 post data', async({page, server}) => { + it('should amend utf8 post data', async({page, server}) => { await page.goto(server.EMPTY_PAGE); await page.route('**/*', route => { route.continue({ postData: 'пушкин' }); @@ -543,9 +543,10 @@ describe('Request.continue', function() { server.waitForRequest('/sleep.zzz'), page.evaluate(() => fetch('/sleep.zzz', { method: 'POST', body: 'birdy' })) ]); + expect(serverRequest.method).toBe('POST'); expect((await serverRequest.postBody).toString('utf8')).toBe('пушкин'); }); - it.fail(FFOX)('should amend longer post data', async({page, server}) => { + it('should amend longer post data', async({page, server}) => { await page.goto(server.EMPTY_PAGE); await page.route('**/*', route => { route.continue({ postData: 'doggo-is-longer-than-birdy' }); @@ -554,9 +555,10 @@ describe('Request.continue', function() { server.waitForRequest('/sleep.zzz'), page.evaluate(() => fetch('/sleep.zzz', { method: 'POST', body: 'birdy' })) ]); + expect(serverRequest.method).toBe('POST'); expect((await serverRequest.postBody).toString('utf8')).toBe('doggo-is-longer-than-birdy'); }); - it.fail(FFOX)('should amend binary post data', async({page, server}) => { + it('should amend binary post data', async({page, server}) => { await page.goto(server.EMPTY_PAGE); const arr = Array.from(Array(256).keys()); await page.route('**/*', route => { @@ -566,6 +568,7 @@ describe('Request.continue', function() { server.waitForRequest('/sleep.zzz'), page.evaluate(() => fetch('/sleep.zzz', { method: 'POST', body: 'birdy' })) ]); + expect(serverRequest.method).toBe('POST'); const buffer = await serverRequest.postBody; expect(buffer.length).toBe(arr.length); for (let i = 0; i < arr.length; ++i) diff --git a/utils/testserver/index.js b/utils/testserver/index.js index fcd2924142f85..dfedf5b607762 100644 --- a/utils/testserver/index.js +++ b/utils/testserver/index.js @@ -183,8 +183,8 @@ class TestServer { } /** - * @param {http.IncomingMessage} request - * @param {http.ServerResponse} response + * @param {http.IncomingMessage} request + * @param {http.ServerResponse} response */ _onRequest(request, response) { request.on('error', error => { @@ -199,7 +199,7 @@ class TestServer { request.on('end', () => resolve(body)); }); const pathName = url.parse(request.url).path; - this.debugServer(`request ${pathName}`); + this.debugServer(`request ${request.method} ${pathName}`); if (this._auths.has(pathName)) { const auth = this._auths.get(pathName); const credentials = Buffer.from((request.headers.authorization || '').split(' ')[1] || '', 'base64').toString();