Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1255569 - Add coverage for cookie eviction events for expired cookies. r=kmag

Browse Source 
Fix bug in ext-cookies.js that was reporting expired cookies as evicted
Only run test in non-e10s

MozReview-Commit-ID: H2o5GnVtTzi

--HG--
extra : transplant_source : h%91%D8%40%D6%ED7wCL%F1%19%18.%24Oxz%81%C6
This commit is contained in:
bsilverberg 2016-04-01 10:21:47 -04:00
parent 3983a24109
commit b6936b19d9
3 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/components/extensions/ext-cookies.js
View File

@ -338,7 +338,7 @@ extensions.registerSchemaAPI("cookies", "cookies", (extension, context) => {
subject.QueryInterface(Ci.nsIArray);
for (let i = 0; i < subject.length; i++) {
let cookie = subject.queryElementAt(i, Ci.nsICookie2);
if (!cookie.isSession && (cookie.expiry + 1) * 1000 <= Date.now()) {
if (!cookie.isSession && cookie.expiry * 1000 <= Date.now()) {
notify(true, cookie, "expired");
} else {
notify(true, cookie, "evicted");

2
toolkit/components/extensions/test/mochitest/mochitest.ini
View File

@ -62,6 +62,8 @@ skip-if = (os == 'android' || buildapp == 'b2g') # sender.tab is undefined on b2
skip-if = os == 'android' # Android does not currently support tabs.
[test_ext_background_runtime_connect_params.html]
[test_ext_cookies.html]
[test_ext_cookies_expiry.html]
skip-if = e10s || buildapp == 'b2g' # Uses cookie service via SpecialPowers.Services, which does not support e10s.
[test_ext_cookies_permissions.html]
skip-if = e10s || buildapp == 'b2g' # Uses cookie service via SpecialPowers.Services, which does not support e10s.
[test_ext_bookmarks.html]

71
toolkit/components/extensions/test/mochitest/test_ext_cookies_expiry.html Normal file
View File

@ -0,0 +1,71 @@
<!DOCTYPE HTML>
<html>
<head>
<title>WebExtension test</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/ExtensionTestUtils.js"></script>
<script type="text/javascript" src="head.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<script type="text/javascript">
"use strict";
add_task(function* test_cookies_expiry() {
function background() {
let expectedEvents = [];
browser.cookies.onChanged.addListener(event => {
expectedEvents.push(`${event.removed}:${event.cause}`);
if (expectedEvents.length === 1) {
browser.test.assertEq("true:expired", expectedEvents[0], "expired cookie removed");
browser.test.assertEq("first", event.cookie.name, "expired cookie has the expected name");
browser.test.assertEq("one", event.cookie.value, "expired cookie has the expected value");
} else {
browser.test.assertEq("false:explicit", expectedEvents[1], "new cookie added");
browser.test.assertEq("first", event.cookie.name, "new cookie has the expected name");
browser.test.assertEq("one-again", event.cookie.value, "new cookie has the expected value");
browser.test.notifyPass("cookie-expiry");
}
});
setTimeout(() => {
browser.test.sendMessage("change-cookies");
}, 1000);
}
let domain = ".example.com";
let extension = ExtensionTestUtils.loadExtension({
manifest: {
"permissions": ["http://example.com/", "cookies"],
},
background: `(${background})()`,
});
let cookieSvc = SpecialPowers.Services.cookies;
let cookie = {
host: domain,
name: "first",
path: "/",
};
do {
cookieSvc.add(cookie.host, cookie.path, cookie.name, "one", false, false, false, Date.now() / 1000 + 1);
} while (!cookieSvc.cookieExists(cookie));
yield extension.startup();
yield extension.awaitMessage("change-cookies");
cookieSvc.add(cookie.host, cookie.path, cookie.name, "one-again", false, false, false, Date.now() / 1000 + 10);
yield extension.awaitFinish("cookie-expiry");
yield extension.unload();
});
</script>
</body>
</html>