Changeset 232504 in webkit

Timestamp:

Jun 4, 2018 10:38:56 PM (6 years ago)

Author:

Carlos Garcia Campos

Message:

[WPE] WebDriver: stop making mandatory to provide a browser path if wpe:browserOptions is present in capabilities
​https://bugs.webkit.org/show_bug.cgi?id=186264

Reviewed by Žan Doberšek.

Everything should be optional. Do not consider invalid to not provide a browser binary when wpe:browserOptions
is present.

• wpe/WebDriverServiceWPE.cpp:

(WebDriver::WebDriverService::platformParseCapabilities const):

Location:

trunk/Source/WebDriver

Files:

• ChangeLog (modified) (1 diff)
• wpe/WebDriverServiceWPE.cpp (modified) (1 diff)

trunk/Source/WebDriver/ChangeLog

@@ +1 @@
+2018-06-04  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [WPE] WebDriver: stop making mandatory to provide a browser path if wpe:browserOptions is present in capabilities
+        https://bugs.webkit.org/show_bug.cgi?id=186264
+
+        Reviewed by Žan Doberšek.
+
+        Everything should be optional. Do not consider invalid to not provide a browser binary when wpe:browserOptions
+        is present.
+
+        * wpe/WebDriverServiceWPE.cpp:
+        (WebDriver::WebDriverService::platformParseCapabilities const):
+
 2018-05-24  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebDriver/wpe/WebDriverServiceWPE.cpp

@@ -82 +82 @@
 void WebDriverService::platformParseCapabilities(const JSON::Object& matchedCapabilities, Capabilities& capabilities) const
 {
+    capabilities.browserBinary = String("dyz");
+    capabilities.browserArguments = Vector<String> { ASCIILiteral("--automation") };
+
     RefPtr<JSON::Object> browserOptions;
-    if (!matchedCapabilities.getObject(ASCIILiteral("wpe:browserOptions"), browserOptions)) {
-        capabilities.browserBinary = String("dyz");
-        capabilities.browserArguments = Vector<String> { ASCIILiteral("--automation") };
+    if (!matchedCapabilities.getObject(ASCIILiteral("wpe:browserOptions"), browserOptions))
         return;
-    }
 
     String browserBinary;
-    browserOptions->getString(ASCIILiteral("binary"), browserBinary);
-    ASSERT(!browserBinary.isNull());
-    capabilities.browserBinary = browserBinary;
+    if (browserOptions->getString(ASCIILiteral("binary"), browserBinary))
+        capabilities.browserBinary = browserBinary;
 
-    capabilities.browserArguments = Vector<String>();
     RefPtr<JSON::Array> browserArguments;
-    if (browserOptions->getArray(ASCIILiteral("args"), browserArguments)) {
+    if (browserOptions->getArray(ASCIILiteral("args"), browserArguments) && browserArguments->length()) {
         unsigned browserArgumentsLength = browserArguments->length();
+        capabilities.browserArguments = Vector<String>();
         capabilities.browserArguments->reserveInitialCapacity(browserArgumentsLength);
         for (unsigned i = 0; i < browserArgumentsLength; ++i) {