diff --git a/components/webdriver_server/capabilities.rs b/components/webdriver_server/capabilities.rs new file mode 100644 index 00000000000..5e9b877c84c --- /dev/null +++ b/components/webdriver_server/capabilities.rs @@ -0,0 +1,89 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +use serde_json::{Map, Value}; +use webdriver::capabilities::{BrowserCapabilities, Capabilities}; +use webdriver::error::WebDriverResult; + +pub struct ServoCapabilities { + pub browser_name: String, + pub browser_version: String, + pub platform_name: Option, + pub accept_insecure_certs: bool, + pub set_window_rect: bool, + pub strict_file_interactability: bool, + pub accept_proxy: bool, + pub accept_custom: bool, +} + +impl ServoCapabilities { + pub fn new() -> ServoCapabilities { + ServoCapabilities { + browser_name: "servo".to_string(), + browser_version: "0.0.1".to_string(), + platform_name: get_platform_name(), + accept_insecure_certs: false, + set_window_rect: true, + strict_file_interactability: false, + accept_proxy: false, + accept_custom: false, + } + } +} + +impl BrowserCapabilities for ServoCapabilities { + fn init(&mut self, _: &Capabilities) {} + + fn browser_name(&mut self, _: &Capabilities) -> WebDriverResult> { + Ok(Some(self.browser_name.clone())) + } + + fn browser_version(&mut self, _: &Capabilities) -> WebDriverResult> { + Ok(Some(self.browser_version.clone())) + } + + fn compare_browser_version(&mut self, _: &str, _: &str) -> WebDriverResult { + Ok(true) + } + + fn platform_name(&mut self, _: &Capabilities) -> WebDriverResult> { + Ok(self.platform_name.clone()) + } + + fn accept_insecure_certs(&mut self, _: &Capabilities) -> WebDriverResult { + Ok(self.accept_insecure_certs) + } + + fn set_window_rect(&mut self, _: &Capabilities) -> WebDriverResult { + Ok(self.set_window_rect) + } + + fn strict_file_interactability(&mut self, _: &Capabilities) -> WebDriverResult { + Ok(self.strict_file_interactability) + } + + fn accept_proxy(&mut self, _: &Map, _: &Capabilities) -> WebDriverResult { + Ok(self.accept_proxy) + } + + fn accept_custom(&mut self, _: &str, _: &Value, _: &Capabilities) -> WebDriverResult { + Ok(self.accept_custom) + } + + fn validate_custom(&self, _: &str, _: &Value) -> WebDriverResult<()> { + Ok(()) + } +} + +fn get_platform_name() -> Option { + if cfg!(target_os = "windows") { + Some("windows".to_string()) + } else if cfg!(target_os = "linux") { + Some("linux".to_string()) + } else if cfg!(target_os = "macos") { + Some("mac".to_string()) + } else { + None + } +} diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 749f82dbce3..dcce929652b 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -10,8 +10,13 @@ extern crate log; #[macro_use] extern crate serde; +#[macro_use] +extern crate serde_json; + +mod capabilities; use base64; +use capabilities::ServoCapabilities; use crossbeam_channel::Sender; use euclid::TypedSize2D; use hyper::Method; @@ -28,7 +33,7 @@ use script_traits::webdriver_msg::{ use script_traits::{ConstellationMsg, LoadData, WebDriverCommandMsg}; use serde::de::{Deserialize, Deserializer, MapAccess, Visitor}; use serde::ser::{Serialize, Serializer}; -use serde_json::{self, Value}; +use serde_json::{json, Value}; use servo_config::{prefs, prefs::PrefValue}; use servo_url::ServoUrl; use std::borrow::ToOwned; @@ -38,10 +43,13 @@ use std::net::{SocketAddr, SocketAddrV4}; use std::thread; use std::time::Duration; use uuid::Uuid; +use webdriver::capabilities::{Capabilities, CapabilitiesMatching}; use webdriver::command::{ AddCookieParameters, GetParameters, JavascriptCommandParameters, LocatorParameters, }; -use webdriver::command::{SendKeysParameters, SwitchToFrameParameters, TimeoutsParameters}; +use webdriver::command::{ + NewSessionParameters, SendKeysParameters, SwitchToFrameParameters, TimeoutsParameters, +}; use webdriver::command::{ WebDriverCommand, WebDriverExtensionCommand, WebDriverMessage, WindowRectParameters, }; @@ -117,6 +125,11 @@ struct WebDriverSession { /// Time to wait for the element location strategy when retrieving elements, and when /// waiting for an element to become interactable. implicit_wait_timeout: u64, + + page_loading_strategy: String, + secure_tls: bool, + strict_file_interactability: bool, + unhandled_prompt_behavior: String, } impl WebDriverSession { @@ -132,6 +145,11 @@ impl WebDriverSession { script_timeout: Some(30_000), load_timeout: 300_000, implicit_wait_timeout: 0, + + page_loading_strategy: "normal".to_string(), + secure_tls: true, + strict_file_interactability: false, + unhandled_prompt_behavior: "dismiss and notify".to_string(), } } } @@ -381,26 +399,137 @@ impl Handler { } } - fn handle_new_session(&mut self) -> WebDriverResult { - debug!("new session"); + fn handle_new_session( + &mut self, + parameters: &NewSessionParameters, + ) -> WebDriverResult { + let mut servo_capabilities = ServoCapabilities::new(); + let processed_capabilities = match parameters { + NewSessionParameters::Legacy(_) => Some(Capabilities::new()), + NewSessionParameters::Spec(capabilities) => { + capabilities.match_browser(&mut servo_capabilities)? + }, + }; + if self.session.is_none() { - let top_level_browsing_context_id = self.focus_top_level_browsing_context_id()?; - let browsing_context_id = BrowsingContextId::from(top_level_browsing_context_id); - let session = WebDriverSession::new(browsing_context_id, top_level_browsing_context_id); - let mut capabilities = serde_json::Map::new(); - capabilities.insert("browserName".to_owned(), serde_json::to_value("servo")?); - capabilities.insert("browserVersion".to_owned(), serde_json::to_value("0.0.1")?); - capabilities.insert( - "acceptInsecureCerts".to_owned(), - serde_json::to_value(false)?, - ); - let response = - NewSessionResponse::new(session.id.to_string(), Value::Object(capabilities)); - debug!("new session created {}.", session.id); - self.session = Some(session); - Ok(WebDriverResponse::NewSession(response)) + match processed_capabilities { + Some(mut processed) => { + let top_level_browsing_context_id = + self.focus_top_level_browsing_context_id()?; + let browsing_context_id = + BrowsingContextId::from(top_level_browsing_context_id); + let mut session = + WebDriverSession::new(browsing_context_id, top_level_browsing_context_id); + + match processed.get("pageLoadStrategy") { + Some(strategy) => session.page_loading_strategy = strategy.to_string(), + None => { + processed.insert( + "pageLoadStrategy".to_string(), + json!(session.page_loading_strategy), + ); + }, + } + + match processed.get("strictFileInteractability") { + Some(strict_file_interactability) => { + session.strict_file_interactability = + strict_file_interactability.as_bool().unwrap() + }, + None => { + processed.insert( + "strictFileInteractability".to_string(), + json!(session.strict_file_interactability), + ); + }, + } + + match processed.get("proxy") { + Some(_) => (), + None => { + processed.insert("proxy".to_string(), json!({})); + }, + } + + if let Some(timeouts) = processed.get("timeouts") { + if let Some(script_timeout_value) = timeouts.get("script") { + session.script_timeout = script_timeout_value.as_u64(); + } + if let Some(load_timeout_value) = timeouts.get("pageLoad") { + if let Some(load_timeout) = load_timeout_value.as_u64() { + session.load_timeout = load_timeout; + } + } + if let Some(implicit_wait_timeout_value) = timeouts.get("implicit") { + if let Some(implicit_wait_timeout) = + implicit_wait_timeout_value.as_u64() + { + session.implicit_wait_timeout = implicit_wait_timeout; + } + } + } + processed.insert( + "timeouts".to_string(), + json!({ + "script": session.script_timeout, + "pageLoad": session.load_timeout, + "implicit": session.implicit_wait_timeout, + }), + ); + + match processed.get("acceptInsecureCerts") { + Some(accept_insecure_certs) => { + session.secure_tls = !accept_insecure_certs.as_bool().unwrap() + }, + None => { + processed.insert( + "acceptInsecureCerts".to_string(), + json!(servo_capabilities.accept_insecure_certs), + ); + }, + } + + match processed.get("unhandledPromptBehavior") { + Some(unhandled_prompt_behavior) => { + session.unhandled_prompt_behavior = + unhandled_prompt_behavior.to_string() + }, + None => { + processed.insert( + "unhandledPromptBehavior".to_string(), + json!(session.unhandled_prompt_behavior), + ); + }, + } + + processed.insert( + "browserName".to_string(), + json!(servo_capabilities.browser_name), + ); + processed.insert( + "browserVersion".to_string(), + json!(servo_capabilities.browser_version), + ); + processed.insert( + "platformName".to_string(), + json!(servo_capabilities + .platform_name + .unwrap_or("unknown".to_string())), + ); + processed.insert( + "setWindowRect".to_string(), + json!(servo_capabilities.set_window_rect), + ); + + let response = + NewSessionResponse::new(session.id.to_string(), Value::Object(processed)); + self.session = Some(session); + + Ok(WebDriverResponse::NewSession(response)) + }, + None => Ok(WebDriverResponse::Void), + } } else { - debug!("new session failed."); Err(WebDriverError::new( ErrorStatus::UnknownError, "Session already created", @@ -1287,7 +1416,7 @@ impl WebDriverHandler for Handler { } match msg.command { - WebDriverCommand::NewSession(_) => self.handle_new_session(), + WebDriverCommand::NewSession(ref parameters) => self.handle_new_session(parameters), WebDriverCommand::DeleteSession => self.handle_delete_session(), WebDriverCommand::AddCookie(ref parameters) => self.handle_add_cookie(parameters), WebDriverCommand::Get(ref parameters) => self.handle_get(parameters), diff --git a/tests/wpt/metadata/webdriver/tests/new_session/default_values.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/default_values.py.ini index 01d332bcfef..f63217e0040 100644 --- a/tests/wpt/metadata/webdriver/tests/new_session/default_values.py.ini +++ b/tests/wpt/metadata/webdriver/tests/new_session/default_values.py.ini @@ -1,10 +1,4 @@ [default_values.py] - [test_ignore_non_spec_fields_in_capabilities] - expected: FAIL - - [test_valid_but_unmatchable_key] - expected: FAIL - [test_no_capabilites] expected: FAIL diff --git a/tests/wpt/metadata/webdriver/tests/new_session/invalid_capabilities.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/invalid_capabilities.py.ini index 3b3ee7c9ddc..e2771ae0e98 100644 --- a/tests/wpt/metadata/webdriver/tests/new_session/invalid_capabilities.py.ini +++ b/tests/wpt/metadata/webdriver/tests/new_session/invalid_capabilities.py.ini @@ -1,586 +1,4 @@ [invalid_capabilities.py] - [test_invalid_values[timeouts-value58-0\]] - expected: FAIL - - [test_invalid_values[platformName-value13-1\]] - expected: FAIL - - [test_invalid_values[proxy-value43-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value54-1\]] - expected: FAIL - - [test_invalid_values[proxy-value28-0\]] - expected: FAIL - - [test_invalid_values[proxy-value40-0\]] - expected: FAIL - - [test_invalid_extensions[firefox-0\]] - expected: FAIL - - [test_invalid_extensions[automaticInspection-1\]] - expected: FAIL - - [test_invalid_values[browserName-1-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value57-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-dismiss -0\]] - expected: FAIL - - [test_invalid_values[timeouts-value62-1\]] - expected: FAIL - - [test_invalid_values[proxy-value37-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-value69-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-False-0\]] - expected: FAIL - - [test_invalid_values[proxy-value31-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-interactive-1\]] - expected: FAIL - - [test_invalid_values[proxy-value37-0\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-DISMISS-0\]] - expected: FAIL - - [test_invalid_values[proxy-value39-1\]] - expected: FAIL - - [test_invalid_extensions[firefox_binary-0\]] - expected: FAIL - - [test_invalid_values[strictFileInteractability-false-0\]] - expected: FAIL - - [test_invalid_values[acceptInsecureCerts-value1-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value50-0\]] - expected: FAIL - - [test_invalid_values[browserVersion-False-1\]] - expected: FAIL - - [test_invalid_extensions[logFile-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value60-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-value68-0\]] - expected: FAIL - - [test_invalid_values[platformName-value13-0\]] - expected: FAIL - - [test_invalid_values[browserName-value6-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-value18-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value57-0\]] - expected: FAIL - - [test_invalid_extensions[nativeEvents-0\]] - expected: FAIL - - [test_invalid_values[timeouts-False-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-eagerblah-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value58-1\]] - expected: FAIL - - [test_invalid_extensions[platform-0\]] - expected: FAIL - - [test_invalid_values[browserVersion-False-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value61-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value46-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-Accept-1\]] - expected: FAIL - - [test_invalid_values[acceptInsecureCerts-1-0\]] - expected: FAIL - - [test_invalid_values[proxy-value39-0\]] - expected: FAIL - - [test_invalid_extensions[firefox_binary-1\]] - expected: FAIL - - [test_invalid_extensions[logLevel-0\]] - expected: FAIL - - [test_invalid_values[browserName-1-1\]] - expected: FAIL - - [test_invalid_values[strictFileInteractability-false-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value50-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-eager -0\]] - expected: FAIL - - [test_invalid_extensions[profile-1\]] - expected: FAIL - - [test_invalid_extensions[platformVersion-0\]] - expected: FAIL - - [test_invalid_values[proxy-value36-0\]] - expected: FAIL - - [test_invalid_values[acceptInsecureCerts-value2-0\]] - expected: FAIL - - [test_invalid_values[platformName-False-0\]] - expected: FAIL - - [test_invalid_values[proxy-value33-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value59-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value49-0\]] - expected: FAIL - - [test_invalid_values[timeouts-1-0\]] - expected: FAIL - - [test_invalid_values[browserName-value5-1\]] - expected: FAIL - - [test_invalid_extensions[browser-1\]] - expected: FAIL - - [test_invalid_values[proxy-value41-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value62-0\]] - expected: FAIL - - [test_invalid_values[proxy-value42-0\]] - expected: FAIL - - [test_invalid_values[proxy-value32-0\]] - expected: FAIL - - [test_invalid_extensions[chromeOptions-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-value69-1\]] - expected: FAIL - - [test_invalid_values[proxy-{}-0\]] - expected: FAIL - - [test_invalid_extensions[trustAllSSLCertificates-0\]] - expected: FAIL - - [test_invalid_extensions[initialBrowserUrl-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value56-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-Eager-0\]] - expected: FAIL - - [test_invalid_values[strictFileInteractability-value64-0\]] - expected: FAIL - - [test_invalid_values[timeouts-{}-1\]] - expected: FAIL - - [test_invalid_values[acceptInsecureCerts-false-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value52-1\]] - expected: FAIL - - [test_invalid_values[browserVersion-value10-1\]] - expected: FAIL - - [test_invalid_values[strictFileInteractability-value64-1\]] - expected: FAIL - - [test_invalid_extensions[firefox-1\]] - expected: FAIL - - [test_invalid_extensions[platformVersion-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-dismiss -1\]] - expected: FAIL - - [test_invalid_values[proxy-value36-1\]] - expected: FAIL - - [test_invalid_values[proxy-value43-0\]] - expected: FAIL - - [test_invalid_values[proxy-value28-1\]] - expected: FAIL - - [test_invalid_values[strictFileInteractability-value65-1\]] - expected: FAIL - - [test_invalid_values[acceptInsecureCerts-value2-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value54-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value49-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-1-1\]] - expected: FAIL - - [test_invalid_values[proxy-value40-1\]] - expected: FAIL - - [test_invalid_extensions[nativeEvents-1\]] - expected: FAIL - - [test_invalid_values[browserName-value5-0\]] - expected: FAIL - - [test_invalid_values[proxy-value32-1\]] - expected: FAIL - - [test_invalid_extensions[platform-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-interactive-0\]] - expected: FAIL - - [test_invalid_values[proxy-value31-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-False-1\]] - expected: FAIL - - [test_invalid_values[proxy-{}-1\]] - expected: FAIL - - [test_invalid_extensions[initialBrowserUrl-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-Eager-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-dismissABC-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value56-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-value68-1\]] - expected: FAIL - - [test_invalid_extensions[automaticProfiling-0\]] - expected: FAIL - - [test_invalid_values[acceptInsecureCerts-value1-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-eager -1\]] - expected: FAIL - - [test_invalid_values[proxy-1-1\]] - expected: FAIL - - [test_invalid_extensions[chromeOptions-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value61-0\]] - expected: FAIL - - [test_invalid_extensions[version-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-dismissABC-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value51-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-value17-0\]] - expected: FAIL - - [test_invalid_extensions[requireWindowFocus-0\]] - expected: FAIL - - [test_invalid_values[browserVersion-value9-0\]] - expected: FAIL - - [test_invalid_values[proxy-value34-0\]] - expected: FAIL - - [test_invalid_values[platformName-value14-0\]] - expected: FAIL - - [test_invalid_values[proxy-value44-1\]] - expected: FAIL - - [test_invalid_extensions[browser-0\]] - expected: FAIL - - [test_invalid_values[proxy-value38-0\]] - expected: FAIL - - [test_invalid_extensions[ensureCleanSession-1\]] - expected: FAIL - - [test_invalid_values[proxy-value33-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior- dismiss-1\]] - expected: FAIL - - [test_invalid_values[browserName-False-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value52-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-invalid-0\]] - expected: FAIL - - [test_invalid_values[strictFileInteractability-1-1\]] - expected: FAIL - - [test_invalid_values[proxy-value30-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value53-0\]] - expected: FAIL - - [test_invalid_values[platformName-value14-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value60-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy- eager-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value51-0\]] - expected: FAIL - - [test_invalid_values[platformName-False-1\]] - expected: FAIL - - [test_invalid_values[proxy-1-0\]] - expected: FAIL - - [test_invalid_extensions[version-0\]] - expected: FAIL - - [test_invalid_values[browserVersion-value9-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-value18-1\]] - expected: FAIL - - [test_invalid_extensions[javascriptEnabled-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value59-1\]] - expected: FAIL - - [test_invalid_values[proxy-value34-1\]] - expected: FAIL - - [test_invalid_values[proxy-value41-0\]] - expected: FAIL - - [test_invalid_values[proxy-value42-1\]] - expected: FAIL - - [test_invalid_values[timeouts-1-1\]] - expected: FAIL - - [test_invalid_extensions[requireWindowFocus-1\]] - expected: FAIL - - [test_invalid_values[proxy-value44-0\]] - expected: FAIL - - [test_invalid_extensions[automaticInspection-0\]] - expected: FAIL - [test_invalid_always_match[None\]] expected: FAIL - [test_invalid_values[proxy-value38-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior- dismiss-0\]] - expected: FAIL - - [test_invalid_values[browserVersion-value10-0\]] - expected: FAIL - - [test_invalid_values[timeouts-{}-0\]] - expected: FAIL - - [test_invalid_extensions[firefoxOptions-0\]] - expected: FAIL - - [test_invalid_values[acceptInsecureCerts-false-0\]] - expected: FAIL - - [test_invalid_values[browserName-False-1\]] - expected: FAIL - - [test_invalid_extensions[seleniumProtocol-0\]] - expected: FAIL - - [test_invalid_extensions[javascriptEnabled-0\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-False-0\]] - expected: FAIL - - [test_invalid_extensions[automaticProfiling-1\]] - expected: FAIL - - [test_invalid_extensions[safari.options-1\]] - expected: FAIL - - [test_invalid_values[browserName-value6-1\]] - expected: FAIL - - [test_invalid_values[platformName-1-1\]] - expected: FAIL - - [test_invalid_values[proxy-value35-1\]] - expected: FAIL - - [test_invalid_extensions[ensureCleanSession-0\]] - expected: FAIL - - [test_invalid_extensions[logFile-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-DISMISS-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-eagerblah-0\]] - expected: FAIL - - [test_invalid_values[strictFileInteractability-1-0\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-Accept-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value55-1\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-1-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-NONE-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-1-1\]] - expected: FAIL - - [test_invalid_extensions[profile-0\]] - expected: FAIL - - [test_invalid_extensions[firefoxOptions-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value46-0\]] - expected: FAIL - - [test_invalid_values[browserVersion-1-1\]] - expected: FAIL - - [test_invalid_extensions[trustAllSSLCertificates-1\]] - expected: FAIL - - [test_invalid_extensions[safari.options-0\]] - expected: FAIL - - [test_invalid_values[platformName-1-0\]] - expected: FAIL - - [test_invalid_values[proxy-value35-0\]] - expected: FAIL - - [test_invalid_extensions[logLevel-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-value17-1\]] - expected: FAIL - - [test_invalid_values[acceptInsecureCerts-1-1\]] - expected: FAIL - - [test_invalid_values[strictFileInteractability-value65-0\]] - expected: FAIL - - [test_invalid_values[timeouts-False-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy- eager-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-NONE-1\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-1-0\]] - expected: FAIL - - [test_invalid_extensions[seleniumProtocol-1\]] - expected: FAIL - - [test_invalid_values[browserVersion-1-0\]] - expected: FAIL - - [test_invalid_values[pageLoadStrategy-invalid-1\]] - expected: FAIL - - [test_invalid_values[timeouts-value55-0\]] - expected: FAIL - - [test_invalid_values[timeouts-value53-1\]] - expected: FAIL - - [test_invalid_values[proxy-value30-0\]] - expected: FAIL - - [test_invalid_values[unhandledPromptBehavior-False-1\]] - expected: FAIL - diff --git a/tests/wpt/metadata/webdriver/tests/new_session/merge.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/merge.py.ini deleted file mode 100644 index 2922adbc303..00000000000 --- a/tests/wpt/metadata/webdriver/tests/new_session/merge.py.ini +++ /dev/null @@ -1,28 +0,0 @@ -[merge.py] - [test_merge_invalid[unhandledPromptBehavior-value2\]] - expected: FAIL - - [test_merge_platformName] - expected: FAIL - - [test_platform_name[0\]] - expected: FAIL - - [test_platform_name[1\]] - expected: FAIL - - [test_merge_invalid[timeouts-value4\]] - expected: FAIL - - [test_merge_browserName] - expected: FAIL - - [test_merge_invalid[unhandledPromptBehavior-value1\]] - expected: FAIL - - [test_merge_invalid[timeouts-value3\]] - expected: FAIL - - [test_merge_invalid[acceptInsecureCerts-value0\]] - expected: FAIL - diff --git a/tests/wpt/metadata/webdriver/tests/new_session/page_load_strategy.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/page_load_strategy.py.ini deleted file mode 100644 index 1db6da945e0..00000000000 --- a/tests/wpt/metadata/webdriver/tests/new_session/page_load_strategy.py.ini +++ /dev/null @@ -1,4 +0,0 @@ -[page_load_strategy.py] - [test_pageLoadStrategy] - expected: FAIL - diff --git a/tests/wpt/metadata/webdriver/tests/new_session/platform_name.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/platform_name.py.ini deleted file mode 100644 index 2df613a5690..00000000000 --- a/tests/wpt/metadata/webdriver/tests/new_session/platform_name.py.ini +++ /dev/null @@ -1,4 +0,0 @@ -[platform_name.py] - [test_corresponds_to_local_system] - expected: FAIL - diff --git a/tests/wpt/metadata/webdriver/tests/new_session/response.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/response.py.ini deleted file mode 100644 index 99af8c4efa0..00000000000 --- a/tests/wpt/metadata/webdriver/tests/new_session/response.py.ini +++ /dev/null @@ -1,40 +0,0 @@ -[response.py] - [test_capability_default_value[strictFileInteractability-False\]] - expected: FAIL - - [test_capability_default_value[timeouts-default_value4\]] - expected: FAIL - - [test_capability_type[platformName-basestring\]] - expected: FAIL - - [test_capability_type[unhandledPromptBehavior-basestring\]] - expected: FAIL - - [test_capability_default_value[setWindowRect-True\]] - expected: FAIL - - [test_capability_type[pageLoadStrategy-basestring\]] - expected: FAIL - - [test_capability_default_value[proxy-default_value2\]] - expected: FAIL - - [test_capability_default_value[unhandledPromptBehavior-dismiss and notify\]] - expected: FAIL - - [test_capability_type[timeouts-dict\]] - expected: FAIL - - [test_capability_type[proxy-dict\]] - expected: FAIL - - [test_capability_type[strictFileInteractability-bool\]] - expected: FAIL - - [test_capability_default_value[pageLoadStrategy-normal\]] - expected: FAIL - - [test_capability_type[setWindowRect-bool\]] - expected: FAIL - diff --git a/tests/wpt/metadata/webdriver/tests/new_session/timeouts.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/timeouts.py.ini deleted file mode 100644 index 9e2e960e161..00000000000 --- a/tests/wpt/metadata/webdriver/tests/new_session/timeouts.py.ini +++ /dev/null @@ -1,25 +0,0 @@ -[timeouts.py] - [test_default_values] - expected: FAIL - - [test_timeouts[timeouts0\]] - expected: FAIL - - [test_invalid_timeouts[timeouts1\]] - expected: FAIL - - [test_timeouts[timeouts2\]] - expected: FAIL - - [test_timeouts[timeouts3\]] - expected: FAIL - - [test_invalid_timeouts[timeouts0\]] - expected: FAIL - - [test_timeouts[timeouts1\]] - expected: FAIL - - [test_invalid_timeouts[timeouts2\]] - expected: FAIL -