WebKit Bugzilla
Attachment 347011 Details for
Bug 188511
: WebDriver: include all capabilities in the new session response
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
wd-capabilities-default.diff (text/plain), 4.67 KB, created by
Carlos Garcia Campos
on 2018-08-13 05:20:23 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Carlos Garcia Campos
Created:
2018-08-13 05:20:23 PDT
Size:
4.67 KB
patch
obsolete
>diff --git a/Source/WebDriver/ChangeLog b/Source/WebDriver/ChangeLog >index bf598e90e88..ae6fe07632b 100644 >--- a/Source/WebDriver/ChangeLog >+++ b/Source/WebDriver/ChangeLog >@@ -1,3 +1,15 @@ >+2018-08-13 Carlos Garcia Campos <cgarcia@igalia.com> >+ >+ WebDriver: include all capabilities in the new session response >+ https://bugs.webkit.org/show_bug.cgi?id=188511 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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 <cgarcia@igalia.com> > > WebDriver: several element_send_keys tests are failing since added >diff --git a/Source/WebDriver/WebDriverService.cpp b/Source/WebDriver/WebDriverService.cpp >index 076ca0040d8..dab0fa84ce3 100644 >--- a/Source/WebDriver/WebDriverService.cpp >+++ b/Source/WebDriver/WebDriverService.cpp >@@ -695,34 +695,27 @@ void WebDriverService::createSession(Vector<Capabilities>&& capabilitiesList, st > 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:
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
bburg
:
review+
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 188511
: 347011