Title: [244359] trunk/LayoutTests
- Revision
- 244359
- Author
- [email protected]
- Date
- 2019-04-16 14:35:13 -0700 (Tue, 16 Apr 2019)
Log Message
Set test conditions closer to conversion redirect in LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html
https://bugs.webkit.org/show_bug.cgi?id=196983
<rdar://problem/49952679>
Unreviewed test gardening.
* http/tests/adClickAttribution/resources/redirectToConversion.php:
* http/tests/adClickAttribution/send-attribution-conversion-request.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (244358 => 244359)
--- trunk/LayoutTests/ChangeLog 2019-04-16 21:28:24 UTC (rev 244358)
+++ trunk/LayoutTests/ChangeLog 2019-04-16 21:35:13 UTC (rev 244359)
@@ -1,3 +1,14 @@
+2019-04-16 John Wilander <[email protected]>
+
+ Set test conditions closer to conversion redirect in LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html
+ https://bugs.webkit.org/show_bug.cgi?id=196983
+ <rdar://problem/49952679>
+
+ Unreviewed test gardening.
+
+ * http/tests/adClickAttribution/resources/redirectToConversion.php:
+ * http/tests/adClickAttribution/send-attribution-conversion-request.html:
+
2019-04-16 Devin Rousso <[email protected]>
Unprefix -webkit-sticky
Modified: trunk/LayoutTests/http/tests/adClickAttribution/resources/redirectToConversion.php (244358 => 244359)
--- trunk/LayoutTests/http/tests/adClickAttribution/resources/redirectToConversion.php 2019-04-16 21:28:24 UTC (rev 244358)
+++ trunk/LayoutTests/http/tests/adClickAttribution/resources/redirectToConversion.php 2019-04-16 21:35:13 UTC (rev 244359)
@@ -1,5 +1,6 @@
<?php
header("HTTP/1.0 302 Found");
+header("Cache-Control: no-cache, no-store, must-revalidate");
if (isset($_GET["conversionData"]) && isset($_GET["priority"])) {
header("Location: /.well-known/ad-click-attribution/" . $_GET["conversionData"] . "/" . $_GET["priority"]);
} else if (isset($_GET["conversionData"])) {
Modified: trunk/LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html (244358 => 244359)
--- trunk/LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html 2019-04-16 21:28:24 UTC (rev 244358)
+++ trunk/LayoutTests/http/tests/adClickAttribution/send-attribution-conversion-request.html 2019-04-16 21:35:13 UTC (rev 244359)
@@ -18,7 +18,6 @@
testRunner.waitUntilDone();
testRunner.dumpChildFramesAsText();
testRunner.setAllowsAnySSLCertificate(true);
- testRunner.setAdClickAttributionOverrideTimerForTesting(true);
}
function activateElement(elementID) {
@@ -41,7 +40,7 @@
document.body.removeChild(document.getElementById("pixel"));
let iframeElement = document.createElement("iframe");
- iframeElement.src = "" + nonce;
+ iframeElement.src = "" + nonce;
document.body.appendChild(iframeElement);
}
@@ -48,13 +47,14 @@
function runTest() {
if (window.testRunner) {
if (window.location.search === "?stepTwo") {
- testRunner.setAdClickAttributionConversionURLForTesting("http://127.0.0.1:8000/adClickAttribution/resources/conversionReport.php?nonce=" + nonce);
let imageElement = document.createElement("img");
- imageElement.src = ""
+ imageElement.src = "" + nonce;
imageElement.id = "pixel";
imageElement._onerror_ = function() {
appendConversionDataIframeAndFinish();
};
+ testRunner.setAdClickAttributionConversionURLForTesting("http://127.0.0.1:8000/adClickAttribution/resources/conversionReport.php?nonce=" + nonce);
+ testRunner.setAdClickAttributionOverrideTimerForTesting(true);
document.body.appendChild(imageElement);
} else {
activateElement("targetLink");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
