Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(firefox): roll firefox for postdata fix #3196

Merged
merged 1 commit into from
Jul 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion browsers.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
{
"name": "firefox",
"revision": "1140",
"revision": "1144",
"download": true
},
{
Expand Down
19 changes: 11 additions & 8 deletions test/interception.jest.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand All @@ -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
{
Expand All @@ -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']);
}
});
});
Expand Down Expand Up @@ -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: 'пушкин' });
Expand All @@ -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' });
Expand All @@ -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 => {
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions utils/testserver/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand All @@ -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();
Expand Down