Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 859401 - pushPermissions missing PROMPT_ACTION case. r=jmaher

Browse Source
This commit is contained in:
Martijn Wargers 2013-05-17 10:46:36 +02:00
parent 7f8d3336b8
commit 1e95b05c7e
3 changed files with 116 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testing/mochitest/tests/Makefile.in
View File

@ -20,6 +20,7 @@ _TEST_FILES = \
test_sanityWindowSnapshot.html \
test_SpecialPowersExtension.html \
test_SpecialPowersExtension2.html \
test_SpecialPowersPushPermissions.html \
file_SpecialPowersFrame1.html \
test_bug816847.html \
test_sanity_cleanup.html \

96
testing/mochitest/tests/test_SpecialPowersPushPermissions.html Normal file
View File

@ -0,0 +1,96 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test for SpecialPowers extension</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body onload="starttest();">
<pre id="test">
<script class="testbody" type="text/javascript">
var pm = SpecialPowers.Cc["@mozilla.org/permissionmanager;1"]
.getService(SpecialPowers.Ci.nsIPermissionManager);
const ALLOW_ACTION = pm.ALLOW_ACTION;
const DENY_ACTION = pm.DENY_ACTION;
const UNKNOWN_ACTION = pm.UNKNOWN_ACTION;
const PROMPT_ACTION = pm.PROMPT_ACTION;
function starttest(){
SpecialPowers.addPermission("pPROMPT", PROMPT_ACTION, document);
SpecialPowers.addPermission("pALLOW", ALLOW_ACTION, document);
SpecialPowers.addPermission("pDENY", DENY_ACTION, document);
setTimeout(test1, 0);
}
SimpleTest.waitForExplicitFinish();
function test1() {
if (!SpecialPowers.testPermission('pALLOW', ALLOW_ACTION, document)) {
dump('/**** allow not set ****/\n');
setTimeout(test1, 0);
} else if (!SpecialPowers.testPermission('pDENY', DENY_ACTION, document)) {
dump('/**** deny not set ****/\n');
setTimeout(test1, 0);
} else if (!SpecialPowers.testPermission('pPROMPT', PROMPT_ACTION, document)) {
dump('/**** prompt not set ****/\n');
setTimeout(test1, 0);
} else {
test2();
}
}
function test2() {
ok(SpecialPowers.testPermission('pUNKNOWN', UNKNOWN_ACTION, document), 'pUNKNOWN value should have UNKOWN permission');
SpecialPowers.pushPermissions([{'type': 'pUNKNOWN', 'allow': true, 'context': document}, {'type': 'pALLOW', 'allow': false, 'context': document}, {'type': 'pDENY', 'allow': true, 'context': document}, {'type': 'pPROMPT', 'allow': true, 'context': document}], test3);
}
function test3() {
ok(SpecialPowers.testPermission('pUNKNOWN', ALLOW_ACTION, document), 'pUNKNOWN value should have ALLOW permission');
ok(SpecialPowers.testPermission('pPROMPT', ALLOW_ACTION, document), 'pUNKNOWN value should have ALLOW permission');
ok(SpecialPowers.testPermission('pALLOW', DENY_ACTION, document), 'pALLOW should have DENY permission');
ok(SpecialPowers.testPermission('pDENY', ALLOW_ACTION, document), 'pDENY should have ALLOW permission');
// only pPROMPT (last one) is different, the other stuff is just to see if it doesn't cause test failures
SpecialPowers.pushPermissions([{'type': 'pUNKNOWN', 'allow': true, 'context': document}, {'type': 'pALLOW', 'allow': false, 'context': document}, {'type': 'pDENY', 'allow': true, 'context': document}, {'type': 'pPROMPT', 'allow': false, 'context': document}], test4);
}
function test4() {
ok(SpecialPowers.testPermission('pPROMPT', DENY_ACTION, document), 'pPROMPT value should have DENY permission');
//this should reset all the permissions to before all the pushPermissions calls
SpecialPowers.flushPermissions(test5);
}
function test5() {
ok(SpecialPowers.testPermission('pUNKNOWN', UNKNOWN_ACTION, document), 'pUNKNOWN should have UNKNOWN permission');
ok(SpecialPowers.testPermission('pALLOW', ALLOW_ACTION, document), 'pALLOW should have ALLOW permission');
ok(SpecialPowers.testPermission('pDENY', DENY_ACTION, document), 'pDENY should have DENY permission');
ok(SpecialPowers.testPermission('pPROMPT', PROMPT_ACTION, document), 'pPROMPT should have PROMPT permission');
SpecialPowers.removePermission("pPROMPT", document);
SpecialPowers.removePermission("pALLOW", document);
SpecialPowers.removePermission("pDENY", document);
setTimeout(test6, 0);
}
function test6() {
if (!SpecialPowers.testPermission('pALLOW', UNKNOWN_ACTION, document)) {
dump('/**** allow still set ****/\n');
setTimeout(test6, 0);
} else if (!SpecialPowers.testPermission('pDENY', UNKNOWN_ACTION, document)) {
dump('/**** deny still set ****/\n');
setTimeout(test6, 0);
} else if (!SpecialPowers.testPermission('pPROMPT', UNKNOWN_ACTION, document)) {
dump('/**** prompt still set ****/\n');
setTimeout(test6, 0);
} else {
SimpleTest.finish();
}
}
</script>
</pre>
</body>
</html>

25
testing/specialpowers/content/specialpowersAPI.js
View File

@ -502,7 +502,7 @@ SpecialPowersAPI.prototype = {
inPermissions is an array of objects where each object has a type, action, context, ex:
[{'type': 'SystemXHR', 'allow': 1, 'context': document},
{'type': 'SystemXHR', 'allow': 0, 'context': document}]
{'type': 'SystemXHR', 'allow': Ci.nsIPermissionManager.PROMPT_ACTION, 'context': document}]
allow is a boolean and can be true/false or 1/0
*/
@ -517,12 +517,19 @@ SpecialPowersAPI.prototype = {
originalValue = Ci.nsIPermissionManager.ALLOW_ACTION;
} else if (this.testPermission(permission.type, Ci.nsIPermissionManager.DENY_ACTION, permission.context)) {
originalValue = Ci.nsIPermissionManager.DENY_ACTION;
} else if (this.testPermission(permission.type, Ci.nsIPermissionManager.PROMPT_ACTION, permission.context)) {
originalValue = Ci.nsIPermissionManager.PROMPT_ACTION;
}
let [url, appId, isInBrowserElement] = this._getInfoFromPermissionArg(permission.context);
let perm = permission.allow ? Ci.nsIPermissionManager.ALLOW_ACTION
: Ci.nsIPermissionManager.DENY_ACTION;
let perm;
if (typeof permission.allow !== 'boolean') {
perm = permission.allow;
} else {
perm = permission.allow ? Ci.nsIPermissionManager.ALLOW_ACTION
: Ci.nsIPermissionManager.DENY_ACTION;
}
if (originalValue == perm) {
continue;
@ -534,7 +541,8 @@ SpecialPowersAPI.prototype = {
if (originalValue == Ci.nsIPermissionManager.UNKNOWN_ACTION) {
cleanupTodo.op = 'remove';
} else {
cleeanupTodo.value = originalValue;
cleanupTodo.value = originalValue;
cleanupTodo.permission = originalValue;
}
cleanupPermissions.push(cleanupTodo);
}
@ -1422,8 +1430,13 @@ SpecialPowersAPI.prototype = {
addPermission: function(type, allow, arg) {
let [url, appId, isInBrowserElement] = this._getInfoFromPermissionArg(arg);
let permission = allow ? Ci.nsIPermissionManager.ALLOW_ACTION
: Ci.nsIPermissionManager.DENY_ACTION;
let permission;
if (typeof allow !== 'boolean') {
permission = allow;
} else {
permission = allow ? Ci.nsIPermissionManager.ALLOW_ACTION
: Ci.nsIPermissionManager.DENY_ACTION;
}
var msg = {
'op': 'add',