From 0ce48d4f25e745817f51a13ac22f033b3e546542 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 16 Jul 2018 00:09:05 -0400 Subject: [PATCH 1/2] Initial results for webdriver conformance tests. --- tests/wpt/include.ini | 6 + .../new_session/create_alwaysMatch.py.ini | 70 +++ .../new_session/create_firstMatch.py.ini | 67 +++ .../tests/new_session/default_values.py.ini | 25 + .../new_session/invalid_capabilities.py.ini | 553 ++++++++++++++++++ .../webdriver/tests/new_session/merge.py.ini | 28 + .../tests/new_session/response.py.ini | 13 + 7 files changed, 762 insertions(+) create mode 100644 tests/wpt/metadata/webdriver/tests/new_session/create_alwaysMatch.py.ini create mode 100644 tests/wpt/metadata/webdriver/tests/new_session/create_firstMatch.py.ini create mode 100644 tests/wpt/metadata/webdriver/tests/new_session/default_values.py.ini create mode 100644 tests/wpt/metadata/webdriver/tests/new_session/invalid_capabilities.py.ini create mode 100644 tests/wpt/metadata/webdriver/tests/new_session/merge.py.ini create mode 100644 tests/wpt/metadata/webdriver/tests/new_session/response.py.ini diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini index 300308ea7cbb..c775395da572 100644 --- a/tests/wpt/include.ini +++ b/tests/wpt/include.ini @@ -111,6 +111,12 @@ skip: true skip: false [WebCryptoAPI] skip: false +[webdriver] + skip: true + [tests] + skip: true + [new_session] + skip: false [webgl] skip: false [webvr] diff --git a/tests/wpt/metadata/webdriver/tests/new_session/create_alwaysMatch.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/create_alwaysMatch.py.ini new file mode 100644 index 000000000000..2ab48149f895 --- /dev/null +++ b/tests/wpt/metadata/webdriver/tests/new_session/create_alwaysMatch.py.ini @@ -0,0 +1,70 @@ +[create_alwaysMatch.py] + [test_valid[acceptInsecureCerts-False\]] + expected: FAIL + + [test_valid[acceptInsecureCerts-None\]] + expected: FAIL + + [test_valid[browserName-None\]] + expected: FAIL + + [test_valid[browserVersion-None\]] + expected: FAIL + + [test_valid[platformName-None\]] + expected: FAIL + + [test_valid[pageLoadStrategy-none\]] + expected: FAIL + + [test_valid[pageLoadStrategy-eager\]] + expected: FAIL + + [test_valid[pageLoadStrategy-normal\]] + expected: FAIL + + [test_valid[pageLoadStrategy-None\]] + expected: FAIL + + [test_valid[proxy-None\]] + expected: FAIL + + [test_valid[timeouts-value10\]] + expected: FAIL + + [test_valid[timeouts-value11\]] + expected: FAIL + + [test_valid[timeouts-value12\]] + expected: FAIL + + [test_valid[timeouts-value13\]] + expected: FAIL + + [test_valid[unhandledPromptBehavior-dismiss\]] + expected: FAIL + + [test_valid[unhandledPromptBehavior-accept\]] + expected: FAIL + + [test_valid[unhandledPromptBehavior-None\]] + expected: FAIL + + [test_valid[test:extension-True\]] + expected: FAIL + + [test_valid[test:extension-abc\]] + expected: FAIL + + [test_valid[test:extension-123\]] + expected: FAIL + + [test_valid[test:extension-value20\]] + expected: FAIL + + [test_valid[test:extension-value21\]] + expected: FAIL + + [test_valid[test:extension-None\]] + expected: FAIL + diff --git a/tests/wpt/metadata/webdriver/tests/new_session/create_firstMatch.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/create_firstMatch.py.ini new file mode 100644 index 000000000000..b27fa8004875 --- /dev/null +++ b/tests/wpt/metadata/webdriver/tests/new_session/create_firstMatch.py.ini @@ -0,0 +1,67 @@ +[create_firstMatch.py] + [test_valid[acceptInsecureCerts-None\]] + expected: FAIL + + [test_valid[browserName-None\]] + expected: FAIL + + [test_valid[browserVersion-None\]] + expected: FAIL + + [test_valid[platformName-None\]] + expected: FAIL + + [test_valid[pageLoadStrategy-none\]] + expected: FAIL + + [test_valid[pageLoadStrategy-eager\]] + expected: FAIL + + [test_valid[pageLoadStrategy-normal\]] + expected: FAIL + + [test_valid[pageLoadStrategy-None\]] + expected: FAIL + + [test_valid[proxy-None\]] + expected: FAIL + + [test_valid[timeouts-value10\]] + expected: FAIL + + [test_valid[timeouts-value11\]] + expected: FAIL + + [test_valid[timeouts-value12\]] + expected: FAIL + + [test_valid[timeouts-value13\]] + expected: FAIL + + [test_valid[unhandledPromptBehavior-dismiss\]] + expected: FAIL + + [test_valid[unhandledPromptBehavior-accept\]] + expected: FAIL + + [test_valid[unhandledPromptBehavior-None\]] + expected: FAIL + + [test_valid[test:extension-True\]] + expected: FAIL + + [test_valid[test:extension-abc\]] + expected: FAIL + + [test_valid[test:extension-123\]] + expected: FAIL + + [test_valid[test:extension-value20\]] + expected: FAIL + + [test_valid[test:extension-value21\]] + expected: FAIL + + [test_valid[test:extension-None\]] + expected: FAIL + 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 new file mode 100644 index 000000000000..b454abce2a3e --- /dev/null +++ b/tests/wpt/metadata/webdriver/tests/new_session/default_values.py.ini @@ -0,0 +1,25 @@ +[default_values.py] + [test_basic] + expected: FAIL + + [test_repeat_new_session] + expected: FAIL + + [test_no_capabilites] + expected: FAIL + + [test_missing_first_match] + expected: FAIL + + [test_missing_always_match] + expected: FAIL + + [test_desired] + expected: FAIL + + [test_ignore_non_spec_fields_in_capabilities] + expected: FAIL + + [test_valid_but_unmatchable_key] + 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 new file mode 100644 index 000000000000..91ad02906cac --- /dev/null +++ b/tests/wpt/metadata/webdriver/tests/new_session/invalid_capabilities.py.ini @@ -0,0 +1,553 @@ +[invalid_capabilities.py] + [test_invalid_values[acceptInsecureCerts-1-body0\]] + expected: FAIL + + [test_invalid_values[acceptInsecureCerts-1-body1\]] + expected: FAIL + + [test_invalid_values[acceptInsecureCerts-value1-body0\]] + expected: FAIL + + [test_invalid_values[acceptInsecureCerts-value1-body1\]] + expected: FAIL + + [test_invalid_values[acceptInsecureCerts-value2-body0\]] + expected: FAIL + + [test_invalid_values[acceptInsecureCerts-value2-body1\]] + expected: FAIL + + [test_invalid_values[acceptInsecureCerts-false-body0\]] + expected: FAIL + + [test_invalid_values[acceptInsecureCerts-false-body1\]] + expected: FAIL + + [test_invalid_values[browserName-1-body0\]] + expected: FAIL + + [test_invalid_values[browserName-1-body1\]] + expected: FAIL + + [test_invalid_values[browserName-value5-body0\]] + expected: FAIL + + [test_invalid_values[browserName-value5-body1\]] + expected: FAIL + + [test_invalid_values[browserName-value6-body0\]] + expected: FAIL + + [test_invalid_values[browserName-value6-body1\]] + expected: FAIL + + [test_invalid_values[browserName-False-body0\]] + expected: FAIL + + [test_invalid_values[browserName-False-body1\]] + expected: FAIL + + [test_invalid_values[browserVersion-1-body0\]] + expected: FAIL + + [test_invalid_values[browserVersion-1-body1\]] + expected: FAIL + + [test_invalid_values[browserVersion-value9-body0\]] + expected: FAIL + + [test_invalid_values[browserVersion-value9-body1\]] + expected: FAIL + + [test_invalid_values[browserVersion-value10-body0\]] + expected: FAIL + + [test_invalid_values[browserVersion-value10-body1\]] + expected: FAIL + + [test_invalid_values[browserVersion-False-body0\]] + expected: FAIL + + [test_invalid_values[browserVersion-False-body1\]] + expected: FAIL + + [test_invalid_values[platformName-1-body0\]] + expected: FAIL + + [test_invalid_values[platformName-1-body1\]] + expected: FAIL + + [test_invalid_values[platformName-value13-body0\]] + expected: FAIL + + [test_invalid_values[platformName-value13-body1\]] + expected: FAIL + + [test_invalid_values[platformName-value14-body0\]] + expected: FAIL + + [test_invalid_values[platformName-value14-body1\]] + expected: FAIL + + [test_invalid_values[platformName-False-body0\]] + expected: FAIL + + [test_invalid_values[platformName-False-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-1-body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-1-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-value17-body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-value17-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-value18-body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-value18-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-False-body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-False-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-invalid-body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-invalid-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-NONE-body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-NONE-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-Eager-body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-Eager-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-eagerblah-body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-eagerblah-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-interactive-body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-interactive-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy- eager-body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy- eager-body1\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-eager -body0\]] + expected: FAIL + + [test_invalid_values[pageLoadStrategy-eager -body1\]] + expected: FAIL + + [test_invalid_values[proxy-1-body0\]] + expected: FAIL + + [test_invalid_values[proxy-1-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value28-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value28-body1\]] + expected: FAIL + + [test_invalid_values[proxy-{}-body0\]] + expected: FAIL + + [test_invalid_values[proxy-{}-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value30-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value30-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value31-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value31-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value32-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value32-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value33-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value33-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value34-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value34-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value35-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value35-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value36-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value36-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value37-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value37-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value38-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value38-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value39-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value39-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value40-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value40-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value41-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value41-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value42-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value42-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value43-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value43-body1\]] + expected: FAIL + + [test_invalid_values[proxy-value44-body0\]] + expected: FAIL + + [test_invalid_values[proxy-value44-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-1-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-1-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value46-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value46-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-{}-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-{}-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-False-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-False-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value49-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value49-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value50-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value50-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value51-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value51-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value52-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value52-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value53-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value53-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value54-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value54-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value55-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value55-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value56-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value56-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value57-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value57-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value58-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value58-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value59-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value59-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value60-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value60-body1\]] + expected: FAIL + + [test_invalid_values[timeouts-value61-body0\]] + expected: FAIL + + [test_invalid_values[timeouts-value61-body1\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-1-body0\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-1-body1\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-value63-body0\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-value63-body1\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-value64-body0\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-value64-body1\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-False-body0\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-False-body1\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-DISMISS-body0\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-DISMISS-body1\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-dismissABC-body0\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-dismissABC-body1\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-Accept-body0\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-Accept-body1\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior- dismiss-body0\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior- dismiss-body1\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-dismiss -body0\]] + expected: FAIL + + [test_invalid_values[unhandledPromptBehavior-dismiss -body1\]] + expected: FAIL + + [test_invalid_extensions[firefox-body0\]] + expected: FAIL + + [test_invalid_extensions[firefox-body1\]] + expected: FAIL + + [test_invalid_extensions[firefox_binary-body0\]] + expected: FAIL + + [test_invalid_extensions[firefox_binary-body1\]] + expected: FAIL + + [test_invalid_extensions[firefoxOptions-body0\]] + expected: FAIL + + [test_invalid_extensions[firefoxOptions-body1\]] + expected: FAIL + + [test_invalid_extensions[chromeOptions-body0\]] + expected: FAIL + + [test_invalid_extensions[chromeOptions-body1\]] + expected: FAIL + + [test_invalid_extensions[automaticInspection-body0\]] + expected: FAIL + + [test_invalid_extensions[automaticInspection-body1\]] + expected: FAIL + + [test_invalid_extensions[automaticProfiling-body0\]] + expected: FAIL + + [test_invalid_extensions[automaticProfiling-body1\]] + expected: FAIL + + [test_invalid_extensions[platform-body0\]] + expected: FAIL + + [test_invalid_extensions[platform-body1\]] + expected: FAIL + + [test_invalid_extensions[version-body0\]] + expected: FAIL + + [test_invalid_extensions[version-body1\]] + expected: FAIL + + [test_invalid_extensions[browser-body0\]] + expected: FAIL + + [test_invalid_extensions[browser-body1\]] + expected: FAIL + + [test_invalid_extensions[platformVersion-body0\]] + expected: FAIL + + [test_invalid_extensions[platformVersion-body1\]] + expected: FAIL + + [test_invalid_extensions[javascriptEnabled-body0\]] + expected: FAIL + + [test_invalid_extensions[javascriptEnabled-body1\]] + expected: FAIL + + [test_invalid_extensions[nativeEvents-body0\]] + expected: FAIL + + [test_invalid_extensions[nativeEvents-body1\]] + expected: FAIL + + [test_invalid_extensions[seleniumProtocol-body0\]] + expected: FAIL + + [test_invalid_extensions[seleniumProtocol-body1\]] + expected: FAIL + + [test_invalid_extensions[profile-body0\]] + expected: FAIL + + [test_invalid_extensions[profile-body1\]] + expected: FAIL + + [test_invalid_extensions[trustAllSSLCertificates-body0\]] + expected: FAIL + + [test_invalid_extensions[trustAllSSLCertificates-body1\]] + expected: FAIL + + [test_invalid_extensions[initialBrowserUrl-body0\]] + expected: FAIL + + [test_invalid_extensions[initialBrowserUrl-body1\]] + expected: FAIL + + [test_invalid_extensions[requireWindowFocus-body0\]] + expected: FAIL + + [test_invalid_extensions[requireWindowFocus-body1\]] + expected: FAIL + + [test_invalid_extensions[logFile-body0\]] + expected: FAIL + + [test_invalid_extensions[logFile-body1\]] + expected: FAIL + + [test_invalid_extensions[logLevel-body0\]] + expected: FAIL + + [test_invalid_extensions[logLevel-body1\]] + expected: FAIL + + [test_invalid_extensions[safari.options-body0\]] + expected: FAIL + + [test_invalid_extensions[safari.options-body1\]] + expected: FAIL + + [test_invalid_extensions[ensureCleanSession-body0\]] + expected: FAIL + + [test_invalid_extensions[ensureCleanSession-body1\]] + 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 new file mode 100644 index 000000000000..c10be13b3caf --- /dev/null +++ b/tests/wpt/metadata/webdriver/tests/new_session/merge.py.ini @@ -0,0 +1,28 @@ +[merge.py] + [test_platform_name[body0\]] + expected: FAIL + + [test_platform_name[body1\]] + expected: FAIL + + [test_merge_invalid[acceptInsecureCerts-value0\]] + expected: FAIL + + [test_merge_invalid[unhandledPromptBehavior-value1\]] + expected: FAIL + + [test_merge_invalid[unhandledPromptBehavior-value2\]] + expected: FAIL + + [test_merge_invalid[timeouts-value3\]] + expected: FAIL + + [test_merge_invalid[timeouts-value4\]] + expected: FAIL + + [test_merge_platformName] + expected: FAIL + + [test_merge_browserName] + 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 new file mode 100644 index 000000000000..7da937918863 --- /dev/null +++ b/tests/wpt/metadata/webdriver/tests/new_session/response.py.ini @@ -0,0 +1,13 @@ +[response.py] + [test_resp_capabilites] + expected: FAIL + + [test_resp_data] + expected: FAIL + + [test_timeouts] + expected: FAIL + + [test_pageLoadStrategy] + expected: FAIL + From 7959231ca1d9102b226b735b22b6ed11d4537465 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 15 Jul 2018 22:03:44 -0400 Subject: [PATCH 2/2] Pass a bunch of new_session wdspec tests. --- components/webdriver_server/lib.rs | 13 ++-- .../new_session/create_alwaysMatch.py.ini | 24 ------- .../new_session/create_firstMatch.py.ini | 64 +------------------ .../tests/new_session/default_values.py.ini | 3 - 4 files changed, 11 insertions(+), 93 deletions(-) diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 47390248dd3f..79aaf933b314 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -49,7 +49,7 @@ use std::thread; use std::time::Duration; use uuid::Uuid; use webdriver::command::{AddCookieParameters, GetParameters, JavascriptCommandParameters}; -use webdriver::command::{LocatorParameters, Parameters}; +use webdriver::command::{LocatorParameters, Parameters, NewSessionParameters}; use webdriver::command::{SendKeysParameters, SwitchToFrameParameters, TimeoutsParameters}; use webdriver::command::{WebDriverCommand, WebDriverExtensionCommand, WebDriverMessage}; use webdriver::command::WindowRectParameters; @@ -307,7 +307,12 @@ impl Handler { } } - fn handle_new_session(&mut self) -> WebDriverResult { + fn handle_new_session(&mut self, params: &NewSessionParameters) -> WebDriverResult { + if let NewSessionParameters::Legacy(..) = params { + return Err(WebDriverError::new(ErrorStatus::InvalidArgument, + "Unsupported legacy arguments")); + } + debug!("new session"); if self.session.is_none() { let top_level_browsing_context_id = self.focus_top_level_browsing_context_id()?; @@ -330,7 +335,7 @@ impl Handler { fn handle_delete_session(&mut self) -> WebDriverResult { self.session = None; - Ok(WebDriverResponse::Void) + Ok(WebDriverResponse::DeleteSession) } fn browsing_context_script_command(&self, cmd_msg: WebDriverScriptCommand) -> WebDriverResult<()> { @@ -890,7 +895,7 @@ impl WebDriverHandler for Handler { } match msg.command { - WebDriverCommand::NewSession(_) => self.handle_new_session(), + WebDriverCommand::NewSession(ref params) => self.handle_new_session(params), 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/create_alwaysMatch.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/create_alwaysMatch.py.ini index 2ab48149f895..ad89a39d8b85 100644 --- a/tests/wpt/metadata/webdriver/tests/new_session/create_alwaysMatch.py.ini +++ b/tests/wpt/metadata/webdriver/tests/new_session/create_alwaysMatch.py.ini @@ -5,30 +5,6 @@ [test_valid[acceptInsecureCerts-None\]] expected: FAIL - [test_valid[browserName-None\]] - expected: FAIL - - [test_valid[browserVersion-None\]] - expected: FAIL - - [test_valid[platformName-None\]] - expected: FAIL - - [test_valid[pageLoadStrategy-none\]] - expected: FAIL - - [test_valid[pageLoadStrategy-eager\]] - expected: FAIL - - [test_valid[pageLoadStrategy-normal\]] - expected: FAIL - - [test_valid[pageLoadStrategy-None\]] - expected: FAIL - - [test_valid[proxy-None\]] - expected: FAIL - [test_valid[timeouts-value10\]] expected: FAIL diff --git a/tests/wpt/metadata/webdriver/tests/new_session/create_firstMatch.py.ini b/tests/wpt/metadata/webdriver/tests/new_session/create_firstMatch.py.ini index b27fa8004875..31bf5bed09f3 100644 --- a/tests/wpt/metadata/webdriver/tests/new_session/create_firstMatch.py.ini +++ b/tests/wpt/metadata/webdriver/tests/new_session/create_firstMatch.py.ini @@ -1,67 +1,7 @@ [create_firstMatch.py] - [test_valid[acceptInsecureCerts-None\]] - expected: FAIL - - [test_valid[browserName-None\]] - expected: FAIL - - [test_valid[browserVersion-None\]] - expected: FAIL - - [test_valid[platformName-None\]] - expected: FAIL - - [test_valid[pageLoadStrategy-none\]] - expected: FAIL - - [test_valid[pageLoadStrategy-eager\]] - expected: FAIL - - [test_valid[pageLoadStrategy-normal\]] - expected: FAIL - - [test_valid[pageLoadStrategy-None\]] - expected: FAIL - - [test_valid[proxy-None\]] - expected: FAIL - - [test_valid[timeouts-value10\]] - expected: FAIL - - [test_valid[timeouts-value11\]] + [test_valid[acceptInsecureCerts-False\]] expected: FAIL - [test_valid[timeouts-value12\]] - expected: FAIL - - [test_valid[timeouts-value13\]] - expected: FAIL - - [test_valid[unhandledPromptBehavior-dismiss\]] - expected: FAIL - - [test_valid[unhandledPromptBehavior-accept\]] - expected: FAIL - - [test_valid[unhandledPromptBehavior-None\]] - expected: FAIL - - [test_valid[test:extension-True\]] - expected: FAIL - - [test_valid[test:extension-abc\]] - expected: FAIL - - [test_valid[test:extension-123\]] - expected: FAIL - - [test_valid[test:extension-value20\]] - expected: FAIL - - [test_valid[test:extension-value21\]] - expected: FAIL - - [test_valid[test:extension-None\]] + [test_valid[acceptInsecureCerts-None\]] expected: FAIL 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 b454abce2a3e..3467cdbfca7b 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 @@ -5,9 +5,6 @@ [test_repeat_new_session] expected: FAIL - [test_no_capabilites] - expected: FAIL - [test_missing_first_match] expected: FAIL