selenium-webdriver 2.53.4 → 3.8.0

data/lib/selenium/webdriver/common/keyboard.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,19 +17,17 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     # @see ActionBuilder
 
     class Keyboard
-
       def initialize(bridge)
         @bridge = bridge
       end
 
       def send_keys(*keys)
-        @bridge.sendKeysToActiveElement Keys.encode(keys)
+        @bridge.send_keys_to_active_element Keys.encode(keys)
       end
 
       #
@@ -43,7 +39,7 @@ module Selenium
       def press(key)
         assert_modifier key
 
-        @bridge.sendKeysToActiveElement Keys.encode([key])
+        @bridge.send_keys_to_active_element Keys.encode([key])
       end
 
       #
@@ -55,20 +51,17 @@ module Selenium
       def release(key)
         assert_modifier key
 
-        @bridge.sendKeysToActiveElement Keys.encode([key])
+        @bridge.send_keys_to_active_element Keys.encode([key])
       end
 
       private
 
-      MODIFIERS = [:control, :shift, :alt, :command, :meta]
+      MODIFIERS = [:control, :shift, :alt, :command, :meta].freeze
 
       def assert_modifier(key)
-        unless MODIFIERS.include? key
-          raise ArgumentError,
-            "#{key.inspect} is not a modifier key, expected one of #{MODIFIERS.inspect}"
-        end
+        return if MODIFIERS.include? key
+        raise ArgumentError, "#{key.inspect} is not a modifier key, expected one of #{MODIFIERS.inspect}"
       end
-
     end # Keyboard
   end # WebDriver
-end  # Selenium
+end # Selenium

data/lib/selenium/webdriver/common/keys.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,85 +18,99 @@
 module Selenium
   module WebDriver
     module Keys
-
       #
       # @see Element#send_keys
-      # @see http://www.google.com.au/search?&q=unicode+pua&btnG=Search
+      # @see http://www.google.com.au/search?&q=unicode+pua&btnK=Search
       #
 
       KEYS = {
-      # \x works on both 1.8.6/1.9
-        :null         => "\xEE\x80\x80",
-        :cancel       => "\xEE\x80\x81",
-        :help         => "\xEE\x80\x82",
-        :backspace    => "\xEE\x80\x83",
-        :tab          => "\xEE\x80\x84",
-        :clear        => "\xEE\x80\x85",
-        :return       => "\xEE\x80\x86",
-        :enter        => "\xEE\x80\x87",
-        :shift        => "\xEE\x80\x88",
-        :left_shift   => "\xEE\x80\x88",
-        :control      => "\xEE\x80\x89",
-        :left_control => "\xEE\x80\x89",
-        :alt          => "\xEE\x80\x8A",
-        :left_alt     => "\xEE\x80\x8A",
-        :pause        => "\xEE\x80\x8B",
-        :escape       => "\xEE\x80\x8C",
-        :space        => "\xEE\x80\x8D",
-        :page_up      => "\xEE\x80\x8E",
-        :page_down    => "\xEE\x80\x8F",
-        :end          => "\xEE\x80\x90",
-        :home         => "\xEE\x80\x91",
-        :left         => "\xEE\x80\x92",
-        :arrow_left   => "\xEE\x80\x92",
-        :up           => "\xEE\x80\x93",
-        :arrow_up     => "\xEE\x80\x93",
-        :right        => "\xEE\x80\x94",
-        :arrow_right  => "\xEE\x80\x94",
-        :down         => "\xEE\x80\x95",
-        :arrow_down   => "\xEE\x80\x95",
-        :insert       => "\xEE\x80\x96",
-        :delete       => "\xEE\x80\x97",
-        :semicolon    => "\xEE\x80\x98",
-        :equals       => "\xEE\x80\x99",
-        :numpad0      => "\xEE\x80\x9A",
-        :numpad1      => "\xEE\x80\x9B",
-        :numpad2      => "\xEE\x80\x9C",
-        :numpad3      => "\xEE\x80\x9D",
-        :numpad4      => "\xEE\x80\x9E",
-        :numpad5      => "\xEE\x80\x9F",
-        :numpad6      => "\xEE\x80\xA0",
-        :numpad7      => "\xEE\x80\xA1",
-        :numpad8      => "\xEE\x80\xA2",
-        :numpad9      => "\xEE\x80\xA3",
-        :multiply     => "\xEE\x80\xA4",
-        :add          => "\xEE\x80\xA5",
-        :separator    => "\xEE\x80\xA6",
-        :subtract     => "\xEE\x80\xA7",
-        :decimal      => "\xEE\x80\xA8",
-        :divide       => "\xEE\x80\xA9",
-        :f1           => "\xEE\x80\xB1",
-        :f2           => "\xEE\x80\xB2",
-        :f3           => "\xEE\x80\xB3",
-        :f4           => "\xEE\x80\xB4",
-        :f5           => "\xEE\x80\xB5",
-        :f6           => "\xEE\x80\xB6",
-        :f7           => "\xEE\x80\xB7",
-        :f8           => "\xEE\x80\xB8",
-        :f9           => "\xEE\x80\xB9",
-        :f10          => "\xEE\x80\xBA",
-        :f11          => "\xEE\x80\xBB",
-        :f12          => "\xEE\x80\xBC",
-        :meta         => "\xEE\x80\xBD",
-        :command      => "\xEE\x80\xBD" # alias
-      }
+        null: "\ue000",
+        cancel: "\ue001",
+        help: "\ue002",
+        backspace: "\ue003",
+        tab: "\ue004",
+        clear: "\ue005",
+        return: "\ue006",
+        enter: "\ue007",
+        shift: "\ue008",
+        left_shift: "\ue008",
+        control: "\ue009",
+        left_control: "\ue009",
+        alt: "\ue00A",
+        left_alt: "\ue00A",
+        pause: "\ue00B",
+        escape: "\ue00C",
+        space: "\ue00D",
+        page_up: "\ue00E",
+        page_down: "\ue00F",
+        end: "\ue010",
+        home: "\ue011",
+        left: "\ue012",
+        arrow_left: "\ue012",
+        up: "\ue013",
+        arrow_up: "\ue013",
+        right: "\ue014",
+        arrow_right: "\ue014",
+        down: "\ue015",
+        arrow_down: "\ue015",
+        insert: "\ue016",
+        delete: "\ue017",
+        semicolon: "\ue018",
+        equals: "\ue019",
+        numpad0: "\ue01A",
+        numpad1: "\ue01B",
+        numpad2: "\ue01C",
+        numpad3: "\ue01D",
+        numpad4: "\ue01E",
+        numpad5: "\ue01F",
+        numpad6: "\ue020",
+        numpad7: "\ue021",
+        numpad8: "\ue022",
+        numpad9: "\ue023",
+        multiply: "\ue024",
+        add: "\ue025",
+        separator: "\ue026",
+        subtract: "\ue027",
+        decimal: "\ue028",
+        divide: "\ue029",
+        f1: "\ue031",
+        f2: "\ue032",
+        f3: "\ue033",
+        f4: "\ue034",
+        f5: "\ue035",
+        f6: "\ue036",
+        f7: "\ue037",
+        f8: "\ue038",
+        f9: "\ue039",
+        f10: "\ue03A",
+        f11: "\ue03B",
+        f12: "\ue03C",
+        meta: "\ue03D",
+        command: "\ue03D", # alias
+        left_meta: "\ue03D", # alias
+        right_shift: "\ue050",
+        right_control: "\ue051",
+        right_alt: "\ue052",
+        right_meta: "\ue053",
+        numpad_page_up: "\ue054",
+        numpad_page_down: "\ue055",
+        numpad_end: "\ue056",
+        numpad_home: "\ue057",
+        numpad_left: "\ue058",
+        numpad_up: "\ue059",
+        numpad_right: "\ue05A",
+        numpad_down: "\ue05B",
+        numpad_insert: "\ue05C",
+        numpad_delete: "\ue05D"
+      }.freeze
 
       #
       # @api private
       #
 
       def self.[](key)
-        KEYS[key] or raise Error::UnsupportedOperationError, "no such key #{key.inspect}"
+        return KEYS[key] if KEYS[key]
+        raise Error::UnsupportedOperationError, "no such key #{key.inspect}"
       end
 
       #
@@ -106,21 +118,26 @@ module Selenium
       #
 
       def self.encode(keys)
-        keys.map do |arg|
-          case arg
-          when Symbol
-            Keys[arg]
-          when Array
-            arg = arg.map { |e| e.kind_of?(Symbol) ? Keys[e] : e }.join
-            arg << Keys[:null]
+        keys.map { |key| encode_key(key) }
+      end
 
-            arg
-          else
-            arg.to_s
-          end
+      #
+      # @api private
+      #
+
+      def self.encode_key(key)
+        case key
+        when Symbol
+          Keys[key]
+        when Array
+          key = key.map { |e| e.is_a?(Symbol) ? Keys[e] : e }.join
+          key << Keys[:null]
+
+          key
+        else
+          key.to_s
         end
       end
-
     end # Keys
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/log_entry.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
@@ -23,12 +21,12 @@ module Selenium
       attr_reader :level, :timestamp, :message
 
       def initialize(level, timestamp, message)
-        @level      = level
+        @level = level
         @timestamp = timestamp
-        @message    = message
+        @message = message
       end
 
-      def as_json(opts = nil)
+      def as_json(*)
         {
           'level'     => level,
           'timestamp' => timestamp,
@@ -43,7 +41,6 @@ module Selenium
       def time
         Time.at timestamp / 1000
       end
-
     end # LogEntry
   end # WebDriver
 end # Selenium

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

@@ -0,0 +1,140 @@
+# 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
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'forwardable'
+require 'logger'
+
+module Selenium
+  module WebDriver
+    #
+    # @example Enable full logging
+    #   Selenium::WebDriver.logger.level = :debug
+    #
+    # @example Log to file
+    #   Selenium::WebDriver.logger.output = 'selenium.log'
+    #
+    # @example Use logger manually
+    #   Selenium::WebDriver.logger.info('This is info message')
+    #   Selenium::WebDriver.logger.warn('This is warning message')
+    #
+    class Logger
+      extend Forwardable
+      include ::Logger::Severity
+
+      def_delegators :@logger, :debug, :debug?,
+                     :info, :info?,
+                     :warn, :warn?,
+                     :error, :error?,
+                     :fatal, :fatal?,
+                     :level
+
+      def initialize
+        @logger = create_logger($stdout)
+      end
+
+      def output=(io)
+        # `Logger#reopen` was added in Ruby 2.3
+        if @logger.respond_to?(:reopen)
+          @logger.reopen(io)
+        else
+          @logger = create_logger(io)
+        end
+      end
+
+      #
+      # For Ruby < 2.3 compatibility
+      # Based on https://github.com/ruby/ruby/blob/ruby_2_3/lib/logger.rb#L250
+      #
+
+      def level=(severity)
+        if severity.is_a?(Integer)
+          @logger.level = severity
+        else
+          case severity.to_s.downcase
+          when 'debug'.freeze
+            @logger.level = DEBUG
+          when 'info'.freeze
+            @logger.level = INFO
+          when 'warn'.freeze
+            @logger.level = WARN
+          when 'error'.freeze
+            @logger.level = ERROR
+          when 'fatal'.freeze
+            @logger.level = FATAL
+          when 'unknown'.freeze
+            @logger.level = UNKNOWN
+          else
+            raise ArgumentError, "invalid log level: #{severity}"
+          end
+        end
+      end
+
+      #
+      # Returns IO object used by logger internally.
+      #
+      # Normally, we would have never needed it, but we want to
+      # use it as IO object for all child processes to ensure their
+      # output is redirected there.
+      #
+      # It is only used in debug level, in other cases output is suppressed.
+      #
+      # @api private
+      #
+      def io
+        @logger.instance_variable_get(:@logdev).instance_variable_get(:@dev)
+      end
+
+      #
+      # Marks code as deprecated with/without replacement.
+      #
+      # @param [String] old
+      # @param [String, nil] new
+      #
+      def deprecate(old, new = nil)
+        message = "[DEPRECATION] #{old} is deprecated"
+        message << if new
+                     ". Use #{new} instead."
+                   else
+                     ' and will be removed in the next releases.'
+                   end
+
+        warn message
+      end
+
+      private
+
+      def create_logger(output)
+        logger = ::Logger.new(output)
+        logger.progname = 'Selenium'
+        logger.level = default_level
+        logger.formatter = proc do |severity, time, progname, msg|
+          "#{time.strftime('%F %T')} #{severity} #{progname} #{msg}\n"
+        end
+
+        logger
+      end
+
+      def default_level
+        if $DEBUG || ENV.key?('DEBUG')
+          DEBUG
+        else
+          WARN
+        end
+      end
+    end # Logger
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/common/logs.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,7 +18,6 @@
 module Selenium
   module WebDriver
     class Logs
-
       #
       # @api private
       #
@@ -30,13 +27,12 @@ module Selenium
       end
 
       def get(type)
-        @bridge.getLog type
+        @bridge.log type
       end
 
       def available_types
-        @bridge.getAvailableLogTypes
+        @bridge.available_log_types
       end
-
     end # Logs
   end # WebDriver
 end # Selenium