Title: [234837] trunk/Source/WebDriver
- Revision
- 234837
- Author
- [email protected]
- Date
- 2018-08-13 23:51:44 -0700 (Mon, 13 Aug 2018)
Log Message
WebDriver: include all capabilities in the new session response
https://bugs.webkit.org/show_bug.cgi?id=188511
Reviewed by Brian Burg.
As expected by the tests, using the default values when the capability is not provided by the user.
* WebDriverService.cpp:
(WebDriver::WebDriverService::createSession):
Modified Paths
Diff
Modified: trunk/Source/WebDriver/ChangeLog (234836 => 234837)
--- trunk/Source/WebDriver/ChangeLog 2018-08-14 06:49:25 UTC (rev 234836)
+++ trunk/Source/WebDriver/ChangeLog 2018-08-14 06:51:44 UTC (rev 234837)
@@ -1,5 +1,17 @@
2018-08-13 Carlos Garcia Campos <[email protected]>
+ WebDriver: include all capabilities in the new session response
+ https://bugs.webkit.org/show_bug.cgi?id=188511
+
+ Reviewed by Brian Burg.
+
+ As expected by the tests, using the default values when the capability is not provided by the user.
+
+ * WebDriverService.cpp:
+ (WebDriver::WebDriverService::createSession):
+
+2018-08-13 Carlos Garcia Campos <[email protected]>
+
WebDriver: several element_send_keys tests are failing since added
https://bugs.webkit.org/show_bug.cgi?id=181644
Modified: trunk/Source/WebDriver/WebDriverService.cpp (234836 => 234837)
--- trunk/Source/WebDriver/WebDriverService.cpp 2018-08-14 06:49:25 UTC (rev 234836)
+++ trunk/Source/WebDriver/WebDriverService.cpp 2018-08-14 06:51:44 UTC (rev 234837)
@@ -695,34 +695,27 @@
resultObject->setString("sessionId"_s, m_session->id());
RefPtr<JSON::Object> capabilitiesObject = JSON::Object::create();
const auto& capabilities = m_session->capabilities();
- if (capabilities.browserName)
- capabilitiesObject->setString("browserName"_s, capabilities.browserName.value());
- if (capabilities.browserVersion)
- capabilitiesObject->setString("browserVersion"_s, capabilities.browserVersion.value());
- if (capabilities.platformName)
- capabilitiesObject->setString("platformName"_s, capabilities.platformName.value());
- if (capabilities.acceptInsecureCerts)
- capabilitiesObject->setBoolean("acceptInsecureCerts"_s, capabilities.acceptInsecureCerts.value());
- if (capabilities.setWindowRect)
- capabilitiesObject->setBoolean("setWindowRect"_s, capabilities.setWindowRect.value());
- if (capabilities.unhandledPromptBehavior) {
- switch (capabilities.unhandledPromptBehavior.value()) {
- case UnhandledPromptBehavior::Dismiss:
- capabilitiesObject->setString("unhandledPromptBehavior"_s, "dismiss");
- break;
- case UnhandledPromptBehavior::Accept:
- capabilitiesObject->setString("unhandledPromptBehavior"_s, "accept");
- break;
- case UnhandledPromptBehavior::DismissAndNotify:
- capabilitiesObject->setString("unhandledPromptBehavior"_s, "dismiss and notify");
- break;
- case UnhandledPromptBehavior::AcceptAndNotify:
- capabilitiesObject->setString("unhandledPromptBehavior"_s, "accept and notify");
- break;
- case UnhandledPromptBehavior::Ignore:
- capabilitiesObject->setString("unhandledPromptBehavior"_s, "ignore");
- break;
- }
+ capabilitiesObject->setString("browserName"_s, capabilities.browserName.value_or(emptyString()));
+ capabilitiesObject->setString("browserVersion"_s, capabilities.browserVersion.value_or(emptyString()));
+ capabilitiesObject->setString("platformName"_s, capabilities.platformName.value_or(emptyString()));
+ capabilitiesObject->setBoolean("acceptInsecureCerts"_s, capabilities.acceptInsecureCerts.value_or(false));
+ capabilitiesObject->setBoolean("setWindowRect"_s, capabilities.setWindowRect.value_or(true));
+ switch (capabilities.unhandledPromptBehavior.value_or(UnhandledPromptBehavior::DismissAndNotify)) {
+ case UnhandledPromptBehavior::Dismiss:
+ capabilitiesObject->setString("unhandledPromptBehavior"_s, "dismiss");
+ break;
+ case UnhandledPromptBehavior::Accept:
+ capabilitiesObject->setString("unhandledPromptBehavior"_s, "accept");
+ break;
+ case UnhandledPromptBehavior::DismissAndNotify:
+ capabilitiesObject->setString("unhandledPromptBehavior"_s, "dismiss and notify");
+ break;
+ case UnhandledPromptBehavior::AcceptAndNotify:
+ capabilitiesObject->setString("unhandledPromptBehavior"_s, "accept and notify");
+ break;
+ case UnhandledPromptBehavior::Ignore:
+ capabilitiesObject->setString("unhandledPromptBehavior"_s, "ignore");
+ break;
}
switch (capabilities.pageLoadStrategy.value_or(PageLoadStrategy::Normal)) {
case PageLoadStrategy::None:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
