зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1762462 - Make tests in dom/tests/mochitest/sessionstorage/ reflect Always Partitioning Storage; r=asuth
Depends on D148054 Differential Revision: https://phabricator.services.mozilla.com/D148057
This commit is contained in:
Thomas Wisniewski
Родитель
31a5e80096
Коммит
4190bec205
|
|
@ -5,23 +5,29 @@
|
|||
<script type="text/javascript" src="interOriginSlave.js"></script>
|
||||
<script type="text/javascript">
|
||||
|
||||
var aps = document.location.hash.includes("aps");
|
||||
var xorigin = document.location.hash.includes("xorigin");
|
||||
var sameOrigin = document.location.origin === "http://mochi.test:8888";
|
||||
|
||||
var currentStep = 2;
|
||||
|
||||
function doStep()
|
||||
{
|
||||
var expect = (!xorigin && aps && sameOrigin) ? 2 : 0;
|
||||
switch (currentStep)
|
||||
{
|
||||
case 2:
|
||||
is(sessionStorage.length, 0, "Num of items is 0");
|
||||
is(sessionStorage.length, expect, `Num of items is ${expect}`);
|
||||
|
||||
sessionStorage.setItem("C", "3");
|
||||
|
||||
is(sessionStorage.getItem("C"), "3", "C is 3 in the slave");
|
||||
is(sessionStorage.length, 1, "Num of items is 1");
|
||||
is(sessionStorage.length, expect + 1, `Num of items is ${expect + 1}`);
|
||||
break;
|
||||
|
||||
case 4:
|
||||
is(sessionStorage.getItem("C"), "3", "C is 3 in the slave");
|
||||
is(sessionStorage.length, 1, "Num of items is 1");
|
||||
is(sessionStorage.length, expect + 1, `Num of items is ${expect + 1}`);
|
||||
break;
|
||||
|
||||
case 6:
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ support-files =
|
|||
[test_sessionStorageBase.html]
|
||||
[test_sessionStorageBaseSessionOnly.html]
|
||||
[test_sessionStorageClone.html]
|
||||
[test_sessionStorageClone_alwaysPartitioned.html]
|
||||
[test_sessionStorageHttpHttps.html]
|
||||
[test_sessionStorageReplace.html]
|
||||
[test_sessionStorageUsage.html]
|
||||
|
|
|
|||
|
|
@ -35,6 +35,10 @@ async function doNextTest()
|
|||
await SpecialPowers.wrap(document).requestStorageAccess();
|
||||
}
|
||||
|
||||
await SpecialPowers.pushPrefEnv({
|
||||
set: [["privacy.partition.always_partition_third_party_non_cookie_storage", false]],
|
||||
});
|
||||
|
||||
// We must perform the first step of the test
|
||||
// to prepare the land.
|
||||
currentStep = 1;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,107 @@
|
|||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>sessionStorage clone equal origins</title>
|
||||
|
||||
<script src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="text/javascript" src="interOriginTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
var currentTest = 1;
|
||||
var currentStep = 1;
|
||||
|
||||
async function doNextTest()
|
||||
{
|
||||
// Bug 1746646: Make mochitests work with TCP enabled (cookieBehavior = 5)
|
||||
// Acquire storage access permission here so that the sessionStorage object is
|
||||
// shared between this window and the slave in xorigin tests. Without this,
|
||||
// our storage would be isolated as a xorigin iframe.
|
||||
if (isXOrigin) {
|
||||
SpecialPowers.wrap(document).notifyUserGestureActivation();
|
||||
await SpecialPowers.addPermission(
|
||||
"storageAccessAPI",
|
||||
true,
|
||||
window.location.href
|
||||
);
|
||||
await SpecialPowers.wrap(document).requestStorageAccess();
|
||||
}
|
||||
|
||||
await SpecialPowers.pushPrefEnv({
|
||||
set: [["privacy.partition.always_partition_third_party_non_cookie_storage", true]],
|
||||
});
|
||||
|
||||
// We must perform the first step of the test
|
||||
// to prepare the land.
|
||||
currentStep = 1;
|
||||
doStep();
|
||||
|
||||
let hash = "#aps";
|
||||
if (isXOrigin) hash += "xorigin";
|
||||
|
||||
switch (currentTest)
|
||||
{
|
||||
case 1:
|
||||
// Open a window from the same origin and check data
|
||||
// are copied but not further modified on our side
|
||||
slaveOrigin = "http://mochi.test:8888";
|
||||
slave = window.open(slaveOrigin + slavePath + "frameNotEqual.html" + hash);
|
||||
break;
|
||||
|
||||
case 2:
|
||||
slave.close();
|
||||
// Open a window from a different origin and check data
|
||||
// are NOT copied and not modified on our side
|
||||
slaveOrigin = "https://example.com";
|
||||
slave = window.open(slaveOrigin + slavePath + "frameNotEqual.html" + hash);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
slave.close();
|
||||
sessionStorage.clear();
|
||||
SimpleTest.finish();
|
||||
break;
|
||||
}
|
||||
|
||||
++currentTest;
|
||||
}
|
||||
|
||||
function doStep()
|
||||
{
|
||||
switch (currentStep)
|
||||
{
|
||||
case 1:
|
||||
sessionStorage.setItem("A", "1");
|
||||
sessionStorage.setItem("B", "2");
|
||||
is(sessionStorage.getItem("A"), "1", "A is 1 in the master");
|
||||
is(sessionStorage.getItem("B"), "2", "B is 2 in the master");
|
||||
is(sessionStorage.length, 2, "Num of items is 2");
|
||||
break;
|
||||
|
||||
case 3:
|
||||
is(sessionStorage.getItem("A"), "1", "A is 1 in the master");
|
||||
is(sessionStorage.getItem("B"), "2", "B is 2 in the master");
|
||||
is(sessionStorage.getItem("C"), null, "C is null in the master");
|
||||
is(sessionStorage.length, 2, "Num of items is 2");
|
||||
|
||||
sessionStorage.setItem("C", "4");
|
||||
is(sessionStorage.getItem("C"), "4", "C is 4 in the master");
|
||||
is(sessionStorage.length, 3, "Num of items is 3");
|
||||
break;
|
||||
}
|
||||
|
||||
++currentStep;
|
||||
++currentStep;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
|
||||
</script>
|
||||
|
||||
</head>
|
||||
|
||||
<body onload="doNextTest();">
|
||||
</body>
|
||||
</html>
|
||||
Загрузка…
Ссылка в новой задаче