selenium-webdriver 2.53.4 → 3.0.0.beta1

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

@@ -19,7 +19,6 @@
 
 module Selenium
   module WebDriver
-
     #
     # The main class through which you control the browser.
     #
@@ -33,7 +32,6 @@ module Selenium
       include SearchContext
 
       class << self
-
         #
         # @api private
         #
@@ -64,14 +62,14 @@ module Selenium
                      Chrome::Bridge.new(opts)
                    when :edge
                      Edge::Bridge.new(opts)
-                   when :android
-                     Android::Bridge.new(opts)
-                   when :iphone
-                     IPhone::Bridge.new(opts)
                    when :phantomjs
                      PhantomJS::Bridge.new(opts)
                    when :safari
-                     Safari::Bridge.new(opts)
+                     if Safari::LegacyBridge.legacy?
+                       Safari::LegacyBridge.new(opts)
+                     else
+                       Safari::AppleBridge.new(opts)
+                     end
                    else
                      raise ArgumentError, "unknown driver: #{browser.inspect}"
                    end
@@ -93,13 +91,12 @@ module Selenium
         @bridge = bridge
 
         # TODO: refactor this away
-        unless bridge.driver_extensions.empty?
-          extend(*bridge.driver_extensions)
-        end
+        return if bridge.driver_extensions.empty?
+        extend(*bridge.driver_extensions)
       end
 
       def inspect
-        '#<%s:0x%x browser=%s>' % [self.class, hash*2, bridge.browser.inspect]
+        format '#<%s:0x%x browser=%s>', self.class, hash * 2, bridge.browser.inspect
       end
 
       #
@@ -144,7 +141,7 @@ module Selenium
       #
 
       def current_url
-        bridge.getCurrentUrl
+        bridge.url
       end
 
       #
@@ -154,7 +151,7 @@ module Selenium
       #
 
       def title
-        bridge.getTitle
+        bridge.title
       end
 
       #
@@ -164,7 +161,7 @@ module Selenium
       #
 
       def page_source
-        bridge.getPageSource
+        bridge.page_source
       end
 
       #
@@ -191,7 +188,7 @@ module Selenium
       #
 
       def window_handles
-        bridge.getWindowHandles
+        bridge.window_handles
       end
 
       #
@@ -201,7 +198,7 @@ module Selenium
       #
 
       def window_handle
-        bridge.getCurrentWindowHandle
+        bridge.window_handle
       end
 
       #
@@ -217,7 +214,7 @@ module Selenium
       #
 
       def execute_script(script, *args)
-        bridge.executeScript(script, *args)
+        bridge.execute_script(script, *args)
       end
 
       # Execute an asynchronous piece of JavaScript in the context of the
@@ -236,20 +233,19 @@ module Selenium
       #
 
       def execute_async_script(script, *args)
-        bridge.executeAsyncScript(script, *args)
+        bridge.execute_async_script(script, *args)
       end
 
-
       #-------------------------------- sugar  --------------------------------
 
       #
-      #   driver.first(:id, 'foo')
+      #   driver.first(id: 'foo')
       #
 
       alias_method :first, :find_element
 
       #
-      #   driver.all(:class, 'bar') #=> [#<WebDriver::Element:0x1011c3b88, ...]
+      #   driver.all(class: 'bar') #=> [#<WebDriver::Element:0x1011c3b88, ...]
       #
 
       alias_method :all, :find_elements
@@ -273,9 +269,7 @@ module Selenium
       #
 
       def [](sel)
-        if sel.kind_of?(String) || sel.kind_of?(Symbol)
-          sel = { :id => sel }
-        end
+        sel = {id: sel} if sel.is_a?(String) || sel.is_a?(Symbol)
 
         find_element sel
       end
@@ -299,10 +293,7 @@ module Selenium
 
       private
 
-      def bridge
-        @bridge
-      end
-
+      attr_reader :bridge
     end # Driver
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/driver_extensions/has_input_devices.rb

@@ -19,14 +19,12 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     #
 
     module DriverExtensions
       module HasInputDevices
-
         #
         # @return [ActionBuilder]
         # @api public
@@ -51,7 +49,6 @@ module Selenium
         def keyboard
           Keyboard.new @bridge
         end
-
       end # HasInputDevices
     end # DriverExtensions
   end # WebDriver

data/lib/selenium/webdriver/common/driver_extensions/has_location.rb

@@ -20,25 +20,23 @@
 module Selenium
   module WebDriver
     module DriverExtensions
-
       module HasLocation
         def location
-          @bridge.getLocation
+          @bridge.location
         end
 
         def location=(loc)
-          unless loc.kind_of?(Location)
+          unless loc.is_a?(Location)
             raise TypeError, "expected #{Location}, got #{loc.inspect}:#{loc.class}"
           end
 
-          @bridge.setLocation loc.latitude, loc.longitude, loc.altitude
+          @bridge.set_location loc.latitude, loc.longitude, loc.altitude
         end
 
         def set_location(lat, lon, alt)
           self.location = Location.new(Float(lat), Float(lon), Float(alt))
         end
-
-      end #HasLocation
+      end # HasLocation
     end # DriverExtensions
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/driver_extensions/has_network_connection.rb

@@ -22,7 +22,7 @@ module Selenium
     module DriverExtensions
       module HasNetworkConnection
         def network_connection_type
-          connection_value = @bridge.getNetworkConnection
+          connection_value = @bridge.network_connection
 
           connection_type = values_to_type[connection_value]
 
@@ -32,17 +32,17 @@ module Selenium
         end
 
         def network_connection_type=(connection_type)
-          raise ArgumentError, "Invalid connection type" unless valid_type? connection_type
+          raise ArgumentError, 'Invalid connection type' unless valid_type? connection_type
 
           connection_value = type_to_values[connection_type]
 
-          @bridge.setNetworkConnection connection_value
+          @bridge.network_connection = connection_value
         end
 
         private
 
         def type_to_values
-          {:airplane_mode => 1, :wifi => 2, :data => 4, :all => 6, :none => 0}
+          {airplane_mode: 1, wifi: 2, data: 4, all: 6, none: 0}
         end
 
         def values_to_type
@@ -52,7 +52,6 @@ module Selenium
         def valid_type?(type)
           type_to_values.keys.include? type
         end
-
       end # HasNetworkConnection
     end # DriverExtensions
   end # WebDriver

data/lib/selenium/webdriver/common/driver_extensions/has_remote_status.rb

@@ -21,11 +21,9 @@ module Selenium
   module WebDriver
     module DriverExtensions
       module HasRemoteStatus
-
         def remote_status
           @bridge.status
         end
-
       end # HasRemoteStatus
     end # DriverExtensions
   end # WebDriver

data/lib/selenium/webdriver/common/driver_extensions/has_session_id.rb

@@ -19,14 +19,12 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     #
 
     module DriverExtensions
       module HasSessionId
-
         #
         # @return [String] the session id
         # @api public

data/lib/selenium/webdriver/common/driver_extensions/has_touch_screen.rb

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     module DriverExtensions
-
       module HasTouchScreen
         def touch
           TouchActionBuilder.new mouse, keyboard, touch_screen
@@ -31,7 +30,6 @@ module Selenium
         def touch_screen
           TouchScreen.new @bridge
         end
-
       end # HasTouchScreen
     end # DriverExtensions
   end # WebDriver

data/lib/selenium/webdriver/common/driver_extensions/has_web_storage.rb

@@ -19,14 +19,12 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     #
 
     module DriverExtensions
       module HasWebStorage
-
         def local_storage
           HTML5::LocalStorage.new @bridge
         end
@@ -34,7 +32,6 @@ module Selenium
         def session_storage
           HTML5::SessionStorage.new @bridge
         end
-
       end # HasWebStorage
     end # DriverExtensions
   end # WebDriver

data/lib/selenium/webdriver/common/driver_extensions/rotatable.rb

@@ -19,15 +19,13 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     #
 
     module DriverExtensions
       module Rotatable
-
-        ORIENTATIONS = [:landscape, :portrait]
+        ORIENTATIONS = [:landscape, :portrait].freeze
 
         #
         # Change the screen orientation
@@ -42,7 +40,7 @@ module Selenium
             raise ArgumentError, "expected #{ORIENTATIONS.inspect}, got #{orientation.inspect}"
           end
 
-          bridge.setScreenOrientation(orientation.to_s.upcase)
+          bridge.screen_orientation = orientation.to_s.upcase
         end
         alias_method :rotate, :rotation=
 
@@ -55,9 +53,8 @@ module Selenium
         #
 
         def orientation
-          bridge.getScreenOrientation.to_sym.downcase
+          bridge.screen_orientation.to_sym.downcase
         end
-
       end # Rotatable
     end # DriverExtensions
   end # WebDriver

data/lib/selenium/webdriver/common/driver_extensions/takes_screenshot.rb

@@ -19,14 +19,12 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     #
 
     module DriverExtensions
       module TakesScreenshot
-
         #
         # Save a PNG screenshot to the given path
         #
@@ -48,14 +46,13 @@ module Selenium
         def screenshot_as(format)
           case format
           when :base64
-            bridge.getScreenshot
+            bridge.screenshot
           when :png
-            bridge.getScreenshot.unpack("m")[0]
+            bridge.screenshot.unpack('m')[0]
           else
             raise Error::UnsupportedOperationError, "unsupported format: #{format.inspect}"
           end
         end
-
       end # TakesScreenshot
     end # DriverExtensions
   end # WebDriver

data/lib/selenium/webdriver/common/driver_extensions/uploads_files.rb

@@ -19,14 +19,12 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     #
 
     module DriverExtensions
       module UploadsFiles
-
         #
         # Set the file detector to pass local files to a remote WebDriver.
         #
@@ -52,13 +50,12 @@ module Selenium
         #
 
         def file_detector=(detector)
-          unless detector.nil? or detector.respond_to? :call
-            raise ArgumentError, "detector must respond to #call"
+          unless detector.nil? || detector.respond_to?(:call)
+            raise ArgumentError, 'detector must respond to #call'
           end
 
           bridge.file_detector = detector
         end
-
       end # UploadsFiles
     end # DriverExtensions
   end # WebDriver

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

@@ -29,15 +29,16 @@ module Selenium
       #
 
       def initialize(bridge, id)
-        @bridge, @id = bridge, id
+        @bridge = bridge
+        @id = id
       end
 
       def inspect
-        '#<%s:0x%x id=%s>' % [self.class, hash*2, @id.inspect]
+        format '#<%s:0x%x id=%s>', self.class, hash * 2, @id.inspect
       end
 
       def ==(other)
-        other.kind_of?(self.class) && ref == other.ref
+        other.is_a?(self.class) && ref == other.ref
       end
       alias_method :eql?, :==
 
@@ -63,14 +64,14 @@ module Selenium
       #
       # @example Click on a button
       #
-      #    driver.find_element(:tag_name, "button").click
+      #    driver.find_element(tag_name: "button").click
       #
       # @raise [StaleElementReferenceError] if the element no longer exists as
       #  defined
       #
 
       def click
-        bridge.clickElement @id
+        bridge.click_element @id
       end
 
       #
@@ -78,13 +79,13 @@ module Selenium
       #
       # @example Get the tagname of an INPUT element(returns "input")
       #
-      #    driver.find_element(:xpath, "//input").tag_name
+      #    driver.find_element(xpath: "//input").tag_name
       #
       # @return [String] The tag name of this element.
       #
 
       def tag_name
-        bridge.getElementTagName @id
+        bridge.element_tag_name @id
       end
 
       #
@@ -114,7 +115,7 @@ module Selenium
       #
 
       def attribute(name)
-        bridge.getElementAttribute @id, name
+        bridge.element_attribute @id, name
       end
 
       #
@@ -124,7 +125,7 @@ module Selenium
       #
 
       def text
-        bridge.getElementText @id
+        bridge.element_text @id
       end
 
       #
@@ -142,7 +143,7 @@ module Selenium
       #
 
       def send_keys(*args)
-        bridge.sendKeysToElement @id, Keys.encode(args)
+        bridge.send_keys_to_element @id, Keys.encode(args)
       end
       alias_method :send_key, :send_keys
 
@@ -157,7 +158,7 @@ module Selenium
       #
 
       def clear
-        bridge.clearElement @id
+        bridge.clear_element @id
       end
 
       #
@@ -167,7 +168,7 @@ module Selenium
       #
 
       def enabled?
-        bridge.isElementEnabled @id
+        bridge.element_enabled? @id
       end
 
       #
@@ -177,7 +178,7 @@ module Selenium
       #
 
       def selected?
-        bridge.isElementSelected @id
+        bridge.element_selected? @id
       end
 
       #
@@ -187,7 +188,7 @@ module Selenium
       #
 
       def displayed?
-        bridge.isElementDisplayed @id
+        bridge.element_displayed? @id
       end
 
       #
@@ -195,7 +196,7 @@ module Selenium
       #
 
       def submit
-        bridge.submitElement @id
+        bridge.submit_element @id
       end
 
       #
@@ -210,7 +211,7 @@ module Selenium
       #
 
       def css_value(prop)
-        bridge.getElementValueOfCssProperty @id, prop
+        bridge.element_value_of_css_property @id, prop
       end
       alias_method :style, :css_value
 
@@ -221,7 +222,7 @@ module Selenium
       #
 
       def location
-        bridge.getElementLocation @id
+        bridge.element_location @id
       end
 
       #
@@ -231,7 +232,7 @@ module Selenium
       #
 
       def location_once_scrolled_into_view
-        bridge.getElementLocationOnceScrolledIntoView @id
+        bridge.element_location_once_scrolled_into_view @id
       end
 
       #
@@ -241,19 +242,19 @@ module Selenium
       #
 
       def size
-        bridge.getElementSize @id
+        bridge.element_size @id
       end
 
       #-------------------------------- sugar  --------------------------------
 
       #
-      #   element.first(:id, 'foo')
+      #   element.first(id: 'foo')
       #
 
       alias_method :first, :find_element
 
       #
-      #   element.all(:class, 'bar')
+      #   element.all(class: 'bar')
       #
 
       alias_method :all, :find_elements
@@ -280,7 +281,7 @@ module Selenium
       # @api private
       #
 
-      def to_json(*args)
+      def to_json(*)
         JSON.generate as_json
       end
 
@@ -290,26 +291,23 @@ module Selenium
       # @api private
       #
 
-      def as_json(opts = nil)
+      def as_json(*)
         {
           :ELEMENT => @id,
-          "element-6066-11e4-a52e-4f735466cecf" => @id
+          'element-6066-11e4-a52e-4f735466cecf' => @id
         }
       end
 
       private
 
-      def bridge
-        @bridge
-      end
+      attr_reader :bridge
 
       def selectable?
         tn = tag_name.downcase
         type = attribute(:type).to_s.downcase
 
-        tn == "option" || (tn == "input" && %w[radio checkbox].include?(type))
+        tn == 'option' || (tn == 'input' && %w[radio checkbox].include?(type))
       end
-
     end # Element
   end # WebDriver
 end # Selenium