selenium-webdriver 2.53.4 → 3.8.0

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-#
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -20,36 +18,28 @@
 module Selenium
   module WebDriver
     class Alert
-
       def initialize(bridge)
         @bridge = bridge
 
         # fail fast if the alert doesn't exist
-        bridge.getAlertText
+        bridge.alert_text
       end
 
       def accept
-        @bridge.acceptAlert
+        @bridge.accept_alert
       end
 
       def dismiss
-        @bridge.dismissAlert
+        @bridge.dismiss_alert
       end
 
       def send_keys(keys)
-        @bridge.setAlertValue keys
+        @bridge.alert = keys
       end
 
       def text
-        @bridge.getAlertText
-      end
-      
-      def authenticate(username, password)
-        @bridge.setAuthentication username: username, password: password
-        accept
+        @bridge.alert_text
       end
-
     end # Alert
   end # WebDriver
 end # Selenium
-

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-#
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -19,7 +17,6 @@
 
 module Selenium
   module WebDriver
-
     #
     # Shared across bridges
     #
@@ -27,24 +24,21 @@ module Selenium
     #
 
     module BridgeHelper
-
       def unwrap_script_result(arg)
         case arg
         when Array
           arg.map { |e| unwrap_script_result(e) }
         when Hash
-          if id = element_id_from(arg)
-            Element.new self, id
-          else
-            arg.each { |k, v| arg[k] = unwrap_script_result(v) }
-          end
+          element_id = element_id_from(arg)
+          return Element.new(self, element_id) if element_id
+          arg.each { |k, v| arg[k] = unwrap_script_result(v) }
         else
           arg
         end
       end
 
       def element_id_from(id)
-        id['ELEMENT'] or id['element-6066-11e4-a52e-4f735466cecf']
+        id['ELEMENT'] || id['element-6066-11e4-a52e-4f735466cecf']
       end
 
       def parse_cookie_string(str)
@@ -57,22 +51,22 @@ module Selenium
           'secure'  => false
         }
 
-        str.split(";").each do |attribute|
-          if attribute.include? "="
-            key, value = attribute.strip.split("=", 2)
+        str.split(';').each do |attribute|
+          if attribute.include? '='
+            key, value = attribute.strip.split('=', 2)
             if result['name'].empty?
               result['name']  = key
               result['value'] = value
             elsif key == 'domain' && value.strip =~ /^\.(.+)/
-              result['domain'] = $1
+              result['domain'] = Regexp.last_match(1)
             elsif key && value
               result[key] = value
             end
-          elsif attribute == "secure"
+          elsif attribute == 'secure'
             result['secure'] = true
           end
 
-          unless [nil, "", "0"].include?(result['expires'])
+          unless [nil, '', '0'].include?(result['expires'])
             # firefox stores expiry as number of seconds
             result['expires'] = Time.at(result['expires'].to_i)
           end
@@ -80,7 +74,6 @@ module Selenium
 
         result
       end
-
     end # BridgeHelper
   end # WebDriver
 end # Selenium

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-#
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -19,7 +17,6 @@
 
 module Selenium
   module WebDriver
-
     #
     # The main class through which you control the browser.
     #
@@ -33,7 +30,6 @@ module Selenium
       include SearchContext
 
       class << self
-
         #
         # @api private
         #
@@ -43,42 +39,24 @@ module Selenium
         #
 
         def for(browser, opts = {})
-          listener = opts.delete(:listener)
-
-          bridge = case browser
-                   when :firefox, :ff, :marionette
-                     if Remote::W3CCapabilities.w3c?(opts)
-                       Firefox::W3CBridge.new(opts)
-                     else
-                       Firefox::Bridge.new(opts)
-                     end
-                   when :remote
-                     if Remote::W3CCapabilities.w3c?(opts)
-                       Remote::W3CBridge.new(opts)
-                     else
-                       Remote::Bridge.new(opts)
-                     end
-                   when :ie, :internet_explorer
-                     IE::Bridge.new(opts)
-                   when :chrome
-                     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)
-                   else
-                     raise ArgumentError, "unknown driver: #{browser.inspect}"
-                   end
-
-          bridge = Support::EventFiringBridge.new(bridge, listener) if listener
-
-          new(bridge)
+          case browser
+          when :chrome
+            Chrome::Driver.new(opts)
+          when :internet_explorer, :ie
+            IE::Driver.new(opts)
+          when :safari
+            Safari::Driver.new(opts)
+          when :phantomjs
+            PhantomJS::Driver.new(opts)
+          when :firefox, :ff
+            Firefox::Driver.new(opts)
+          when :edge
+            Edge::Driver.new(opts)
+          when :remote
+            Remote::Driver.new(opts)
+          else
+            raise ArgumentError, "unknown driver: #{browser.inspect}"
+          end
         end
       end
 
@@ -89,17 +67,13 @@ module Selenium
       # @api private
       #
 
-      def initialize(bridge)
+      def initialize(bridge, listener: nil)
         @bridge = bridge
-
-        # TODO: refactor this away
-        unless bridge.driver_extensions.empty?
-          extend(*bridge.driver_extensions)
-        end
+        @bridge = Support::EventFiringBridge.new(bridge, listener) if listener
       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
 
       #
@@ -126,7 +100,24 @@ module Selenium
       #
 
       def manage
-        @manage ||= WebDriver::Options.new(bridge)
+        bridge.options
+      end
+
+      #
+      # @return [ActionBuilder, W3CActionBuilder]
+      # @see ActionBuilder, W3CActionBuilder
+      #
+
+      def action
+        bridge.action
+      end
+
+      def mouse
+        bridge.mouse
+      end
+
+      def keyboard
+        bridge.keyboard
       end
 
       #
@@ -144,7 +135,7 @@ module Selenium
       #
 
       def current_url
-        bridge.getCurrentUrl
+        bridge.url
       end
 
       #
@@ -154,7 +145,7 @@ module Selenium
       #
 
       def title
-        bridge.getTitle
+        bridge.title
       end
 
       #
@@ -164,7 +155,7 @@ module Selenium
       #
 
       def page_source
-        bridge.getPageSource
+        bridge.page_source
       end
 
       #
@@ -191,7 +182,7 @@ module Selenium
       #
 
       def window_handles
-        bridge.getWindowHandles
+        bridge.window_handles
       end
 
       #
@@ -201,7 +192,7 @@ module Selenium
       #
 
       def window_handle
-        bridge.getCurrentWindowHandle
+        bridge.window_handle
       end
 
       #
@@ -209,7 +200,7 @@ module Selenium
       #
       # @param [String] script
       #   JavaScript source to execute
-      # @param [WebDriver::Element,Integer, Float, Boolean, NilClass, String, Array] *args
+      # @param [WebDriver::Element, Integer, Float, Boolean, NilClass, String, Array] args
       #   Arguments will be available in the given script in the 'arguments' pseudo-array.
       #
       # @return [WebDriver::Element,Integer,Float,Boolean,NilClass,String,Array]
@@ -217,7 +208,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
@@ -229,27 +220,26 @@ module Selenium
       #
       # @param [String] script
       #   JavaScript source to execute
-      # @param [WebDriver::Element,Integer, Float, Boolean, NilClass, String, Array] *args
+      # @param [WebDriver::Element,Integer, Float, Boolean, NilClass, String, Array] args
       #   Arguments to the script. May be empty.
       #
       # @return [WebDriver::Element,Integer,Float,Boolean,NilClass,String,Array]
       #
 
       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
@@ -263,7 +253,7 @@ module Selenium
       # Get the first element matching the given selector. If given a
       # String or Symbol, it will be used as the id of the element.
       #
-      # @param  [String,Hash] id or selector
+      # @param  [String,Hash] sel id or selector
       # @return [WebDriver::Element]
       #
       # Examples:
@@ -273,9 +263,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 +287,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 → has_addons.rb}

@@ -1,5 +1,3 @@
-# encoding: utf-8
-#
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -19,40 +17,32 @@
 
 module Selenium
   module WebDriver
-
-    #
-    # @api private
-    #
-
     module DriverExtensions
-      module HasInputDevices
+      module HasAddons
 
         #
-        # @return [ActionBuilder]
-        # @api public
-        #
-
-        def action
-          ActionBuilder.new mouse, keyboard
-        end
-
+        # Installs addon.
         #
-        # @api private
+        # @param [String] path Full path to addon file
+        # @param [Boolean] temporary
+        # @return [String] identifier of installed addon
         #
 
-        def mouse
-          Mouse.new @bridge
+        def install_addon(path, temporary = nil)
+          @bridge.install_addon(path, temporary)
         end
 
         #
-        # @api private
+        # Uninstalls addon.
+        #
+        # @param [String] id Identifier of installed addon
         #
 
-        def keyboard
-          Keyboard.new @bridge
+        def uninstall_addon(id)
+          @bridge.uninstall_addon(id)
         end
 
-      end # HasInputDevices
+      end # HasAddons
     end # DriverExtensions
   end # WebDriver
 end # Selenium

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

@@ -1,5 +1,3 @@
-# encoding: utf-8
-#
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -20,25 +18,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