Skip to content
Permalink
Browse files

Update webdriver to 0.39

  • Loading branch information...
Eijebong committed Apr 19, 2019
1 parent dc07e51 commit 18a90f04db545c091aec5f244b74953d04140253
Showing with 14 additions and 11 deletions.
  1. +3 −3 Cargo.lock
  2. +1 −1 components/webdriver_server/Cargo.toml
  3. +10 −7 components/webdriver_server/lib.rs

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -31,4 +31,4 @@ servo_config = {path = "../config"}
servo_url = {path = "../url"}
url = "1.2"
uuid = {version = "0.7", features = ["v4"]}
webdriver = "0.38"
webdriver = "0.39"
@@ -109,7 +109,7 @@ struct WebDriverSession {

/// Time to wait for injected scripts to run before interrupting them. A [`None`] value
/// specifies that the script should run indefinitely.
script_timeout: u64,
script_timeout: Option<u64>,

/// Time to wait for a page to finish loading upon navigation.
load_timeout: u64,
@@ -129,7 +129,7 @@ impl WebDriverSession {
browsing_context_id: browsing_context_id,
top_level_browsing_context_id: top_level_browsing_context_id,

script_timeout: 30_000,
script_timeout: Some(30_000),
load_timeout: 300_000,
implicit_wait_timeout: 0,
}
@@ -981,7 +981,7 @@ impl Handler {
.ok_or(WebDriverError::new(ErrorStatus::SessionNotCreated, ""))?;

if let Some(timeout) = parameters.script {
session.script_timeout = timeout
session.script_timeout = timeout;
}
if let Some(timeout) = parameters.page_load {
session.load_timeout = timeout
@@ -1019,11 +1019,14 @@ impl Handler {
let func_body = &parameters.script;
let args_string = "window.webdriverCallback";

let timeout_script = if let Some(script_timeout) = self.session()?.script_timeout {
format!("setTimeout(webdriverTimeout, {});", script_timeout)
} else {
"".into()
};
let script = format!(
"setTimeout(webdriverTimeout, {}); (function(callback) {{ {} }})({})",
self.session()?.script_timeout,
func_body,
args_string
"{} (function(callback) {{ {} }})({})",
timeout_script, func_body, args_string
);

let (sender, receiver) = ipc::channel().unwrap();

0 comments on commit 18a90f0

Please sign in to comment.
You can’t perform that action at this time.