Allow Ruby To handle both 'Element' and 'element-6066-11e4-a52e-4f735…

…466cecf' keys when sending and recieving elements
jleyba · Mar 3, 2015 · 3bef150 · 3bef150
1 parent 230ecb9
commit 3bef150
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/rb/lib/selenium/webdriver/common/bridge_helper.rb b/rb/lib/selenium/webdriver/common/bridge_helper.rb
@@ -25,7 +25,7 @@ def unwrap_script_result(arg)
       end
 
       def element_id_from(id)
-        id['ELEMENT']
+        id['ELEMENT'] or id['element-6066-11e4-a52e-4f735466cecf']
       end
 
       def parse_cookie_string(str)

diff --git a/rb/lib/selenium/webdriver/common/element.rb b/rb/lib/selenium/webdriver/common/element.rb
@@ -133,7 +133,7 @@ def send_keys(*args)
       #
       # Note that the events fired by this event may not be as you'd expect.  In particular, we don't
       # fire any keyboard or mouse events.  If you want to ensure keyboard events are
-      # fired, consider using #send_keys with the backspace key. To ensure you get a change event, 
+      # fired, consider using #send_keys with the backspace key. To ensure you get a change event,
       # consider following with a call to #send_keys with the tab key.
       #
 
@@ -272,7 +272,10 @@ def to_json(*args)
       #
 
       def as_json(opts = nil)
-        { :ELEMENT => @id }
+        {
+          :ELEMENT => @id,
+          "element-6066-11e4-a52e-4f735466cecf" => @id
+        }
       end
 
       private