Changeset 252180 in webkit

Timestamp:

Nov 7, 2019 4:09:12 AM (4 years ago)

Author:

Carlos Garcia Campos

Message:

WebDriver: correctly handle errors when focusing element before sending key events
​https://bugs.webkit.org/show_bug.cgi?id=203945

Reviewed by Carlos Alberto Lopez Perez.

Source/WebDriver:

We are throwing an exception that is not correctly handled.

Fixes: imported/w3c/webdriver/tests/element_send_keys/interactability.py::test_not_a_focusable_element

imported/w3c/webdriver/tests/element_send_keys/interactability.py::test_display_none
imported/w3c/webdriver/tests/element_send_keys/interactability.py::test_visibility_hidden
imported/w3c/webdriver/tests/element_send_keys/interactability.py::test_hidden
imported/w3c/webdriver/tests/element_send_keys/interactability.py::test_disabled

• Session.cpp:

(WebDriver::Session::elementSendKeys): Raise ElementNotInteractable error when element is not focusable.

Source/WebKit:

Handle ElementNotInteractable JavaScript exception to generate the appropriate Automation error.

• WebProcess/Automation/WebAutomationSessionProxy.cpp:

(WebKit::WebAutomationSessionProxy::evaluateJavaScriptFunction):

WebDriverTests:

Remove expectations for tests that are now passing.

• TestExpectations.json:

Location:

trunk

Files:

• Source/WebDriver/ChangeLog (modified) (1 diff)
• Source/WebDriver/Session.cpp (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp (modified) (1 diff)
• WebDriverTests/ChangeLog (modified) (1 diff)
• WebDriverTests/TestExpectations.json (modified) (1 diff)

trunk/Source/WebDriver/ChangeLog

@@ +1 @@
+2019-11-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: correctly handle errors when focusing element before sending key events
+        https://bugs.webkit.org/show_bug.cgi?id=203945
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        We are throwing an exception that is not correctly handled.
+
+        Fixes: imported/w3c/webdriver/tests/element_send_keys/interactability.py::test_not_a_focusable_element
+               imported/w3c/webdriver/tests/element_send_keys/interactability.py::test_display_none
+               imported/w3c/webdriver/tests/element_send_keys/interactability.py::test_visibility_hidden
+               imported/w3c/webdriver/tests/element_send_keys/interactability.py::test_hidden
+               imported/w3c/webdriver/tests/element_send_keys/interactability.py::test_disabled
+
+        * Session.cpp:
+        (WebDriver::Session::elementSendKeys): Raise ElementNotInteractable error when element is not focusable.
+
 2019-08-18  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/WebDriver/Session.cpp

@@ -1757 +1757 @@
             "    element.focus();"
             "    let tagName = element.tagName.toUpperCase();"
+            "    if (tagName === 'BODY' || element === document.documentElement)"
+            "        return;"
             "    let isTextElement = tagName === 'TEXTAREA' || (tagName === 'INPUT' && element.type === 'text');"
             "    if (isTextElement && element.selectionEnd == 0)"
             "        element.setSelectionRange(element.value.length, element.value.length);"
             "    if (element != doc.activeElement)"
-            "        throw new Error('cannot focus element');"
+            "        throw {name: 'ElementNotInteractable', message: 'Element is not focusable.'};"
             "}";
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: correctly handle errors when focusing element before sending key events
+        https://bugs.webkit.org/show_bug.cgi?id=203945
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Handle ElementNotInteractable JavaScript exception to generate the appropriate Automation error.
+
+        * WebProcess/Automation/WebAutomationSessionProxy.cpp:
+        (WebKit::WebAutomationSessionProxy::evaluateJavaScriptFunction):
+
 2019-11-06  Eric Liang  <ericliang@apple.com>
 

trunk/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp

@@ -292 +292 @@
         else if (exceptionName == "InvalidSelector")
             errorType = Inspector::Protocol::AutomationHelpers::getEnumConstantValue(Inspector::Protocol::Automation::ErrorMessage::InvalidSelector);
+        else if (exceptionName == "ElementNotInteractable")
+            errorType = Inspector::Protocol::AutomationHelpers::getEnumConstantValue(Inspector::Protocol::Automation::ErrorMessage::ElementNotInteractable);
 
         JSValueRef messageValue = JSObjectGetProperty(context, const_cast<JSObjectRef>(exception), OpaqueJSString::tryCreate("message"_s).get(), nullptr);

trunk/WebDriverTests/ChangeLog

@@ +1 @@
+2019-11-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        WebDriver: correctly handle errors when focusing element before sending key events
+        https://bugs.webkit.org/show_bug.cgi?id=203945
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        Remove expectations for tests that are now passing.
+
+        * TestExpectations.json:
+
 2019-01-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/WebDriverTests/TestExpectations.json

@@ -543 +543 @@
         "subtests": {
             "test_document_element_is_interactable": {
-                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/188545"}}
-            },
-            "test_not_a_focusable_element": {
-                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/188545"}}
-            },
-            "test_not_displayed_element": {
-                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/188545"}}
-            },
-            "test_hidden_element": {
-                "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/188545"}}
-            },
-            "test_disabled_element": {
                 "expected": {"all": {"status": ["FAIL"], "bug": "webkit.org/b/188545"}}
             }