Skip to content

Commit 5c558fb

Browse files
authoredFeb 28, 2022
core(inspector-issues): update sameSiteCookie to cookie (#13708)
1 parent 74bf436 commit 5c558fb

File tree

9 files changed

+36
-36
lines changed

9 files changed

+36
-36
lines changed
 

‎lighthouse-core/audits/dobetterweb/inspector-issues.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,19 @@ class IssuesPanelEntries extends Audit {
7171
}
7272

7373
/**
74-
* @param {Array<LH.Crdp.Audits.SameSiteCookieIssueDetails>} sameSiteCookieIssues
74+
* @param {Array<LH.Crdp.Audits.CookieIssueDetails>} CookieIssues
7575
* @return {LH.Audit.Details.TableItem}
7676
*/
77-
static getSameSiteCookieRow(sameSiteCookieIssues) {
77+
static getCookieRow(CookieIssues) {
7878
const requestUrls = new Set();
79-
for (const issue of sameSiteCookieIssues) {
79+
for (const issue of CookieIssues) {
8080
const requestUrl = (issue.request?.url) || issue.cookieUrl;
8181
if (requestUrl) {
8282
requestUrls.add(requestUrl);
8383
}
8484
}
8585
return {
86-
issueType: 'SameSite cookie',
86+
issueType: 'Cookie',
8787
subItems: {
8888
type: 'subitems',
8989
items: Array.from(requestUrls).map(url => {
@@ -164,8 +164,8 @@ class IssuesPanelEntries extends Audit {
164164
if (issues.mixedContentIssue.length) {
165165
items.push(this.getMixedContentRow(issues.mixedContentIssue));
166166
}
167-
if (issues.sameSiteCookieIssue.length) {
168-
items.push(this.getSameSiteCookieRow(issues.sameSiteCookieIssue));
167+
if (issues.cookieIssue.length) {
168+
items.push(this.getCookieRow(issues.cookieIssue));
169169
}
170170
if (issues.blockedByResponseIssue.length) {
171171
items.push(this.getBlockedByResponseRow(issues.blockedByResponseIssue));

‎lighthouse-core/gather/gatherers/inspector-issues.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class InspectorIssues extends FRGatherer {
7373
mixedContentIssue: [],
7474
navigatorUserAgentIssue: [],
7575
quirksModeIssue: [],
76-
sameSiteCookieIssue: [],
76+
cookieIssue: [],
7777
sharedArrayBufferIssue: [],
7878
twaQualityEnforcement: [],
7979
};

‎lighthouse-core/test/audits/dobetterweb/inspector-issues-test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe('Has inspector issues audit', () => {
2727
mixedContentIssue: [],
2828
navigatorUserAgentIssue: [],
2929
quirksModeIssue: [],
30-
sameSiteCookieIssue: [],
30+
cookieIssue: [],
3131
sharedArrayBufferIssue: [],
3232
twaQualityEnforcement: [],
3333
};
@@ -81,8 +81,8 @@ describe('Has inspector issues audit', () => {
8181
});
8282
});
8383

84-
it('correctly displays SameSite cookie issues', () => {
85-
const samesiteIssues = [
84+
it('correctly displays cookie issues', () => {
85+
const cookieIssues = [
8686
{
8787
cookieUrl: 'www.samesitecookies.com',
8888
},
@@ -93,14 +93,14 @@ describe('Has inspector issues audit', () => {
9393
},
9494
},
9595
];
96-
issues.sameSiteCookieIssue.push(...samesiteIssues);
96+
issues.cookieIssue.push(...cookieIssues);
9797

9898
const auditResult = InspectorIssuesAudit.audit({
9999
InspectorIssues: issues,
100100
});
101101
expect(auditResult.score).toBe(0);
102102
expect(auditResult.details.items[0]).toMatchObject({
103-
issueType: 'SameSite cookie',
103+
issueType: 'Cookie',
104104
subItems: {
105105
type: 'subitems',
106106
items: [

‎lighthouse-core/test/gather/gatherers/inspector-issues-test.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ function mockMixedContent(details) {
5454
}
5555

5656
/**
57-
* @param {Partial<LH.Crdp.Audits.SameSiteCookieIssueDetails>=} details
57+
* @param {Partial<LH.Crdp.Audits.CookieIssueDetails>=} details
5858
* @return {LH.Crdp.Audits.InspectorIssue} partial
5959
*/
60-
function mockSameSiteCookie(details) {
60+
function mockCookie(details) {
6161
return {
62-
code: 'SameSiteCookieIssue',
62+
code: 'CookieIssue',
6363
details: {
64-
sameSiteCookieIssueDetails: {
64+
cookieIssueDetails: {
6565
cookie: {
6666
name: 'name',
6767
path: 'path',
@@ -156,11 +156,11 @@ describe('instrumentation', () => {
156156
it('collects inspector issues', async () => {
157157
const mockContext = createMockContext();
158158
const mockMixedContentIssue = mockMixedContent({resourceType: 'Audio'});
159-
const mockSameSiteCookieIssue =
160-
mockSameSiteCookie({cookieWarningReasons: ['WarnSameSiteNoneInsecure']});
159+
const mockCookieIssue =
160+
mockCookie({cookieWarningReasons: ['WarnSameSiteNoneInsecure']});
161161
mockContext.driver.defaultSession.on
162162
.mockEvent('Audits.issueAdded', {issue: mockMixedContentIssue})
163-
.mockEvent('Audits.issueAdded', {issue: mockSameSiteCookieIssue});
163+
.mockEvent('Audits.issueAdded', {issue: mockCookieIssue});
164164
mockContext.driver.defaultSession.sendCommand
165165
.mockResponse('Audits.enable')
166166
.mockResponse('Audits.disable');
@@ -172,7 +172,7 @@ describe('instrumentation', () => {
172172

173173
expect(gatherer._issues).toEqual([
174174
mockMixedContentIssue,
175-
mockSameSiteCookieIssue,
175+
mockCookieIssue,
176176
]);
177177
});
178178
});
@@ -182,7 +182,7 @@ describe('_getArtifact', () => {
182182
const gatherer = new InspectorIssues();
183183
gatherer._issues = [
184184
mockMixedContent({request: {requestId: '1'}}),
185-
mockSameSiteCookie({request: {requestId: '2'}}),
185+
mockCookie({request: {requestId: '2'}}),
186186
mockBlockedByResponse({request: {requestId: '3'}}),
187187
mockHeavyAd(),
188188
mockCSP(),
@@ -203,7 +203,7 @@ describe('_getArtifact', () => {
203203
insecureURL: 'https://example.com',
204204
mainResourceURL: 'https://example.com',
205205
}],
206-
sameSiteCookieIssue: [{
206+
cookieIssue: [{
207207
request: {requestId: '2'},
208208
cookie: {
209209
name: 'name',
@@ -257,8 +257,8 @@ describe('_getArtifact', () => {
257257
gatherer._issues = [
258258
mockMixedContent({request: {requestId: '1'}}),
259259
mockMixedContent({request: {requestId: '2'}}),
260-
mockSameSiteCookie({request: {requestId: '3'}}),
261-
mockSameSiteCookie({request: {requestId: '4'}}),
260+
mockCookie({request: {requestId: '3'}}),
261+
mockCookie({request: {requestId: '4'}}),
262262
mockBlockedByResponse({request: {requestId: '5'}}),
263263
mockBlockedByResponse({request: {requestId: '6'}}),
264264
];
@@ -277,7 +277,7 @@ describe('_getArtifact', () => {
277277
insecureURL: 'https://example.com',
278278
mainResourceURL: 'https://example.com',
279279
}],
280-
sameSiteCookieIssue: [{
280+
cookieIssue: [{
281281
request: {requestId: '3'},
282282
cookie: {
283283
name: 'name',
@@ -351,7 +351,7 @@ describe('FR compat', () => {
351351
insecureURL: 'https://example.com',
352352
mainResourceURL: 'https://example.com',
353353
}],
354-
sameSiteCookieIssue: [],
354+
cookieIssue: [],
355355
blockedByResponseIssue: [],
356356
heavyAdIssue: [],
357357
clientHintIssue: [],
@@ -387,7 +387,7 @@ describe('FR compat', () => {
387387
insecureURL: 'https://example.com',
388388
mainResourceURL: 'https://example.com',
389389
}],
390-
sameSiteCookieIssue: [],
390+
cookieIssue: [],
391391
blockedByResponseIssue: [],
392392
clientHintIssue: [],
393393
heavyAdIssue: [],

‎lighthouse-core/test/results/artifacts/artifacts.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12323,7 +12323,7 @@
1232312323
}
1232412324
],
1232512325
"quirksModeIssue": [],
12326-
"sameSiteCookieIssue": [],
12326+
"cookieIssue": [],
1232712327
"sharedArrayBufferIssue": [],
1232812328
"twaQualityEnforcement": []
1232912329
},

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
"cpy": "^8.1.2",
141141
"cross-env": "^7.0.2",
142142
"csv-validator": "^0.0.3",
143-
"devtools-protocol": "0.0.964215",
143+
"devtools-protocol": "0.0.975298",
144144
"es-main": "^1.0.2",
145145
"eslint": "^8.4.1",
146146
"eslint-config-google": "^0.14.0",
@@ -213,7 +213,7 @@
213213
"yargs-parser": "^21.0.0"
214214
},
215215
"resolutions": {
216-
"puppeteer/**/devtools-protocol": "0.0.964215"
216+
"puppeteer/**/devtools-protocol": "0.0.975298"
217217
},
218218
"repository": "GoogleChrome/lighthouse",
219219
"keywords": [

‎third-party/chromium-synchronization/inspector-issueAdded-types-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Array [
3838
"blockedByResponseIssueDetails",
3939
"clientHintIssueDetails",
4040
"contentSecurityPolicyIssueDetails",
41+
"cookieIssueDetails",
4142
"corsIssueDetails",
4243
"deprecationIssueDetails",
4344
"federatedAuthRequestIssueDetails",
@@ -47,7 +48,6 @@ Array [
4748
"mixedContentIssueDetails",
4849
"navigatorUserAgentIssueDetails",
4950
"quirksModeIssueDetails",
50-
"sameSiteCookieIssueDetails",
5151
"sharedArrayBufferIssueDetails",
5252
"twaQualityEnforcementDetails",
5353
]

‎types/artifacts.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ declare module Artifacts {
566566
mixedContentIssue: LH.Crdp.Audits.MixedContentIssueDetails[];
567567
navigatorUserAgentIssue: LH.Crdp.Audits.NavigatorUserAgentIssueDetails[];
568568
quirksModeIssue: LH.Crdp.Audits.QuirksModeIssueDetails[];
569-
sameSiteCookieIssue: LH.Crdp.Audits.SameSiteCookieIssueDetails[];
569+
cookieIssue: LH.Crdp.Audits.CookieIssueDetails[];
570570
sharedArrayBufferIssue: LH.Crdp.Audits.SharedArrayBufferIssueDetails[];
571571
twaQualityEnforcement: LH.Crdp.Audits.TrustedWebActivityIssueDetails[];
572572
}

‎yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -3217,10 +3217,10 @@ detect-newline@^3.0.0:
32173217
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
32183218
integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
32193219

3220-
devtools-protocol@0.0.901419, devtools-protocol@0.0.964215:
3221-
version "0.0.964215"
3222-
resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.964215.tgz#4e5b09f9b4478ef63076fa79bae9704442212f2b"
3223-
integrity sha512-7xjHbM16/gh0Y6OZK7viLyttNWfWTSm/gT2wDW98kyslYrUBRMcDkcfpjohmZDQMlEQj+S3xcm+5OYkMoUNEDg==
3220+
devtools-protocol@0.0.901419, devtools-protocol@0.0.975298:
3221+
version "0.0.975298"
3222+
resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.975298.tgz#b134e8c98324f12bb57ad660639e73bc77649821"
3223+
integrity sha512-RNQxbC4gOlaojOPc47YJvwhx9LsmVBBgmCw0BoNRnC2Q83wqMuc/nJd+jeXQe0kcu+R2O6f83OmaE+gUejQQOw==
32243224

32253225
diff-sequences@^27.4.0:
32263226
version "27.4.0"

0 commit comments

Comments
 (0)
Please sign in to comment.