Attachment 357808 Details for Bug 192928 – Patch

[patch] Patch

wd-find-elements-prompts.diff (text/plain), 8.09 KB, created by Carlos Garcia Campos on 2018-12-20 06:04:55 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2018-12-20 06:04:55 PST

Size: 8.09 KB

patch

obsolete

>diff --git a/Source/WebDriver/ChangeLog b/Source/WebDriver/ChangeLog
>index 7b2f25a8e0f..2a9dbf9fdc1 100644
>--- a/Source/WebDriver/ChangeLog
>+++ b/Source/WebDriver/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-12-20  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        WebDriver: Session::findElements should handle user prompts
>+        https://bugs.webkit.org/show_bug.cgi?id=192928
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        All user prompt tests for commands using Session::findElements are failing because of this.
>+
>+        * Session.cpp:
>+        (WebDriver::Session::findElements):
>+
> 2018-12-20  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK] WebDriver: tests in imported/w3c/webdriver/tests/element_clear/user_prompts.py are failing
>diff --git a/Source/WebDriver/Session.cpp b/Source/WebDriver/Session.cpp
>index af2bb7a7cf5..9a60d9a23c8 100644
>--- a/Source/WebDriver/Session.cpp
>+++ b/Source/WebDriver/Session.cpp
>@@ -983,69 +983,75 @@ void Session::findElements(const String& strategy, const String& selector, FindE
>         return;
>     }
> 
>-    RefPtr<JSON::Array> arguments = JSON::Array::create();
>-    arguments->pushString(JSON::Value::create(strategy)->toJSONString());
>-    if (rootElementID.isEmpty())
>-        arguments->pushString(JSON::Value::null()->toJSONString());
>-    else
>-        arguments->pushString(createElement(rootElementID)->toJSONString());
>-    arguments->pushString(JSON::Value::create(selector)->toJSONString());
>-    arguments->pushString(JSON::Value::create(mode == FindElementsMode::Single)->toJSONString());
>-    arguments->pushString(JSON::Value::create(m_implicitWaitTimeout.milliseconds())->toJSONString());
>-
>-    RefPtr<JSON::Object> parameters = JSON::Object::create();
>-    parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value());
>-    if (m_currentBrowsingContext)
>-        parameters->setString("frameHandle"_s, m_currentBrowsingContext.value());
>-    parameters->setString("function"_s, FindNodesJavaScript);
>-    parameters->setArray("arguments"_s, WTFMove(arguments));
>-    parameters->setBoolean("expectsImplicitCallbackArgument"_s, true);
>-    // If there's an implicit wait, use one second more as callback timeout.
>-    if (m_implicitWaitTimeout)
>-        parameters->setInteger("callbackTimeout"_s, Seconds(m_implicitWaitTimeout + 1_s).millisecondsAs<int>());
>-
>-    m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [this, protectedThis = makeRef(*this), mode, completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {
>-        if (response.isError || !response.responseObject) {
>-            completionHandler(CommandResult::fail(WTFMove(response.responseObject)));
>-            return;
>-        }
>-        String valueString;
>-        if (!response.responseObject->getString("result"_s, valueString)) {
>-            completionHandler(CommandResult::fail(CommandResult::ErrorCode::UnknownError));
>-            return;
>-        }
>-        RefPtr<JSON::Value> resultValue;
>-        if (!JSON::Value::parseJSON(valueString, resultValue)) {
>-            completionHandler(CommandResult::fail(CommandResult::ErrorCode::UnknownError));
>+    handleUserPrompts([this, strategy, selector, mode, rootElementID, completionHandler = WTFMove(completionHandler)](CommandResult&& result) mutable {
>+        if (result.isError()) {
>+            completionHandler(WTFMove(result));
>             return;
>         }
>+        RefPtr<JSON::Array> arguments = JSON::Array::create();
>+        arguments->pushString(JSON::Value::create(strategy)->toJSONString());
>+        if (rootElementID.isEmpty())
>+            arguments->pushString(JSON::Value::null()->toJSONString());
>+        else
>+            arguments->pushString(createElement(rootElementID)->toJSONString());
>+        arguments->pushString(JSON::Value::create(selector)->toJSONString());
>+        arguments->pushString(JSON::Value::create(mode == FindElementsMode::Single)->toJSONString());
>+        arguments->pushString(JSON::Value::create(m_implicitWaitTimeout.milliseconds())->toJSONString());
> 
>-        switch (mode) {
>-        case FindElementsMode::Single: {
>-            RefPtr<JSON::Object> elementObject = createElement(WTFMove(resultValue));
>-            if (!elementObject) {
>-                completionHandler(CommandResult::fail(CommandResult::ErrorCode::NoSuchElement));
>+        RefPtr<JSON::Object> parameters = JSON::Object::create();
>+        parameters->setString("browsingContextHandle"_s, m_toplevelBrowsingContext.value());
>+        if (m_currentBrowsingContext)
>+            parameters->setString("frameHandle"_s, m_currentBrowsingContext.value());
>+        parameters->setString("function"_s, FindNodesJavaScript);
>+        parameters->setArray("arguments"_s, WTFMove(arguments));
>+        parameters->setBoolean("expectsImplicitCallbackArgument"_s, true);
>+        // If there's an implicit wait, use one second more as callback timeout.
>+        if (m_implicitWaitTimeout)
>+            parameters->setInteger("callbackTimeout"_s, Seconds(m_implicitWaitTimeout + 1_s).millisecondsAs<int>());
>+
>+        m_host->sendCommandToBackend("evaluateJavaScriptFunction"_s, WTFMove(parameters), [this, protectedThis = makeRef(*this), mode, completionHandler = WTFMove(completionHandler)](SessionHost::CommandResponse&& response) {
>+            if (response.isError || !response.responseObject) {
>+                completionHandler(CommandResult::fail(WTFMove(response.responseObject)));
>                 return;
>             }
>-            completionHandler(CommandResult::success(WTFMove(elementObject)));
>-            break;
>-        }
>-        case FindElementsMode::Multiple: {
>-            RefPtr<JSON::Array> elementsArray;
>-            if (!resultValue->asArray(elementsArray)) {
>-                completionHandler(CommandResult::fail(CommandResult::ErrorCode::NoSuchElement));
>+            String valueString;
>+            if (!response.responseObject->getString("result"_s, valueString)) {
>+                completionHandler(CommandResult::fail(CommandResult::ErrorCode::UnknownError));
>                 return;
>             }
>-            RefPtr<JSON::Array> elementObjectsArray = JSON::Array::create();
>-            unsigned elementsArrayLength = elementsArray->length();
>-            for (unsigned i = 0; i < elementsArrayLength; ++i) {
>-                if (auto elementObject = createElement(elementsArray->get(i)))
>-                    elementObjectsArray->pushObject(WTFMove(elementObject));
>+            RefPtr<JSON::Value> resultValue;
>+            if (!JSON::Value::parseJSON(valueString, resultValue)) {
>+                completionHandler(CommandResult::fail(CommandResult::ErrorCode::UnknownError));
>+                return;
>             }
>-            completionHandler(CommandResult::success(WTFMove(elementObjectsArray)));
>-            break;
>-        }
>-        }
>+
>+            switch (mode) {
>+            case FindElementsMode::Single: {
>+                RefPtr<JSON::Object> elementObject = createElement(WTFMove(resultValue));
>+                if (!elementObject) {
>+                    completionHandler(CommandResult::fail(CommandResult::ErrorCode::NoSuchElement));
>+                    return;
>+                }
>+                completionHandler(CommandResult::success(WTFMove(elementObject)));
>+                break;
>+            }
>+            case FindElementsMode::Multiple: {
>+                RefPtr<JSON::Array> elementsArray;
>+                if (!resultValue->asArray(elementsArray)) {
>+                    completionHandler(CommandResult::fail(CommandResult::ErrorCode::NoSuchElement));
>+                    return;
>+                }
>+                RefPtr<JSON::Array> elementObjectsArray = JSON::Array::create();
>+                unsigned elementsArrayLength = elementsArray->length();
>+                for (unsigned i = 0; i < elementsArrayLength; ++i) {
>+                    if (auto elementObject = createElement(elementsArray->get(i)))
>+                        elementObjectsArray->pushObject(WTFMove(elementObject));
>+                }
>+                completionHandler(CommandResult::success(WTFMove(elementObjectsArray)));
>+                break;
>+            }
>+            }
>+        });
>     });
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 192928: 357808