Changeset 232504 in webkit
- Timestamp:
- Jun 4, 2018 10:38:56 PM (6 years ago)
- Location:
- trunk/Source/WebDriver
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebDriver/ChangeLog
r232150 r232504 1 2018-06-04 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [WPE] WebDriver: stop making mandatory to provide a browser path if wpe:browserOptions is present in capabilities 4 https://bugs.webkit.org/show_bug.cgi?id=186264 5 6 Reviewed by Žan Doberšek. 7 8 Everything should be optional. Do not consider invalid to not provide a browser binary when wpe:browserOptions 9 is present. 10 11 * wpe/WebDriverServiceWPE.cpp: 12 (WebDriver::WebDriverService::platformParseCapabilities const): 13 1 14 2018-05-24 Carlos Garcia Campos <cgarcia@igalia.com> 2 15 -
trunk/Source/WebDriver/wpe/WebDriverServiceWPE.cpp
r227603 r232504 82 82 void WebDriverService::platformParseCapabilities(const JSON::Object& matchedCapabilities, Capabilities& capabilities) const 83 83 { 84 capabilities.browserBinary = String("dyz"); 85 capabilities.browserArguments = Vector<String> { ASCIILiteral("--automation") }; 86 84 87 RefPtr<JSON::Object> browserOptions; 85 if (!matchedCapabilities.getObject(ASCIILiteral("wpe:browserOptions"), browserOptions)) { 86 capabilities.browserBinary = String("dyz"); 87 capabilities.browserArguments = Vector<String> { ASCIILiteral("--automation") }; 88 if (!matchedCapabilities.getObject(ASCIILiteral("wpe:browserOptions"), browserOptions)) 88 89 return; 89 }90 90 91 91 String browserBinary; 92 browserOptions->getString(ASCIILiteral("binary"), browserBinary); 93 ASSERT(!browserBinary.isNull()); 94 capabilities.browserBinary = browserBinary; 92 if (browserOptions->getString(ASCIILiteral("binary"), browserBinary)) 93 capabilities.browserBinary = browserBinary; 95 94 96 capabilities.browserArguments = Vector<String>();97 95 RefPtr<JSON::Array> browserArguments; 98 if (browserOptions->getArray(ASCIILiteral("args"), browserArguments) ) {96 if (browserOptions->getArray(ASCIILiteral("args"), browserArguments) && browserArguments->length()) { 99 97 unsigned browserArgumentsLength = browserArguments->length(); 98 capabilities.browserArguments = Vector<String>(); 100 99 capabilities.browserArguments->reserveInitialCapacity(browserArgumentsLength); 101 100 for (unsigned i = 0; i < browserArgumentsLength; ++i) {
Note: See TracChangeset
for help on using the changeset viewer.