wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1149618 - Implement push_permission in Marionette, r=dburns

Browse Source
This commit is contained in:
Jonathan Griffin 2015-05-04 09:49:08 -07:00
parent ad8d9c9932
commit 9f386bdf5a
6 changed files with 72 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testing/marionette/client/marionette/marionette_test.py
View File

@ -646,6 +646,7 @@ class MarionetteTestCase(CommonTestCase):
def tearDown(self):
if not self.marionette.check_for_crash():
self.marionette.set_context("content")
self.marionette.clear_imported_scripts()
self.marionette.execute_script("log('TEST-END: %s:%s')" %
(self.filepath.replace('\\', '\\\\'), self.methodName))
self.marionette.test_name = None

3
testing/marionette/client/marionette/runner/base.py
View File

@ -493,6 +493,7 @@ class BaseMarionetteOptions(OptionParser):
class BaseMarionetteTestRunner(object):
textrunnerclass = MarionetteTextTestRunner
driverclass = Marionette
def __init__(self, address=None, emulator=None, emulator_binary=None,
emulator_img=None, emulator_res='480x800', homedir=None,
@ -696,7 +697,7 @@ class BaseMarionetteTestRunner(object):
return kwargs
def start_marionette(self):
self.marionette = Marionette(**self._build_kwargs())
self.marionette = self.driverclass(**self._build_kwargs())
def launch_test_container(self):
if self.marionette.session is None:

6
testing/marionette/client/marionette/runner/mixins/reporting.py
View File

@ -255,13 +255,13 @@ class HTMLReportingTestResultMixin(object):
self.marionette.set_context(self.marionette.CONTEXT_CONTENT)
debug['source'] = self.marionette.page_source
self.marionette.switch_to_frame()
self.marionette.push_permission('settings-read', True)
self.marionette.push_permission('settings-api-read', True)
debug['settings'] = json.dumps(self.marionette.execute_async_script("""
SpecialPowers.addPermission('settings-read', true, document);
SpecialPowers.addPermission('settings-api-read', true, document);
var req = window.navigator.mozSettings.createLock().get('*');
req.onsuccess = function() {
marionetteScriptFinished(req.result);
}""", special_powers=True), sort_keys=True, indent=4, separators=(',', ': '))
}""", sandbox='system'), sort_keys=True, indent=4, separators=(',', ': '))
except:
logger = get_default_logger()
logger.warning('Failed to gather test failure debug.', exc_info=True)

2
testing/marionette/client/marionette/tests/unit/test_getactiveframe_oop.py
View File

@ -29,7 +29,7 @@ class TestGetActiveFrameOOP(MarionetteTestCase):
def test_active_frame_oop(self):
self.marionette.navigate(self.marionette.absolute_url("test.html"))
self.marionette.execute_script("SpecialPowers.addPermission('browser', true, document)")
self.marionette.push_permission('browser', True)
# Create first OOP frame
self.marionette.execute_script("""

9
testing/marionette/client/marionette/tests/unit/test_switch_remote_frame.py
View File

@ -33,8 +33,7 @@ class TestSwitchRemoteFrame(MarionetteTestCase):
def test_remote_frame(self):
self.marionette.navigate(self.marionette.absolute_url("test.html"))
self.marionette.execute_async_script(
"SpecialPowers.pushPermissions([{'type': 'browser', 'allow': true, 'context': document}], marionetteScriptFinished);")
self.marionette.push_permission('browser', True)
self.marionette.execute_script("""
let iframe = document.createElement("iframe");
SpecialPowers.wrap(iframe).mozbrowser = true;
@ -55,8 +54,7 @@ class TestSwitchRemoteFrame(MarionetteTestCase):
def test_remote_frame_revisit(self):
# test if we can revisit a remote frame (this takes a different codepath)
self.marionette.navigate(self.marionette.absolute_url("test.html"))
self.marionette.execute_async_script(
"SpecialPowers.pushPermissions([{'type': 'browser', 'allow': true, 'context': document}], marionetteScriptFinished);")
self.marionette.push_permission('browser', True)
self.marionette.execute_script("""
let iframe = document.createElement("iframe");
SpecialPowers.wrap(iframe).mozbrowser = true;
@ -89,8 +87,7 @@ class TestSwitchRemoteFrame(MarionetteTestCase):
def test_we_can_switch_to_a_remote_frame_by_index(self):
# test if we can revisit a remote frame (this takes a different codepath)
self.marionette.navigate(self.marionette.absolute_url("test.html"))
self.marionette.execute_async_script(
"SpecialPowers.pushPermissions([{'type': 'browser', 'allow': true, 'context': document}], marionetteScriptFinished);")
self.marionette.push_permission('browser', True)
self.marionette.execute_script("""
let iframe = document.createElement("iframe");
SpecialPowers.wrap(iframe).mozbrowser = true;

62
testing/marionette/driver/marionette_driver/marionette.py
View File

@ -787,6 +787,68 @@ class Marionette(object):
typing.append(val[i])
return typing
def push_permission(self, perm_type, allow):
with self.using_context('content'):
perm = self.execute_script("""
let allow = arguments[0];
if (allow)
allow = Components.interfaces.nsIPermissionManager.ALLOW_ACTION;
else
allow = Components.interfaces.nsIPermissionManager.DENY_ACTION;
let perm_type = arguments[1];
Components.utils.import("resource://gre/modules/Services.jsm");
window.wrappedJSObject.permChanged = false;
window.wrappedJSObject.permObserver = function(subject, topic, data) {
if (topic == "perm-changed") {
let permission = subject.QueryInterface(Components.interfaces.nsIPermission);
if (perm_type == permission.type) {
Services.obs.removeObserver(window.wrappedJSObject.permObserver, "perm-changed");
window.wrappedJSObject.permChanged = true;
}
}
};
Services.obs.addObserver(window.wrappedJSObject.permObserver,
"perm-changed", false);
let value = {
'url': document.nodePrincipal.URI.spec,
'appId': document.nodePrincipal.appId,
'isInBrowserElement': document.nodePrincipal.isInBrowserElement,
'type': perm_type,
'action': allow
};
return value;
""", script_args=[allow, perm_type], sandbox='system')
with self.using_context('chrome'):
waiting = self.execute_script("""
Components.utils.import("resource://gre/modules/Services.jsm");
let perm = arguments[0];
let secMan = Services.scriptSecurityManager;
let principal = secMan.getAppCodebasePrincipal(Services.io.newURI(perm.url, null, null),
perm.appId, perm.isInBrowserElement);
let testPerm = Services.perms.testPermissionFromPrincipal(principal, perm.type, perm.action);
if (testPerm == perm.action) {
return false;
}
Services.perms.addFromPrincipal(principal, perm.type, perm.action);
return true;
""", script_args=[perm])
with self.using_context('content'):
if waiting:
self.execute_async_script("""
waitFor(marionetteScriptFinished, function() {
return window.wrappedJSObject.permChanged;
});
""", sandbox='system')
else:
self.execute_script("""
Components.utils.import("resource://gre/modules/Services.jsm");
Services.obs.removeObserver(window.wrappedJSObject.permObserver, "perm-changed");
""", sandbox='system')
def enforce_gecko_prefs(self, prefs):
"""
Checks if the running instance has the given prefs. If not, it will kill the