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.

Sign up for GitHub

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

Jump to bottom

feat(chromium): roll Chromium to r737027 #5644

Merged
merged 5 commits into from Apr 16, 2020
Merged

feat(chromium): roll Chromium to r737027 #5644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa5a5be
feat(chromium): roll Chromium to r737027
hanselfmu Apr 15, 2020
81e33f8
feat: update defaultbrowsercontext spec
hanselfmu Apr 15, 2020
eebc77d
feat: remove "priority" attribute when getting cookie
hanselfmu Apr 15, 2020
e0d187a
fix: lint errors
hanselfmu Apr 16, 2020
dbacb0f
fix: update cookies text expectations
hanselfmu Apr 16, 2020
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 package.json
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"node": ">=10.18.1"
},
"puppeteer": {
"chromium_revision": "722234",
"chromium_revision": "737027",
"firefox_revision": "latest"
},
"scripts": {
Expand Down
10 changes: 9 additions & 1 deletion src/Page.js
View file
Open in desktop
Expand Up @@ -375,9 +375,17 @@ class Page extends EventEmitter {
* @return {!Promise<!Array<Network.Cookie>>}
*/
async cookies(...urls) {
return (await this._client.send('Network.getCookies', {
const originalCookies = (await this._client.send('Network.getCookies', {
urls: urls.length ? urls : [this.url()]
})).cookies;

const unsupportedCookieAttributes = ['priority'];
const filterUnsupportedAttributes = cookie => {
for (const attr of unsupportedCookieAttributes)
delete cookie[attr];
return cookie;
};
return originalCookies.map(filterUnsupportedAttributes);
}

/**
Expand Down
26 changes: 13 additions & 13 deletions test/cookies.spec.js
View file
Open in desktop
Expand Up @@ -41,13 +41,13 @@ describe('Cookie specs', () => {
size: 16,
httpOnly: false,
secure: false,
session: true
session: true,
}]);
});
it('should properly report httpOnly cookie', async() => {
const {page, server} = getTestState();
server.setRoute('/empty.html', (req, res) => {
res.setHeader('Set-Cookie', ';HttpOnly; Path=/');
res.setHeader('Set-Cookie', 'a=b; HttpOnly; Path=/');
res.end();
});
await page.goto(server.EMPTY_PAGE);
Expand All @@ -58,7 +58,7 @@ describe('Cookie specs', () => {
it('should properly report "Strict" sameSite cookie', async() => {
const {page, server} = getTestState();
server.setRoute('/empty.html', (req, res) => {
res.setHeader('Set-Cookie', ';SameSite=Strict');
res.setHeader('Set-Cookie', 'a=b; SameSite=Strict');
res.end();
});
await page.goto(server.EMPTY_PAGE);
Expand All @@ -69,7 +69,7 @@ describe('Cookie specs', () => {
it('should properly report "Lax" sameSite cookie', async() => {
const {page, server} = getTestState();
server.setRoute('/empty.html', (req, res) => {
res.setHeader('Set-Cookie', ';SameSite=Lax');
res.setHeader('Set-Cookie', 'a=b; SameSite=Lax');
res.end();
});
await page.goto(server.EMPTY_PAGE);
Expand All @@ -96,7 +96,7 @@ describe('Cookie specs', () => {
size: 12,
httpOnly: false,
secure: false,
session: true
session: true,
},
{
name: 'username',
Expand All @@ -107,7 +107,7 @@ describe('Cookie specs', () => {
size: 16,
httpOnly: false,
secure: false,
session: true
session: true,
},
]);
});
Expand Down Expand Up @@ -137,7 +137,7 @@ describe('Cookie specs', () => {
size: 11,
httpOnly: false,
secure: true,
session: true
session: true,
}, {
name: 'doggo',
value: 'woofs',
Expand All @@ -147,7 +147,7 @@ describe('Cookie specs', () => {
size: 10,
httpOnly: false,
secure: true,
session: true
session: true,
}]);
});
});
Expand Down Expand Up @@ -233,7 +233,7 @@ describe('Cookie specs', () => {
size: 14,
httpOnly: false,
secure: false,
session: true
session: true,
}]);
});
itFailsFirefox('should set a cookie with a path', async() => {
Expand All @@ -254,7 +254,7 @@ describe('Cookie specs', () => {
size: 14,
httpOnly: false,
secure: false,
session: true
session: true,
}]);
expect(await page.evaluate('document.cookie')).toBe('gridcookie=GRID');
await page.goto(server.EMPTY_PAGE);
Expand Down Expand Up @@ -350,7 +350,7 @@ describe('Cookie specs', () => {
size: 18,
httpOnly: false,
secure: true,
session: true
session: true,
}]);
});
itFailsFirefox('should set cookies from a frame', async() => {
Expand Down Expand Up @@ -380,7 +380,7 @@ describe('Cookie specs', () => {
size: 20,
httpOnly: false,
secure: false,
session: true
session: true,
}]);

expect(await page.cookies(server.CROSS_PROCESS_PREFIX)).toEqual([{
Expand All @@ -392,7 +392,7 @@ describe('Cookie specs', () => {
size: 15,
httpOnly: false,
secure: false,
session: true
session: true,
}]);
});
});
Expand Down
6 changes: 3 additions & 3 deletions test/defaultbrowsercontext.spec.js
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ describe('DefaultBrowserContext', function() {
size: 16,
httpOnly: false,
secure: false,
session: true
session: true,
}]);
});
itFailsFirefox('page.setCookie() should work', async() => {
Expand All @@ -56,7 +56,7 @@ describe('DefaultBrowserContext', function() {
size: 16,
httpOnly: false,
secure: false,
session: true
session: true,
}]);
});
itFailsFirefox('page.deleteCookie() should work', async() => {
Expand All @@ -82,7 +82,7 @@ describe('DefaultBrowserContext', function() {
size: 8,
httpOnly: false,
secure: false,
session: true
session: true,
}]);
});
});