Update to latest wptrunner.

This commit is contained in:
James Graham 2015-10-05 17:22:42 +01:00
parent bae87d193d
commit da3bc54d05
7 changed files with 66 additions and 8 deletions

View file

@ -346,7 +346,8 @@ class Find(object):
class Session(object):
def __init__(self, host, port, url_prefix="", desired_capabilities=None, port_timeout=60):
def __init__(self, host, port, url_prefix="", desired_capabilities=None, port_timeout=60,
extension=None):
self.transport = Transport(host, port, url_prefix, port_timeout)
self.desired_capabilities = desired_capabilities
self.session_id = None
@ -354,6 +355,8 @@ class Session(object):
self.window = None
self.find = None
self._element_cache = {}
self.extension = None
self.extension_cls = extension
def start(self):
desired_capabilities = self.desired_capabilities if self.desired_capabilities else {}
@ -365,6 +368,8 @@ class Session(object):
self.timeouts = Timeouts(self)
self.window = Window(self)
self.find = Find(self)
if self.extension_cls:
self.extension = self.extension_cls(self)
return rv["value"]
@ -376,6 +381,7 @@ class Session(object):
self.timeouts = None
self.window = None
self.find = None
self.extension = None
self.transport.close_connection()
def __enter__(self):
@ -579,9 +585,37 @@ class Element(object):
@property
@command
def text(self):
return self.session.send_command("GET", self.url("text"), key="value")
return self.session.send_command("GET", self.url("text"))
@property
@command
def name(self):
return self.session.send_command("GET", self.url("name"), key="value")
return self.session.send_command("GET", self.url("name"))
@command
def css(self, property_name):
return self.session.send_command("GET", self.url("css/%s" % property_name))
@property
@command
def rect(self):
return self.session.send_command("GET", self.url("rect"))
class ServoExtensions(object):
def __init__(self, session):
self.session = session
@command
def get_prefs(self, *prefs):
body = {"prefs": list(prefs)}
return self.session.send_command("POST", "servo/prefs/get", body)
@command
def set_prefs(self, prefs):
body = {"prefs": prefs}
return self.session.send_command("POST", "servo/prefs/set", body)
@command
def reset_prefs(self, *prefs):
body = {"prefs": list(prefs)}
return self.session.send_command("POST", "servo/prefs/reset", body)