selenium-webdriver 3.0.0.beta1 → 3.0.0.beta2

data/CHANGES

@@ -1,3 +1,10 @@
+3.0.0.beta2 (2016-08-02)
+===================
+
+Firefox:
+  * Fixed bug with form submission
+  * Improved w3c element handling
+
 3.0.0.beta1 (2016-07-28)
 ===================
 

data/lib/selenium/webdriver/common/bridge_helper.rb

@@ -31,8 +31,9 @@ module Selenium
         when Array
           arg.map { |e| unwrap_script_result(e) }
         when Hash
-          id = element_id_from(arg)
-          return Element.new(self, id) if id
+          element_id = element_id_from(arg)
+          element_id = arg if self.is_a?(Remote::W3CBridge) && element_id
+          return Element.new(self, element_id) if element_id
           arg.each { |k, v| arg[k] = unwrap_script_result(v) }
         else
           arg

data/lib/selenium/webdriver/common/element.rb

@@ -292,10 +292,7 @@ module Selenium
       #
 
       def as_json(*)
-        {
-          :ELEMENT => @id,
-          'element-6066-11e4-a52e-4f735466cecf' => @id
-        }
+        @id.is_a?(Hash) ? @id : {:ELEMENT => @id}
       end
 
       private

data/lib/selenium/webdriver/firefox/service.rb

@@ -30,7 +30,7 @@ module Selenium
         private
 
         def start_process
-          server_command = [@executable_path, "--binary=#{Firefox::Binary.path}", "--webdriver-port=#{@port}", *@extra_args]
+          server_command = [@executable_path, "--binary=#{Firefox::Binary.path}", "--port=#{@port}", *@extra_args]
           @process       = ChildProcess.build(*server_command)
 
           if $DEBUG

data/lib/selenium/webdriver/remote/capabilities.rb

@@ -143,7 +143,7 @@ module Selenium
             caps.takes_screenshot      = data.delete('takesScreenshot')
             caps.native_events         = data.delete('nativeEvents')
             caps.rotatable             = data.delete('rotatable')
-            caps.proxy                 = Proxy.json_create(data['proxy']) if data.key?('proxy')
+            caps.proxy                 = Proxy.json_create(data['proxy']) if data.key?('proxy') && !data['proxy'].empty?
 
             # any remaining pairs will be added as is, with no conversion
             caps.merge!(data)

data/lib/selenium/webdriver/remote/w3c_bridge.rb

@@ -124,6 +124,9 @@ module Selenium
         end
 
         def create_session(desired_capabilities)
+          # TODO - Remove this when Mozilla fixes bug
+          desired_capabilities[:browser_name] = 'firefox' if desired_capabilities[:browser_name] == 'Firefox'
+
           resp = raw_execute :newSession, {}, {desiredCapabilities: desired_capabilities}
           @session_id = resp['sessionId']
           return W3CCapabilities.json_create resp['value'] if @session_id
@@ -396,7 +399,7 @@ module Selenium
         #
 
         def click_element(element)
-          execute :elementClick, id: element
+          execute :elementClick, id: element.values.first
         end
 
         def click
@@ -436,21 +439,22 @@ module Selenium
 
         # TODO: - Implement file verification
         def send_keys_to_element(element, keys)
-          execute :elementSendKeys, {id: element}, {value: keys.join('').split(//)}
+          execute :elementSendKeys, {id: element.values.first}, {value: keys.join('').split(//)}
         end
 
         def clear_element(element)
-          execute :elementClear, id: element
+          execute :elementClear, id: element.values.first
         end
 
         def submit_element(element)
+          form = find_element_by('xpath', "./ancestor-or-self::form", element)
           execute_script("var e = arguments[0].ownerDocument.createEvent('Event');" \
                             "e.initEvent('submit', true, true);" \
-                            'if (arguments[0].dispatchEvent(e)) { arguments[0].submit() }', element)
+                            'if (arguments[0].dispatchEvent(e)) { arguments[0].submit() }', form.as_json)
         end
 
         def drag_element(element, right_by, down_by)
-          execute :dragElement, {id: element}, {x: right_by, y: down_by}
+          execute :dragElement, {id: element.values.first}, {x: right_by, y: down_by}
         end
 
         def touch_single_tap(element)
@@ -511,23 +515,23 @@ module Selenium
         #
 
         def element_tag_name(element)
-          execute :getElementTagName, id: element
+          execute :getElementTagName, id: element.values.first
         end
 
         def element_attribute(element, name)
-          execute :getElementAttribute, id: element, name: name
+          execute :getElementAttribute, id: element.values.first, name: name
         end
 
         def element_value(element)
-          execute :getElementProperty, id: element, name: 'value'
+          execute :getElementProperty, id: element.values.first, name: 'value'
         end
 
         def element_text(element)
-          execute :getElementText, id: element
+          execute :getElementText, id: element.values.first
         end
 
         def element_location(element)
-          data = execute :getElementRect, id: element
+          data = execute :getElementRect, id: element.values.first
 
           Point.new data['x'], data['y']
         end
@@ -538,27 +542,27 @@ module Selenium
         end
 
         def element_size(element)
-          data = execute :getElementRect, id: element
+          data = execute :getElementRect, id: element.values.first
 
           Dimension.new data['width'], data['height']
         end
 
         def element_enabled?(element)
-          execute :isElementEnabled, id: element
+          execute :isElementEnabled, id: element.values.first
         end
 
         def element_selected?(element)
-          execute :isElementSelected, id: element
+          execute :isElementSelected, id: element.values.first
         end
 
         def element_displayed?(element)
           jwp = Selenium::WebDriver::Remote::Bridge::COMMANDS[:isElementDisplayed]
           self.class.command(:isElementDisplayed, jwp.first, jwp.last)
-          execute :isElementDisplayed, id: element
+          execute :isElementDisplayed, id: element.values.first
         end
 
         def element_value_of_css_property(element, prop)
-          execute :getElementCssValue, id: element, property_name: prop
+          execute :getElementCssValue, id: element.values.first, property_name: prop
         end
 
         #
@@ -575,19 +579,18 @@ module Selenium
           how, what = convert_locators(how, what)
 
           id = if parent
-                 execute :findChildElement, {id: parent}, {using: how, value: what}
+                 execute :findChildElement, {id: parent.values.first}, {using: how, value: what}
                else
                  execute :findElement, {}, {using: how, value: what}
                end
-
-          Element.new self, element_id_from(id)
+          Element.new self, id
         end
 
         def find_elements_by(how, what, parent = nil)
           how, what = convert_locators(how, what)
 
           ids = if parent
-                  execute :findChildElements, {id: parent}, {using: how, value: what}
+                  execute :findChildElements, {id: parent.values.first}, {using: how, value: what}
                 else
                   execute :findElements, {}, {using: how, value: what}
                 end

data/selenium-webdriver.gemspec

@@ -5,7 +5,7 @@ raise "cwd must be #{root} when reading gemspec" if root != Dir.pwd
 
 Gem::Specification.new do |s|
   s.name = 'selenium-webdriver'
-  s.version = '3.0.0.beta1'
+  s.version = '3.0.0.beta2'
 
   s.authors = ['Alex Rodionov', 'Titus Fortner']
   s.email = ['p0deje@gmail.com', 'titusfortner@gmail.com']

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.0.0.beta1
+  version: 3.0.0.beta2
 platform: ruby
 authors: 
   - Alex Rodionov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-07-28 00:00:00 -05:00
+date: 2016-08-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency