[Protected Audiences] Remove some instances of "Url" from WPT tests.
Most APIs have been switched from "Url" to "URL", so tests should
reflect that. Using the right string also reduces deprecation warnings
when running tests.
This CL also migrates "dailyUpdateUrl" to "updateURL" in some tests.
This CL leaves alone a couple cases where "Url" values are needed to
run object equality comparisons, and most of the usage in
trusted-scoring-signals.py, which still receives query params
"renderUrls" and "adComponentRenderUrls", and no additional "URL"
argument, though this cl does update it to return a JSON response with
a "renderURLs" section instead of "renderUrls" (the component ad
section had already been updated).
Bug: 40264073
Change-Id: Iaf231a2320847b216e8c284ce596989c99b38b17
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5282480
Commit-Queue: mmenke <mmenke@chromium.org>
Reviewed-by: Caleb Raitto <caraitto@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1260081}
diff --git a/fledge/tentative/cross-origin.https.window.js b/fledge/tentative/cross-origin.https.window.js
index 788558e..a8cf930 100644
--- a/fledge/tentative/cross-origin.https.window.js
+++ b/fledge/tentative/cross-origin.https.window.js
@@ -356,8 +356,8 @@
throw "Wrong origin: " + interestGroup.owner;
if (!interestGroup.biddingLogicURL.startsWith("${bidderOrigin}"))
throw "Wrong origin: " + interestGroup.biddingLogicURL;
- if (interestGroup.ads[0].renderUrl != "${renderURL}")
- throw "Wrong renderURL: " + interestGroup.ads[0].renderUrl;
+ if (interestGroup.ads[0].renderURL != "${renderURL}")
+ throw "Wrong renderURL: " + interestGroup.ads[0].renderURL;
if (browserSignals.seller !== "${sellerOrigin}")
throw "Wrong origin: " + browserSignals.seller;`,
reportWin: `if (browserSignals.topWindowHostname !== "${document.location.hostname}")
diff --git a/fledge/tentative/direct-from-seller-signals.https.window.js b/fledge/tentative/direct-from-seller-signals.https.window.js
index 339bc32..d0c0e55 100644
--- a/fledge/tentative/direct-from-seller-signals.https.window.js
+++ b/fledge/tentative/direct-from-seller-signals.https.window.js
@@ -22,7 +22,7 @@
directFromSellerSignalsValidatorCode(
uuid, /*expectedSellerSignals=*/ null,
/*expectedAuctionSignals=*/ null, /*expectedPerBuyerSignals=*/ null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -38,7 +38,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'sellerSignals/1',
/*expectedAuctionSignals=*/null, /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -55,7 +55,7 @@
directFromSellerSignalsValidatorCode(
uuid, /*expectedSellerSignals=*/null,
'auctionSignals/2', /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -72,7 +72,7 @@
directFromSellerSignalsValidatorCode(
uuid, /*expectedSellerSignals=*/null,
/*expectedAuctionSignals=*/null, 'perBuyerSignals/3'),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -89,7 +89,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'sellerSignals/4',
'auctionSignals/4', 'perBuyerSignals/4'),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -106,7 +106,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'sellerSignals/1',
/*expectedAuctionSignals=*/null, /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -119,7 +119,7 @@
directFromSellerSignalsValidatorCode(
uuid, /*expectedSellerSignals=*/null,
'auctionSignals/2', /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -137,7 +137,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'sellerSignals/4',
'auctionSignals/4', 'perBuyerSignals/4'),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -216,7 +216,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'sellerSignals/5',
'auctionSignals/5', /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -233,7 +233,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'sellerSignals/5',
'auctionSignals/5', /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -250,7 +250,7 @@
directFromSellerSignalsValidatorCode(
uuid, /*expectedSellerSignals=*/null,
/*expectedAuctionSignals=*/null, /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -295,7 +295,7 @@
directFromSellerSignalsValidatorCode(
uuid, /*expectedSellerSignals=*/null,
/*expectedAuctionSignals=*/null, /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -312,7 +312,7 @@
directFromSellerSignalsValidatorCode(
uuid, /*expectedSellerSignals=*/null,
/*expectedAuctionSignals=*/null, /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -329,7 +329,7 @@
directFromSellerSignalsValidatorCode(
uuid, /*expectedSellerSignals=*/null,
/*expectedAuctionSignals=*/null, /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -347,7 +347,7 @@
await fetchDirectFromSellerSignals({ 'Buyer-Origin': window.location.origin });
await runReportTest(
test, uuid, codeToInsert,
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -366,7 +366,7 @@
await fetchDirectFromSellerSignals({ 'Buyer-Origin': window.location.origin }, OTHER_ORIGIN1);
await runReportTest(
test, uuid, codeToInsert,
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -386,7 +386,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'sellerSignals/4',
'auctionSignals/4', 'perBuyerSignals/4'),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid, '1', OTHER_ORIGIN1)],
// renderURLOverride
null,
@@ -406,7 +406,7 @@
test_instance, "${uuid}",
directFromSellerSignalsValidatorCode(
"${uuid}", 'sellerSignals/4', 'auctionSignals/4', 'perBuyerSignals/4'),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL("${uuid}"), createBidderReportURL("${uuid}")],
// renderURLOverride
null,
@@ -425,7 +425,7 @@
directFromSellerSignalsValidatorCode(
"${uuid}", 'sellerSignals/4',
'auctionSignals/4', 'perBuyerSignals/4'),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL("${uuid}"), createBidderReportURL("${uuid}")],
// renderURLOverride
null,
@@ -447,7 +447,7 @@
directFromSellerSignalsValidatorCode(
"${uuid}", 'sellerSignals/4',
'auctionSignals/4', 'perBuyerSignals/4'),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL("${uuid}"), createBidderReportURL("${uuid}")],
// renderURLOverride
null,
@@ -467,7 +467,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'sellerSignals/4',
'auctionSignals/4', 'perBuyerSignals/4'),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -484,7 +484,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'sellerSignals',
'auctionSignals', /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -511,7 +511,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'altSellerSignals/1',
/*expectedAuctionSignals=*/null, /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -532,7 +532,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'altV2SellerSignals/1',
/*expectedAuctionSignals=*/null, /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -551,7 +551,7 @@
directFromSellerSignalsValidatorCode(
uuid, /*expectedSellerSignals=*/null,
'auctionSignals/2', /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -569,7 +569,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'firstSellerSignals/1',
/*expectedAuctionSignals=*/null, /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -587,7 +587,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'nonDupSellerSignals/2',
/*expectedAuctionSignals=*/null, /*expectedPerBuyerSignals=*/null),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
@@ -606,7 +606,7 @@
directFromSellerSignalsValidatorCode(
uuid, 'sameSellerSignals',
'sameAuctionSignals', 'samePerBuyerSignals'),
- // expectedReportUrls
+ // expectedReportURLs
[createSellerReportURL(uuid), createBidderReportURL(uuid)],
// renderURLOverride
null,
diff --git a/fledge/tentative/generate-bid-recency.https.window.js b/fledge/tentative/generate-bid-recency.https.window.js
index 07da463..a8ab5f9 100644
--- a/fledge/tentative/generate-bid-recency.https.window.js
+++ b/fledge/tentative/generate-bid-recency.https.window.js
@@ -27,7 +27,7 @@
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');`
},
- // expectedReportUrls
+ // expectedReportURLs
[createBidderReportURL(uuid)]
);
}, 'Check recency in generateBid() is below a certain threshold and rounded ' +
diff --git a/fledge/tentative/join-leave-ad-interest-group.https.window.js b/fledge/tentative/join-leave-ad-interest-group.https.window.js
index b5dfe02..02148ef 100644
--- a/fledge/tentative/join-leave-ad-interest-group.https.window.js
+++ b/fledge/tentative/join-leave-ad-interest-group.https.window.js
@@ -231,31 +231,31 @@
biddingWasmHelperURL: 'relative/path' }
},
- // "dailyUpdateUrl" tests
+ // "updateURL" tests
{ expectJoinSucces: true,
expectLeaveSucces: true,
interestGroup: { ...BASE_INTEREST_GROUP,
- dailyUpdateUrl: null }
+ updateURL: null }
},
{ expectJoinSucces: false,
expectLeaveSucces: true,
interestGroup: { ...BASE_INTEREST_GROUP,
- dailyUpdateUrl: 'https://{{hosts[][www]}}/foo.js' }
+ updateURL: 'https://{{hosts[][www]}}/foo.js' }
},
{ expectJoinSucces: false,
expectLeaveSucces: true,
interestGroup: { ...BASE_INTEREST_GROUP,
- dailyUpdateUrl: 'data:application/wasm,Foo' }
+ updateURL: 'data:application/wasm,Foo' }
},
{ expectJoinSucces: true,
expectLeaveSucces: true,
interestGroup: { ...BASE_INTEREST_GROUP,
- dailyUpdateUrl: `${window.location.origin}/foo.js`}
+ updateURL: `${window.location.origin}/foo.js`}
},
{ expectJoinSucces: true,
expectLeaveSucces: true,
interestGroup: { ...BASE_INTEREST_GROUP,
- dailyUpdateUrl: 'relative/path' }
+ updateURL: 'relative/path' }
},
// "executionMode" tests
diff --git a/fledge/tentative/kanon-status-below-threshold.https.window.js b/fledge/tentative/kanon-status-below-threshold.https.window.js
index 4eac4a8..787283d 100644
--- a/fledge/tentative/kanon-status-below-threshold.https.window.js
+++ b/fledge/tentative/kanon-status-below-threshold.https.window.js
@@ -13,7 +13,7 @@
`browserSignals.kAnonStatus === "belowThreshold"`,
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createBidderReportURL(uuid)]);
},
'Check kAnonStatus is "belowThreshold" when FledgeConsiderKAnonymity' +
diff --git a/fledge/tentative/kanon-status-not-calculated.https.window.js b/fledge/tentative/kanon-status-not-calculated.https.window.js
index a3ac19b..4a750cd 100644
--- a/fledge/tentative/kanon-status-not-calculated.https.window.js
+++ b/fledge/tentative/kanon-status-not-calculated.https.window.js
@@ -13,7 +13,7 @@
`browserSignals.kAnonStatus === "notCalculated"`,
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createBidderReportURL(uuid)]);
},
'Check kAnonStatus is "notCalculated" when FledgeConsiderKAnonymity' +
diff --git a/fledge/tentative/register-ad-beacon.https.window.js b/fledge/tentative/register-ad-beacon.https.window.js
index 19fab2a..3643e44 100644
--- a/fledge/tentative/register-ad-beacon.https.window.js
+++ b/fledge/tentative/register-ad-beacon.https.window.js
@@ -17,9 +17,9 @@
`registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
reportWin:
'' },
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createSellerBeaconURL(uuid)}, body: `],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -39,9 +39,9 @@
reportWin:
`registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});`
},
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createBidderBeaconURL(uuid)}, body: `],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -60,9 +60,9 @@
`registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
reportWin:
'' },
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createSellerBeaconURL(uuid)}, body: body`],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -81,9 +81,9 @@
'',
reportWin:
`registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` },
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createBidderBeaconURL(uuid)}, body: body`],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -102,10 +102,10 @@
`registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
reportWin:
'' },
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createSellerBeaconURL(uuid)}, body: body1`,
`${createSellerBeaconURL(uuid)}, body: body2`],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -129,10 +129,10 @@
'',
reportWin:
`registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` },
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createBidderBeaconURL(uuid)}, body: body1`,
`${createBidderBeaconURL(uuid)}, body: body2`],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -157,10 +157,10 @@
beacon2: '${createSellerBeaconURL(uuid, '2')}'});`,
reportWin:
'' },
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createSellerBeaconURL(uuid, '1')}, body: body1`,
`${createSellerBeaconURL(uuid, '2')}, body: body2`],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -186,10 +186,10 @@
`registerAdBeacon({beacon1: '${createBidderBeaconURL(uuid, '1')}',
beacon2: '${createBidderBeaconURL(uuid, '2')}'});`
},
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createBidderBeaconURL(uuid, '1')}, body: body1`,
`${createBidderBeaconURL(uuid, '2')}, body: body2`],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -213,10 +213,10 @@
`registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
reportWin:
`registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` },
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createSellerBeaconURL(uuid)}, body: body`,
`${createBidderBeaconURL(uuid)}, body: body`],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -235,10 +235,10 @@
`registerAdBeacon({beacon: '${createSellerBeaconURL(uuid)}'});`,
reportWin:
`registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` },
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createSellerBeaconURL(uuid)}, body: body1`,
`${createBidderBeaconURL(uuid)}, body: body2`],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -268,9 +268,9 @@
'sellerSignals === null',
reportWin:
`registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});` },
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createBidderBeaconURL(uuid)}, body: body`],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
@@ -293,9 +293,9 @@
`sendReportTo('${createBidderReportURL(uuid)}');
registerAdBeacon({beacon: '${createBidderBeaconURL(uuid)}'});
registerAdBeacon({beacon1: '${createBidderBeaconURL(uuid)}'});` },
- // expectedReportUrls:
+ // expectedReportURLs:
[`${createSellerBeaconURL(uuid)}, body: body`],
- // renderUrlOverride:
+ // renderURLOverride:
createRenderURL(
uuid,
`window.fence.reportEvent({
diff --git a/fledge/tentative/reporting-arguments.https.window.js b/fledge/tentative/reporting-arguments.https.window.js
index f26a969..c7c7120 100644
--- a/fledge/tentative/reporting-arguments.https.window.js
+++ b/fledge/tentative/reporting-arguments.https.window.js
@@ -46,7 +46,7 @@
'sellerSignals === 45',
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createSellerReportURL(uuid), createBidderReportURL(uuid)]
);
}, 'Seller passes number to bidder.');
@@ -62,7 +62,7 @@
'sellerSignals === "foo"',
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createSellerReportURL(uuid), createBidderReportURL(uuid)]
);
}, 'Seller passes string to bidder.');
@@ -78,7 +78,7 @@
'JSON.stringify(sellerSignals) === "[3,1,2]"',
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createSellerReportURL(uuid), createBidderReportURL(uuid)]
);
}, 'Seller passes array to bidder.');
@@ -94,7 +94,7 @@
`JSON.stringify(sellerSignals) === '{"a":4,"b":["c",null,{}]}'`,
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createSellerReportURL(uuid), createBidderReportURL(uuid)]
);
}, 'Seller passes object to bidder.');
diff --git a/fledge/tentative/resources/decision-logic.sub.py b/fledge/tentative/resources/decision-logic.sub.py
index 78d459e..3a23f98 100644
--- a/fledge/tentative/resources/decision-logic.sub.py
+++ b/fledge/tentative/resources/decision-logic.sub.py
@@ -43,8 +43,8 @@
// Don't bid on interest group with the wrong uuid. This is to prevent
// left over interest groups from other tests from affecting auction
// results.
- if (!browserSignals.renderUrl.endsWith('uuid={{GET[uuid]}}') &&
- !browserSignals.renderUrl.includes('uuid={{GET[uuid]}}&')) {
+ if (!browserSignals.renderURL.endsWith('uuid={{GET[uuid]}}') &&
+ !browserSignals.renderURL.includes('uuid={{GET[uuid]}}&')) {
return 0;
}
diff --git a/fledge/tentative/resources/fledge-util.sub.js b/fledge/tentative/resources/fledge-util.sub.js
index f64e97a..212531e 100644
--- a/fledge/tentative/resources/fledge-util.sub.js
+++ b/fledge/tentative/resources/fledge-util.sub.js
@@ -533,7 +533,7 @@
// iframe or closes the window.
async function createFrame(test, origin, is_iframe = true, permissions = null) {
const frameUuid = generateUuid(test);
- const frameUrl =
+ const frameURL =
`${origin}${RESOURCE_PATH}subordinate-frame.sub.html?uuid=${frameUuid}`;
let promise = new Promise(function(resolve, reject) {
function WaitForMessage(event) {
@@ -552,7 +552,7 @@
let iframe = document.createElement('iframe');
if (permissions)
iframe.allow = permissions;
- iframe.src = frameUrl;
+ iframe.src = frameURL;
document.body.appendChild(iframe);
test.add_cleanup(async () => {
@@ -564,7 +564,7 @@
return iframe.contentWindow;
}
- let child_window = window.open(frameUrl);
+ let child_window = window.open(frameURL);
test.add_cleanup(async () => {
await runInFrame(test, child_window, "await test_instance.do_cleanup();");
child_window.close();
diff --git a/fledge/tentative/resources/trusted-scoring-signals.py b/fledge/tentative/resources/trusted-scoring-signals.py
index 80488a5..eccef5e 100644
--- a/fledge/tentative/resources/trusted-scoring-signals.py
+++ b/fledge/tentative/resources/trusted-scoring-signals.py
@@ -15,7 +15,7 @@
renderUrls = None
adComponentRenderURLs = None
# List of {type: <render URL type>, urls: <render URL list>} pairs, where <render URL type> is
- # one of the two render URL dictionary keys used in the response ("renderUrls" or
+ # one of the two render URL dictionary keys used in the response ("renderURLs" or
# "adComponentRenderURLs"). May be of length 1 or 2, depending on whether there
# are any component URLs.
urlLists = []
@@ -36,7 +36,7 @@
continue
if pair[0] == "renderUrls" and renderUrls == None:
renderUrls = list(map(unquote_plus, pair[1].split(",")))
- urlLists.append({"type":"renderUrls", "urls":renderUrls})
+ urlLists.append({"type":"renderURLs", "urls":renderUrls})
continue
if pair[0] == "adComponentRenderUrls" and adComponentRenderURLs == None:
adComponentRenderURLs = list(map(unquote_plus, pair[1].split(",")))
diff --git a/fledge/tentative/round-a-value.https.window.js b/fledge/tentative/round-a-value.https.window.js
index 5bccd4a..90523e2 100644
--- a/fledge/tentative/round-a-value.https.window.js
+++ b/fledge/tentative/round-a-value.https.window.js
@@ -18,7 +18,7 @@
`browserSignals.adCost === 1.9921875 || browserSignals.adCost === 1.984375`,
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls
+ // expectedReportURLs
[createBidderReportURL(uuid)]
);
}, 'Check adCost is stochastically rounded with 8 bit mantissa and exponent.');
@@ -35,7 +35,7 @@
`browserSignals.bid === 1.9921875 || browserSignals.bid === 1.984375`,
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls
+ // expectedReportURLs
[createBidderReportURL(uuid)]
);
}, 'Check bid is stochastically rounded with 8 bit mantissa and exponent.');
@@ -52,7 +52,7 @@
`browserSignals.desirability === 1.9921875 || browserSignals.desirability === 1.984375`,
reportResult:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls
+ // expectedReportURLs
[createBidderReportURL(uuid)]
);
}, 'Check desirability is stochastically rounded with 8 bit mantissa and exponent.');
@@ -70,7 +70,7 @@
`browserSignals.highestScoringOtherBid === 1.9921875 || browserSignals.highestScoringOtherBid === 1.984375`,
reportResult:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls
+ // expectedReportURLs
[createBidderReportURL(uuid)]
);
}, 'Check highestScoringOtherBid is stochastically rounded with 8 bit mantissa and exponent.');
@@ -87,7 +87,7 @@
`browserSignals.adCost === 2`,
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls
+ // expectedReportURLs
[createBidderReportURL(uuid)]
);
}, 'Value is ignored as a non-valid floating-point number.');
@@ -104,7 +104,7 @@
`browserSignals.adCost === 0`,
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls
+ // expectedReportURLs
[createBidderReportURL(uuid)]
);
}, 'Value is rounded to 0 if value is greater than 0 and its exponent is less than -128.');
@@ -121,7 +121,7 @@
`browserSignals.adCost === -0`,
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls
+ // expectedReportURLs
[createBidderReportURL(uuid)]
);
}, 'Value is rounded to -0 if value is greater than 0 and its exponent is less than -128.');
@@ -138,7 +138,7 @@
`browserSignals.adCost === Infinity`,
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls
+ // expectedReportURLs
[createBidderReportURL(uuid)]
);
}, 'Value is rounded to Infinity if value is greater than 0 and its exponent is greater than 127.');
@@ -155,7 +155,7 @@
`browserSignals.adCost === -Infinity`,
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls
+ // expectedReportURLs
[createBidderReportURL(uuid)]
);
}, 'Value is rounded to -Infinity if value is less than 0 and its exponent is greater than 127.');
diff --git a/fledge/tentative/send-report-to.https.window.js b/fledge/tentative/send-report-to.https.window.js
index 65a2520..e3cf0a9 100644
--- a/fledge/tentative/send-report-to.https.window.js
+++ b/fledge/tentative/send-report-to.https.window.js
@@ -18,7 +18,7 @@
'sellerSignals === null',
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createSellerReportURL(uuid), createBidderReportURL(uuid)]
);
}, 'Both send reports, seller passes nothing to bidder.');
@@ -31,7 +31,7 @@
`sendReportTo('${createSellerReportURL(uuid)}');`,
reportWin:
'' },
- // expectedReportUrls:
+ // expectedReportURLs:
[createSellerReportURL(uuid)]
);
}, 'Only seller sends a report');
@@ -44,7 +44,7 @@
`sendReportTo('${createSellerReportURL(uuid)}');`,
reportWin:
'throw new Error("Very serious exception")' },
- // expectedReportUrls:
+ // expectedReportURLs:
[createSellerReportURL(uuid)]
);
}, 'Only seller sends a report, bidder throws an exception');
@@ -55,7 +55,7 @@
test, uuid,
{ reportResult:
`sendReportTo('${createSellerReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createSellerReportURL(uuid)]
);
}, 'Only seller sends a report, bidder has no reportWin() method');
@@ -70,7 +70,7 @@
'sellerSignals === null',
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createBidderReportURL(uuid)]
);
}, 'Only bidder sends a report');
@@ -85,7 +85,7 @@
'sellerSignals === "foo"',
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createBidderReportURL(uuid)]
);
}, 'Only bidder sends a report, seller passes a message to bidder');
@@ -100,7 +100,7 @@
'sellerSignals === null',
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createBidderReportURL(uuid)]
);
}, 'Only bidder sends a report, seller throws an exception');
@@ -113,7 +113,7 @@
'sellerSignals === null',
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createBidderReportURL(uuid)]
);
}, 'Only bidder sends a report, seller has no reportResult() method');
@@ -130,7 +130,7 @@
'sellerSignals === null',
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createBidderReportURL(uuid)]
);
}, 'Seller calls sendReportTo() twice, which throws an exception.');
@@ -144,7 +144,7 @@
reportWin:
`sendReportTo('${createBidderReportURL(uuid)}');
sendReportTo('${createBidderReportURL(uuid)}');` },
- // expectedReportUrls:
+ // expectedReportURLs:
[createSellerReportURL(uuid)]
);
// Seller reports may be sent before bidder reports, since reportWin()
diff --git a/fledge/tentative/trusted-scoring-signals.https.window.js b/fledge/tentative/trusted-scoring-signals.https.window.js
index 67ae357..4de5cfc 100644
--- a/fledge/tentative/trusted-scoring-signals.https.window.js
+++ b/fledge/tentative/trusted-scoring-signals.https.window.js
@@ -82,7 +82,7 @@
// Creates a render URL that, when sent to the trusted-scoring-signals.py,
// results in a trusted scoring signals response with the provided response
// body.
-function createScoringSignalsRenderUrlWithBody(uuid, responseBody) {
+function createScoringSignalsRenderURLWithBody(uuid, responseBody) {
return createRenderURL(uuid, /*script=*/null,
/*signalsParam=*/`replace-body:${responseBody}`);
}
@@ -93,13 +93,13 @@
subsetTest(promise_test, async test => {
const uuid = generateUuid(test);
- const decisionLogicScriptUrl = createDecisionScriptURL(
+ const decisionLogicScriptURL = createDecisionScriptURL(
uuid,
{ scoreAd: 'if (trustedScoringSignals !== null) throw "error";' });
await joinGroupAndRunBasicFledgeTestExpectingWinner(
test,
{ uuid: uuid,
- auctionConfigOverrides: { decisionLogicURL: decisionLogicScriptUrl }
+ auctionConfigOverrides: { decisionLogicURL: decisionLogicScriptURL }
});
}, 'No trustedScoringSignalsURL.');
@@ -149,35 +149,35 @@
subsetTest(promise_test, async test => {
const uuid = generateUuid(test);
- const renderURL = createScoringSignalsRenderUrlWithBody(
+ const renderURL = createScoringSignalsRenderURLWithBody(
uuid, /*responseBody=*/'');
await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
}, 'Trusted scoring signals response has no body.');
subsetTest(promise_test, async test => {
const uuid = generateUuid(test);
- const renderURL = createScoringSignalsRenderUrlWithBody(
+ const renderURL = createScoringSignalsRenderURLWithBody(
uuid, /*responseBody=*/'Not JSON');
await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
}, 'Trusted scoring signals response is not JSON.');
subsetTest(promise_test, async test => {
const uuid = generateUuid(test);
- const renderURL = createScoringSignalsRenderUrlWithBody(
+ const renderURL = createScoringSignalsRenderURLWithBody(
uuid, /*responseBody=*/'[]');
await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
}, 'Trusted scoring signals response is a JSON array.');
subsetTest(promise_test, async test => {
const uuid = generateUuid(test);
- const renderURL = createScoringSignalsRenderUrlWithBody(
+ const renderURL = createScoringSignalsRenderURLWithBody(
uuid, /*responseBody=*/'{JSON_keys_need_quotes: 1}');
await runTrustedScoringSignalsTest(test, uuid, renderURL, 'trustedScoringSignals === null');
}, 'Trusted scoring signals response is invalid JSON object.');
subsetTest(promise_test, async test => {
const uuid = generateUuid(test);
- const renderURL = createScoringSignalsRenderUrlWithBody(
+ const renderURL = createScoringSignalsRenderURLWithBody(
uuid, /*responseBody=*/'{}');
await runTrustedScoringSignalsTest(
test, uuid, renderURL,
@@ -444,7 +444,7 @@
const renderURL = createRenderURL(uuid, /*script=*/null, /*signalsParam=*/'num-value');
// This should not be sent. If it is, it will take precedence over the "num-value" parameter
// from "renderURL", resulting in the "renderURL" having a null "trustedScoringSignals" value.
- const componentURL = createScoringSignalsRenderUrlWithBody(
+ const componentURL = createScoringSignalsRenderURLWithBody(
uuid, /*responseBody=*/'{}');
await runTrustedScoringSignalsTest(
test, uuid, renderURL,
@@ -456,7 +456,7 @@
subsetTest(promise_test, async test => {
const uuid = generateUuid(test);
- const renderURL = createScoringSignalsRenderUrlWithBody(
+ const renderURL = createScoringSignalsRenderURLWithBody(
uuid, /*responseBody=*/'{}');
const componentURL = createRenderURL(uuid, /*script=*/null);
await runTrustedScoringSignalsTest(
