diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 86c4273a404..41d037f5993 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -2276,8 +2276,8 @@ impl ScriptThread { WebDriverScriptCommand::DeleteCookie(name, reply) => { webdriver_handlers::handle_delete_cookie(&documents, pipeline_id, name, reply) }, - WebDriverScriptCommand::FindElementCSS(selector, reply) => { - webdriver_handlers::handle_find_element_css( + WebDriverScriptCommand::FindElementCSSSelector(selector, reply) => { + webdriver_handlers::handle_find_element_css_selector( &documents, pipeline_id, selector, @@ -2303,8 +2303,8 @@ impl ScriptThread { can_gc, ) }, - WebDriverScriptCommand::FindElementsCSS(selector, reply) => { - webdriver_handlers::handle_find_elements_css( + WebDriverScriptCommand::FindElementsCSSSelector(selector, reply) => { + webdriver_handlers::handle_find_elements_css_selector( &documents, pipeline_id, selector, @@ -2330,8 +2330,8 @@ impl ScriptThread { can_gc, ) }, - WebDriverScriptCommand::FindElementElementCSS(selector, element_id, reply) => { - webdriver_handlers::handle_find_element_element_css( + WebDriverScriptCommand::FindElementElementCSSSelector(selector, element_id, reply) => { + webdriver_handlers::handle_find_element_element_css_selector( &documents, pipeline_id, element_id, @@ -2363,8 +2363,8 @@ impl ScriptThread { can_gc, ) }, - WebDriverScriptCommand::FindElementElementsCSS(selector, element_id, reply) => { - webdriver_handlers::handle_find_element_elements_css( + WebDriverScriptCommand::FindElementElementsCSSSelector(selector, element_id, reply) => { + webdriver_handlers::handle_find_element_elements_css_selector( &documents, pipeline_id, element_id, @@ -2396,6 +2396,40 @@ impl ScriptThread { can_gc, ) }, + WebDriverScriptCommand::FindShadowElementsCSSSelector( + selector, + shadow_root_id, + reply, + ) => webdriver_handlers::handle_find_shadow_elements_css_selector( + &documents, + pipeline_id, + shadow_root_id, + selector, + reply, + ), + WebDriverScriptCommand::FindShadowElementsLinkText( + selector, + shadow_root_id, + partial, + reply, + ) => webdriver_handlers::handle_find_shadow_elements_link_text( + &documents, + pipeline_id, + shadow_root_id, + selector, + partial, + reply, + can_gc, + ), + WebDriverScriptCommand::FindShadowElementsTagName(selector, shadow_root_id, reply) => { + webdriver_handlers::handle_find_shadow_elements_tag_name( + &documents, + pipeline_id, + shadow_root_id, + selector, + reply, + ) + }, WebDriverScriptCommand::GetElementShadowRoot(element_id, reply) => { webdriver_handlers::handle_get_element_shadow_root( &documents, diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs index 708a284e607..718b1200586 100644 --- a/components/script/webdriver_handlers.rs +++ b/components/script/webdriver_handlers.rs @@ -79,7 +79,6 @@ fn is_stale(element: &Element) -> bool { !element.owner_document().is_active() || !element.is_connected() } -#[allow(dead_code)] /// fn get_known_shadow_root( documents: &DocumentCollection, @@ -689,7 +688,7 @@ fn retrieve_document_and_check_root_existence( } } -pub(crate) fn handle_find_element_css( +pub(crate) fn handle_find_element_css_selector( documents: &DocumentCollection, pipeline: PipelineId, selector: String, @@ -748,7 +747,7 @@ pub(crate) fn handle_find_element_tag_name( } } -pub(crate) fn handle_find_elements_css( +pub(crate) fn handle_find_elements_css_selector( documents: &DocumentCollection, pipeline: PipelineId, selector: String, @@ -812,7 +811,7 @@ pub(crate) fn handle_find_elements_tag_name( } } -pub(crate) fn handle_find_element_element_css( +pub(crate) fn handle_find_element_element_css_selector( documents: &DocumentCollection, pipeline: PipelineId, element_id: String, @@ -871,7 +870,7 @@ pub(crate) fn handle_find_element_element_tag_name( .unwrap(); } -pub(crate) fn handle_find_element_elements_css( +pub(crate) fn handle_find_element_elements_css_selector( documents: &DocumentCollection, pipeline: PipelineId, element_id: String, @@ -935,6 +934,85 @@ pub(crate) fn handle_find_element_elements_tag_name( .unwrap(); } +/// +pub(crate) fn handle_find_shadow_elements_css_selector( + documents: &DocumentCollection, + pipeline: PipelineId, + shadow_root_id: String, + selector: String, + reply: IpcSender, ErrorStatus>>, +) { + reply + .send( + get_known_shadow_root(documents, pipeline, shadow_root_id).and_then(|shadow_root| { + shadow_root + .upcast::() + .query_selector_all(DOMString::from(selector)) + .map_err(|_| ErrorStatus::InvalidSelector) + .map(|nodes| { + nodes + .iter() + .map(|x| x.upcast::().unique_id(pipeline)) + .collect() + }) + }), + ) + .unwrap(); +} + +pub(crate) fn handle_find_shadow_elements_link_text( + documents: &DocumentCollection, + pipeline: PipelineId, + shadow_root_id: String, + selector: String, + partial: bool, + reply: IpcSender, ErrorStatus>>, + can_gc: CanGc, +) { + reply + .send( + get_known_shadow_root(documents, pipeline, shadow_root_id).and_then(|shadow_root| { + all_matching_links( + shadow_root.upcast::(), + selector.clone(), + partial, + can_gc, + ) + }), + ) + .unwrap(); +} + +pub(crate) fn handle_find_shadow_elements_tag_name( + documents: &DocumentCollection, + pipeline: PipelineId, + shadow_root_id: String, + selector: String, + reply: IpcSender, ErrorStatus>>, +) { + // According to spec, we should use `getElementsByTagName`. But it is wrong, as only + // Document and Element implement this method. So we use `querySelectorAll` instead. + // But we should not return InvalidSelector error if the selector is not valid, + // as `getElementsByTagName` won't. + // See https://github.com/w3c/webdriver/issues/1903 + reply + .send( + get_known_shadow_root(documents, pipeline, shadow_root_id).map(|shadow_root| { + shadow_root + .upcast::() + .query_selector_all(DOMString::from(selector)) + .map(|nodes| { + nodes + .iter() + .map(|x| x.upcast::().unique_id(pipeline)) + .collect() + }) + .unwrap_or_default() + }), + ) + .unwrap(); +} + /// pub(crate) fn handle_get_element_shadow_root( documents: &DocumentCollection, diff --git a/components/shared/embedder/webdriver.rs b/components/shared/embedder/webdriver.rs index 3b40c067ace..225403a2cc7 100644 --- a/components/shared/embedder/webdriver.rs +++ b/components/shared/embedder/webdriver.rs @@ -123,13 +123,13 @@ pub enum WebDriverScriptCommand { DeleteCookie(String, IpcSender>), ExecuteScript(String, IpcSender), ExecuteAsyncScript(String, IpcSender), - FindElementCSS(String, IpcSender, ErrorStatus>>), + FindElementCSSSelector(String, IpcSender, ErrorStatus>>), FindElementLinkText(String, bool, IpcSender, ErrorStatus>>), FindElementTagName(String, IpcSender, ErrorStatus>>), - FindElementsCSS(String, IpcSender, ErrorStatus>>), + FindElementsCSSSelector(String, IpcSender, ErrorStatus>>), FindElementsLinkText(String, bool, IpcSender, ErrorStatus>>), FindElementsTagName(String, IpcSender, ErrorStatus>>), - FindElementElementCSS( + FindElementElementCSSSelector( String, String, IpcSender, ErrorStatus>>, @@ -145,7 +145,7 @@ pub enum WebDriverScriptCommand { String, IpcSender, ErrorStatus>>, ), - FindElementElementsCSS(String, String, IpcSender, ErrorStatus>>), + FindElementElementsCSSSelector(String, String, IpcSender, ErrorStatus>>), FindElementElementsLinkText( String, String, @@ -153,6 +153,14 @@ pub enum WebDriverScriptCommand { IpcSender, ErrorStatus>>, ), FindElementElementsTagName(String, String, IpcSender, ErrorStatus>>), + FindShadowElementsCSSSelector(String, String, IpcSender, ErrorStatus>>), + FindShadowElementsLinkText( + String, + String, + bool, + IpcSender, ErrorStatus>>, + ), + FindShadowElementsTagName(String, String, IpcSender, ErrorStatus>>), GetElementShadowRoot(String, IpcSender, ErrorStatus>>), ElementClick(String, IpcSender, ErrorStatus>>), GetActiveElement(IpcSender>), diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 7007c6cc068..134caddc316 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -989,7 +989,10 @@ impl Handler { match parameters.using { LocatorStrategy::CSSSelector => { - let cmd = WebDriverScriptCommand::FindElementCSS(parameters.value.clone(), sender); + let cmd = WebDriverScriptCommand::FindElementCSSSelector( + parameters.value.clone(), + sender, + ); self.browsing_context_script_command(cmd)?; }, LocatorStrategy::LinkText | LocatorStrategy::PartialLinkText => { @@ -1187,7 +1190,10 @@ impl Handler { let (sender, receiver) = ipc::channel().unwrap(); match parameters.using { LocatorStrategy::CSSSelector => { - let cmd = WebDriverScriptCommand::FindElementsCSS(parameters.value.clone(), sender); + let cmd = WebDriverScriptCommand::FindElementsCSSSelector( + parameters.value.clone(), + sender, + ); self.browsing_context_script_command(cmd)?; }, LocatorStrategy::LinkText | LocatorStrategy::PartialLinkText => { @@ -1236,7 +1242,7 @@ impl Handler { match parameters.using { LocatorStrategy::CSSSelector => { - let cmd = WebDriverScriptCommand::FindElementElementCSS( + let cmd = WebDriverScriptCommand::FindElementElementCSSSelector( parameters.value.clone(), element.to_string(), sender, @@ -1295,7 +1301,7 @@ impl Handler { match parameters.using { LocatorStrategy::CSSSelector => { - let cmd = WebDriverScriptCommand::FindElementElementsCSS( + let cmd = WebDriverScriptCommand::FindElementElementsCSSSelector( parameters.value.clone(), element.to_string(), sender, @@ -1341,6 +1347,90 @@ impl Handler { } } + /// + fn handle_find_elements_from_shadow_root( + &self, + shadow_root: &ShadowRoot, + parameters: &LocatorParameters, + ) -> WebDriverResult { + // Step 4. If selector is undefined, return error with error code invalid argument. + if parameters.value.is_empty() { + return Err(WebDriverError::new(ErrorStatus::InvalidArgument, "")); + } + let (sender, receiver) = ipc::channel().unwrap(); + + match parameters.using { + LocatorStrategy::CSSSelector => { + let cmd = WebDriverScriptCommand::FindShadowElementsCSSSelector( + parameters.value.clone(), + shadow_root.to_string(), + sender, + ); + self.browsing_context_script_command(cmd)?; + }, + LocatorStrategy::LinkText | LocatorStrategy::PartialLinkText => { + let cmd = WebDriverScriptCommand::FindShadowElementsLinkText( + parameters.value.clone(), + shadow_root.to_string(), + parameters.using == LocatorStrategy::PartialLinkText, + sender, + ); + self.browsing_context_script_command(cmd)?; + }, + LocatorStrategy::TagName => { + let cmd = WebDriverScriptCommand::FindShadowElementsTagName( + parameters.value.clone(), + shadow_root.to_string(), + sender, + ); + self.browsing_context_script_command(cmd)?; + }, + _ => { + return Err(WebDriverError::new( + ErrorStatus::UnsupportedOperation, + "Unsupported locator strategy", + )); + }, + } + + match wait_for_script_response(receiver)? { + Ok(value) => { + let resp_value: Vec = value + .into_iter() + .map(|x| serde_json::to_value(WebElement(x)).unwrap()) + .collect(); + Ok(WebDriverResponse::Generic(ValueResponse( + serde_json::to_value(resp_value)?, + ))) + }, + Err(error) => Err(WebDriverError::new(error, "")), + } + } + + /// + fn handle_find_element_from_shadow_root( + &self, + shadow_root: &ShadowRoot, + parameters: &LocatorParameters, + ) -> WebDriverResult { + let res = self.handle_find_elements_from_shadow_root(shadow_root, parameters)?; + // Step 9. If result is empty, return error with error code no such element. + // Otherwise, return the first element of result. + if let WebDriverResponse::Generic(ValueResponse(values)) = res { + let arr = values.as_array().unwrap(); + if let Some(first) = arr.first() { + Ok(WebDriverResponse::Generic(ValueResponse(first.clone()))) + } else { + Err(WebDriverError::new(ErrorStatus::NoSuchElement, "")) + } + } else { + Err(WebDriverError::new( + ErrorStatus::UnknownError, + "Unexpected response", + )) + } + } + fn handle_get_shadow_root(&self, element: WebElement) -> WebDriverResult { let (sender, receiver) = ipc::channel().unwrap(); let cmd = WebDriverScriptCommand::GetElementShadowRoot(element.to_string(), sender); @@ -2164,6 +2254,12 @@ impl WebDriverHandler for Handler { WebDriverCommand::FindElementElements(ref element, ref parameters) => { self.handle_find_elements_from_element(element, parameters) }, + WebDriverCommand::FindShadowRootElements(ref shadow_root, ref parameters) => { + self.handle_find_elements_from_shadow_root(shadow_root, parameters) + }, + WebDriverCommand::FindShadowRootElement(ref shadow_root, ref parameters) => { + self.handle_find_element_from_shadow_root(shadow_root, parameters) + }, WebDriverCommand::GetShadowRoot(element) => self.handle_get_shadow_root(element), WebDriverCommand::GetNamedCookie(name) => self.handle_get_cookie(name), WebDriverCommand::GetCookies => self.handle_get_cookies(), diff --git a/tests/wpt/meta/webdriver/tests/classic/element_click/click.py.ini b/tests/wpt/meta/webdriver/tests/classic/element_click/click.py.ini index 2ed5e00cc3f..ff06d41c9ab 100644 --- a/tests/wpt/meta/webdriver/tests/classic/element_click/click.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/element_click/click.py.ini @@ -1,6 +1,3 @@ [click.py] [test_no_browsing_context] expected: FAIL - - [test_no_such_element_with_shadow_root] - expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/find_element_from_shadow_root/find.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_element_from_shadow_root/find.py.ini index 05e490d14fe..4c3d23530dd 100644 --- a/tests/wpt/meta/webdriver/tests/classic/find_element_from_shadow_root/find.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/find_element_from_shadow_root/find.py.ini @@ -1,97 +1,10 @@ [find.py] - [test_null_parameter_value] - expected: FAIL - - [test_no_top_browsing_context] - expected: FAIL - [test_no_browsing_context] expected: FAIL - [test_no_such_shadow_root_with_element] - expected: FAIL - - [test_no_such_shadow_root_with_unknown_shadow_root] - expected: FAIL - - [test_no_such_shadow_root_with_shadow_root_from_other_window_handle] - expected: FAIL - [test_no_such_shadow_root_with_shadow_root_from_other_frame] expected: FAIL - [test_detached_shadow_root[top_context\]] - expected: FAIL - - [test_detached_shadow_root[child_context\]] - expected: FAIL - - [test_no_such_element_with_unknown_selector[not-existent\]] - expected: FAIL - - [test_no_such_element_with_unknown_selector[existent-other-frame\]] - expected: FAIL - - [test_no_such_element_with_unknown_selector[existent-outside-shadow-root\]] - expected: FAIL - - [test_invalid_shadow_root_id_argument[True\]] - expected: FAIL - - [test_invalid_shadow_root_id_argument[None\]] - expected: FAIL - - [test_invalid_shadow_root_id_argument[1\]] - expected: FAIL - - [test_invalid_shadow_root_id_argument[shadow_root_id3\]] - expected: FAIL - - [test_invalid_shadow_root_id_argument[shadow_root_id4\]] - expected: FAIL - - [test_invalid_using_argument[a\]] - expected: FAIL - - [test_invalid_using_argument[True\]] - expected: FAIL - - [test_invalid_using_argument[None\]] - expected: FAIL - - [test_invalid_using_argument[1\]] - expected: FAIL - - [test_invalid_using_argument[using4\]] - expected: FAIL - - [test_invalid_using_argument[using5\]] - expected: FAIL - - [test_invalid_selector_argument[None\]] - expected: FAIL - - [test_invalid_selector_argument[value1\]] - expected: FAIL - - [test_invalid_selector_argument[value2\]] - expected: FAIL - - [test_found_element_equivalence] - expected: FAIL - - [test_find_element[open-css selector-#linkText\]] - expected: FAIL - - [test_find_element[open-link text-full link text\]] - expected: FAIL - - [test_find_element[open-partial link text-link text\]] - expected: FAIL - - [test_find_element[open-tag name-a\]] - expected: FAIL - [test_find_element[open-xpath-//a\]] expected: FAIL @@ -110,47 +23,5 @@ [test_find_element[closed-xpath-//a\]] expected: FAIL - [test_find_element_link_text[link text-link text\]] - expected: FAIL - - [test_find_element_link_text[ link text -link text\]] - expected: FAIL - - [test_find_element_link_text[link
text-link\\ntext\]] - expected: FAIL - - [test_find_element_link_text[link&text-link&text\]] - expected: FAIL - - [test_find_element_link_text[LINK TEXT-LINK TEXT\]] - expected: FAIL - - [test_find_element_link_text[link text-LINK TEXT\]] - expected: FAIL - - [test_find_element_partial_link_text[partial link text-link\]] - expected: FAIL - - [test_find_element_partial_link_text[ partial link text -link\]] - expected: FAIL - - [test_find_element_partial_link_text[partial link text-k t\]] - expected: FAIL - - [test_find_element_partial_link_text[partial link
text-k\\nt\]] - expected: FAIL - - [test_find_element_partial_link_text[partial link&text-k&t\]] - expected: FAIL - - [test_find_element_partial_link_text[PARTIAL LINK TEXT-LINK\]] - expected: FAIL - - [test_find_element_partial_link_text[partial link text-LINK\]] - expected: FAIL - - [test_find_element_in_nested_shadow_root[open\]] - expected: FAIL - [test_find_element_in_nested_shadow_root[closed\]] expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/find_elements_from_shadow_root/find.py.ini b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_shadow_root/find.py.ini index 18ed273c743..f39cfb16aa6 100644 --- a/tests/wpt/meta/webdriver/tests/classic/find_elements_from_shadow_root/find.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/find_elements_from_shadow_root/find.py.ini @@ -1,97 +1,10 @@ [find.py] - [test_null_parameter_value] - expected: FAIL - - [test_no_top_browsing_context] - expected: FAIL - [test_no_browsing_context] expected: FAIL - [test_no_such_shadow_root_with_element] - expected: FAIL - - [test_no_such_shadow_root_with_unknown_shadow_root] - expected: FAIL - - [test_no_such_shadow_root_with_shadow_root_from_other_window_handle] - expected: FAIL - [test_no_such_shadow_root_with_shadow_root_from_other_frame] expected: FAIL - [test_detached_shadow_root[top_context\]] - expected: FAIL - - [test_detached_shadow_root[child_context\]] - expected: FAIL - - [test_no_elements_with_unknown_selector[not-existent\]] - expected: FAIL - - [test_no_elements_with_unknown_selector[existent-other-frame\]] - expected: FAIL - - [test_no_elements_with_unknown_selector[existent-outside-shadow-root\]] - expected: FAIL - - [test_invalid_shadow_root_id_argument[True\]] - expected: FAIL - - [test_invalid_shadow_root_id_argument[None\]] - expected: FAIL - - [test_invalid_shadow_root_id_argument[1\]] - expected: FAIL - - [test_invalid_shadow_root_id_argument[shadow_root_id3\]] - expected: FAIL - - [test_invalid_shadow_root_id_argument[shadow_root_id4\]] - expected: FAIL - - [test_invalid_using_argument[a\]] - expected: FAIL - - [test_invalid_using_argument[True\]] - expected: FAIL - - [test_invalid_using_argument[None\]] - expected: FAIL - - [test_invalid_using_argument[1\]] - expected: FAIL - - [test_invalid_using_argument[using4\]] - expected: FAIL - - [test_invalid_using_argument[using5\]] - expected: FAIL - - [test_invalid_selector_argument[None\]] - expected: FAIL - - [test_invalid_selector_argument[value1\]] - expected: FAIL - - [test_invalid_selector_argument[value2\]] - expected: FAIL - - [test_find_elements_equivalence] - expected: FAIL - - [test_find_elements[open-css selector-#linkText\]] - expected: FAIL - - [test_find_elements[open-link text-full link text\]] - expected: FAIL - - [test_find_elements[open-partial link text-link text\]] - expected: FAIL - - [test_find_elements[open-tag name-a\]] - expected: FAIL - [test_find_elements[open-xpath-//a\]] expected: FAIL @@ -110,47 +23,5 @@ [test_find_elements[closed-xpath-//a\]] expected: FAIL - [test_find_elements_link_text[link text-link text\]] - expected: FAIL - - [test_find_elements_link_text[ link text -link text\]] - expected: FAIL - - [test_find_elements_link_text[link
text-link\\ntext\]] - expected: FAIL - - [test_find_elements_link_text[link&text-link&text\]] - expected: FAIL - - [test_find_elements_link_text[LINK TEXT-LINK TEXT\]] - expected: FAIL - - [test_find_elements_link_text[link text-LINK TEXT\]] - expected: FAIL - - [test_find_elements_partial_link_text[partial link text-link\]] - expected: FAIL - - [test_find_elements_partial_link_text[ partial link text -link\]] - expected: FAIL - - [test_find_elements_partial_link_text[partial link text-k t\]] - expected: FAIL - - [test_find_elements_partial_link_text[partial link
text-k\\nt\]] - expected: FAIL - - [test_find_elements_partial_link_text[partial link&text-k&t\]] - expected: FAIL - - [test_find_elements_partial_link_text[PARTIAL LINK TEXT-LINK\]] - expected: FAIL - - [test_find_elements_partial_link_text[partial link text-LINK\]] - expected: FAIL - - [test_find_elements_in_nested_shadow_root[open\]] - expected: FAIL - [test_find_elements_in_nested_shadow_root[closed\]] expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/get_computed_role/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_computed_role/get.py.ini index c023dd2d5c5..5baa624599c 100644 --- a/tests/wpt/meta/webdriver/tests/classic/get_computed_role/get.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/get_computed_role/get.py.ini @@ -2,8 +2,5 @@ [test_no_browsing_context] expected: FAIL - [test_no_such_element_with_shadow_root] - expected: FAIL - [test_computed_roles[
foo
-article-article\]] expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_attribute/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_attribute/get.py.ini index c7642bd8ee1..1ec21a9e65f 100644 --- a/tests/wpt/meta/webdriver/tests/classic/get_element_attribute/get.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/get_element_attribute/get.py.ini @@ -2,9 +2,6 @@ [test_no_browsing_context] expected: FAIL - [test_no_such_element_with_shadow_root] - expected: FAIL - [test_boolean_attribute[audio-attrs0\]] expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_css_value/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_css_value/get.py.ini index c1af0175608..bb9de0071f4 100644 --- a/tests/wpt/meta/webdriver/tests/classic/get_element_css_value/get.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/get_element_css_value/get.py.ini @@ -1,6 +1,3 @@ [get.py] [test_no_browsing_context] expected: FAIL - - [test_no_such_element_with_shadow_root] - expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_property/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_property/get.py.ini index 3a1948de96e..4844164d09c 100644 --- a/tests/wpt/meta/webdriver/tests/classic/get_element_property/get.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/get_element_property/get.py.ini @@ -2,8 +2,5 @@ [test_no_browsing_context] expected: FAIL - [test_no_such_element_with_shadow_root] - expected: FAIL - [test_web_reference[shadowRoot-ShadowRoot\]] expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_rect/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_rect/get.py.ini index 3a58f29d7bd..2ac20123491 100644 --- a/tests/wpt/meta/webdriver/tests/classic/get_element_rect/get.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/get_element_rect/get.py.ini @@ -2,8 +2,5 @@ [test_no_browsing_context] expected: FAIL - [test_no_such_element_with_shadow_root] - expected: FAIL - [test_basic] expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_tag_name/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_tag_name/get.py.ini index 8fb651289ad..de8a1db66d9 100644 --- a/tests/wpt/meta/webdriver/tests/classic/get_element_tag_name/get.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/get_element_tag_name/get.py.ini @@ -2,8 +2,5 @@ [test_no_browsing_context] expected: FAIL - [test_no_such_element_with_shadow_root] - expected: FAIL - [test_get_element_tag_name] expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/get_element_text/get.py.ini b/tests/wpt/meta/webdriver/tests/classic/get_element_text/get.py.ini index a67074542e0..e17fd7f0114 100644 --- a/tests/wpt/meta/webdriver/tests/classic/get_element_text/get.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/get_element_text/get.py.ini @@ -2,9 +2,6 @@ [test_no_browsing_context] expected: FAIL - [test_no_such_element_with_shadow_root] - expected: FAIL - [test_shadow_root_slot[custom outside\]] expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/is_element_enabled/enabled.py.ini b/tests/wpt/meta/webdriver/tests/classic/is_element_enabled/enabled.py.ini index a287655de66..362bc856d4a 100644 --- a/tests/wpt/meta/webdriver/tests/classic/is_element_enabled/enabled.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/is_element_enabled/enabled.py.ini @@ -2,9 +2,6 @@ [test_no_browsing_context] expected: FAIL - [test_no_such_element_with_shadow_root] - expected: FAIL - [test_stale_element_reference[child_context\]] expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/is_element_selected/selected.py.ini b/tests/wpt/meta/webdriver/tests/classic/is_element_selected/selected.py.ini index 07512c40b00..5020632dabd 100644 --- a/tests/wpt/meta/webdriver/tests/classic/is_element_selected/selected.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/is_element_selected/selected.py.ini @@ -2,8 +2,5 @@ [test_no_browsing_context] expected: FAIL - [test_no_such_element_with_shadow_root] - expected: FAIL - [test_stale_element_reference[child_context\]] expected: FAIL diff --git a/tests/wpt/meta/webdriver/tests/classic/perform_actions/wheel.py.ini b/tests/wpt/meta/webdriver/tests/classic/perform_actions/wheel.py.ini index 4d4fe99691e..1b197bb50f5 100644 --- a/tests/wpt/meta/webdriver/tests/classic/perform_actions/wheel.py.ini +++ b/tests/wpt/meta/webdriver/tests/classic/perform_actions/wheel.py.ini @@ -1,13 +1,7 @@ [wheel.py] - [test_scroll_shadow_tree[outer-open\]] - expected: FAIL - [test_scroll_shadow_tree[outer-closed\]] expected: FAIL - [test_scroll_shadow_tree[inner-open\]] - expected: FAIL - [test_scroll_shadow_tree[inner-closed\]] expected: FAIL