Changing IE driver to allow interaction with elements where opacity = 0

jimevans · jimevans · commit 698dc42eeaa1 · 2015-04-29T11:27:55.000-04:00
The isDisplayed will still return false for those elements, as is consistent with drivers for Firefox and Chrome. Fixes issue SeleniumHQ#503.
diff --git a/cpp/iedriver/CommandHandlers/ClickElementCommandHandler.h b/cpp/iedriver/CommandHandlers/ClickElementCommandHandler.h
@@ -108,7 +108,7 @@ class ClickElementCommandHandler : public IECommandHandler {
           }
         } else {
           bool displayed;
-          status_code = element_wrapper->IsDisplayed(&displayed);
+          status_code = element_wrapper->IsDisplayed(true, &displayed);
           if (status_code != WD_SUCCESS) {
             response->SetErrorResponse(status_code, "Unable to determine element is displayed");
             return;
diff --git a/cpp/iedriver/CommandHandlers/IsElementDisplayedCommandHandler.h b/cpp/iedriver/CommandHandlers/IsElementDisplayedCommandHandler.h
@@ -53,7 +53,7 @@ class IsElementDisplayedCommandHandler : public IECommandHandler {
       status_code = this->GetElement(executor, element_id, &element_wrapper);
       if (status_code == WD_SUCCESS) {
         bool result;
-        status_code = element_wrapper->IsDisplayed(&result);
+        status_code = element_wrapper->IsDisplayed(false, &result);
         if (status_code == WD_SUCCESS) {
           response->SetSuccessResponse(result);
         } else {
diff --git a/cpp/iedriver/CommandHandlers/SendKeysCommandHandler.h b/cpp/iedriver/CommandHandlers/SendKeysCommandHandler.h
@@ -81,7 +81,7 @@ class SendKeysCommandHandler : public IECommandHandler {
 
       if (status_code == WD_SUCCESS) {
         bool displayed;
-        status_code = element_wrapper->IsDisplayed(&displayed);
+        status_code = element_wrapper->IsDisplayed(true, &displayed);
         if (status_code != WD_SUCCESS || !displayed) {
           response->SetErrorResponse(EELEMENTNOTDISPLAYED,
                                      "Element is not displayed");
diff --git a/cpp/iedriver/Element.cpp b/cpp/iedriver/Element.cpp
@@ -83,7 +83,7 @@ Json::Value Element::ConvertToJson() {
   return json_wrapper;
 }
 
-int Element::IsDisplayed(bool* result) {
+int Element::IsDisplayed(bool ignore_opacity, bool* result) {
   LOG(TRACE) << "Entering Element::IsDisplayed";
 
   int status_code = WD_SUCCESS;
@@ -100,7 +100,7 @@ int Element::IsDisplayed(bool* result) {
   // N.B., The second argument to the IsDisplayed atom is "ignoreOpacity".
   Script script_wrapper(doc, script_source, 2);
   script_wrapper.AddArgument(this->element_);
-  script_wrapper.AddArgument(false);
+  script_wrapper.AddArgument(ignore_opacity);
   status_code = script_wrapper.Execute();
 
   if (status_code == WD_SUCCESS) {
@@ -214,7 +214,7 @@ int Element::GetClickLocation(const ELEMENT_SCROLL_BEHAVIOR scroll_behavior,
   LOG(TRACE) << "Entering Element::GetClickLocation";
 
   bool displayed;
-  int status_code = this->IsDisplayed(&displayed);
+  int status_code = this->IsDisplayed(true, &displayed);
   if (status_code != WD_SUCCESS) {
     LOG(WARN) << "Unable to determine element is displayed";
     return status_code;
diff --git a/cpp/iedriver/Element.h b/cpp/iedriver/Element.h
@@ -60,7 +60,7 @@ class Element {
   int GetCssPropertyValue(const std::string& property_name,
                           std::string* property_value);
 
-  int IsDisplayed(bool* result);
+  int IsDisplayed(bool ignore_opacity, bool* result);
   bool IsEnabled(void);
   bool IsSelected(void);
   bool IsInteractable(void);
diff --git a/cpp/iedriverserver/CHANGELOG b/cpp/iedriverserver/CHANGELOG
@@ -9,6 +9,12 @@ available via the project downloads page. Changes in "revision" field indicate
 private releases checked into the prebuilts directory of the source tree, but
 not made generally available on the downloads page.
 
+v2.45.0.5
+=========
+ * Changed to allow interaction with elements where opacity = 0. The
+   isDisplayed will still return false for those elements, as is consistent
+   with drivers for Firefox and Chrome. Fixes issue #503.
+
 v2.45.0.4
 =========
  * Added busy check after attaching to newly launched IE instance.
diff --git a/cpp/iedriverserver/IEDriverServer.rc b/cpp/iedriverserver/IEDriverServer.rc
diff --git a/cpp/prebuilt/Win32/Release/IEDriverServer.exe b/cpp/prebuilt/Win32/Release/IEDriverServer.exe
diff --git a/cpp/prebuilt/x64/Release/IEDriverServer.exe b/cpp/prebuilt/x64/Release/IEDriverServer.exe

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ class ClickElementCommandHandler : public IECommandHandler {`
`108`	`108`	`}`
`109`	`109`	`} else {`
`110`	`110`	`bool displayed;`
`111`		`- status_code = element_wrapper->IsDisplayed(&displayed);`
	`111`	`+ status_code = element_wrapper->IsDisplayed(true, &displayed);`
`112`	`112`	`if (status_code != WD_SUCCESS) {`
`113`	`113`	`response->SetErrorResponse(status_code, "Unable to determine element is displayed");`
`114`	`114`	`return;`