selenium-webdriver 2.53.4 → 3.0.0.beta1

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

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     module Error
-
       class WebDriverError < StandardError; end
       class UnsupportedOperationError < WebDriverError; end
 
@@ -36,7 +35,7 @@ module Selenium
       # parameters.
       #
 
-      class NoSuchElementError < WebDriverError; end             # 7
+      class NoSuchElementError < WebDriverError; end # 7
 
       #
       # A request to switch to a frame could not be satisfied because the
@@ -46,27 +45,26 @@ module Selenium
       class NoSuchFrameError < WebDriverError; end               # 8
       class UnknownCommandError < WebDriverError; end            # 9
 
-
       #
       # Indicates that a reference to an element is now "stale" - the element
       # no longer appears in the DOM of the page.
       #
 
-      class StaleElementReferenceError < WebDriverError; end     # 10
+      class StaleElementReferenceError < WebDriverError; end # 10
 
       #
       # Raised to indicate that although an element is present on the DOM,
       # it is not visible, and so is not able to be interacted with.
       #
 
-      class ElementNotVisibleError < WebDriverError; end         # 11
+      class ElementNotVisibleError < WebDriverError; end # 11
 
       #
       # Raised when an interaction could not be performed because the element
       # is in an invalid state (e.g. attempting to click a disabled element).
       #
 
-      class InvalidElementStateError < WebDriverError; end       # 12
+      class InvalidElementStateError < WebDriverError; end # 12
 
       #
       # An unknown server-side error occurred while processing the command.
@@ -109,30 +107,30 @@ module Selenium
       # the current URL.
       #
 
-      class InvalidCookieDomainError < WebDriverError; end       # 24
+      class InvalidCookieDomainError < WebDriverError; end # 24
 
       #
       # Raised when a driver fails to set a cookie.
       #
 
-      class UnableToSetCookieError < WebDriverError; end         # 25
+      class UnableToSetCookieError < WebDriverError; end # 25
 
       #
       # Raised when an alert dialog is present that has not been dealt with.
       #
-      class UnhandledAlertError < WebDriverError; end            # 26
+      class UnhandledAlertError < WebDriverError; end # 26
 
       #
       # Indicates that a user has tried to access an alert when one is not present.
       #
 
-      class NoAlertPresentError < WebDriverError; end            # 27
+      class NoAlertPresentError < WebDriverError; end # 27
 
       #
       # A script did not complete before its timeout expired.
       #
 
-      class ScriptTimeOutError < WebDriverError; end             # 28
+      class ScriptTimeOutError < WebDriverError; end # 28
 
       #
       # The coordinates provided to an interactions operation are invalid.
@@ -146,7 +144,7 @@ module Selenium
       # the machine.
       #
 
-      class IMENotAvailableError < WebDriverError; end           # 30
+      class IMENotAvailableError < WebDriverError; end # 30
 
       #
       # Indicates that activating an IME engine has failed.
@@ -158,23 +156,23 @@ module Selenium
       # Argument was an invalid selector (e.g. XPath/CSS).
       #
 
-      class InvalidSelectorError < WebDriverError; end           # 32
+      class InvalidSelectorError < WebDriverError; end # 32
 
       #
       # A new session could not be created.
       #
 
-      class SessionNotCreatedError < WebDriverError; end         # 33
+      class SessionNotCreatedError < WebDriverError; end # 33
 
       #
       # Indicates that the target provided to the actions #move method is
       # invalid, e.g. outside of the bounds of the window.
       #
 
-      class MoveTargetOutOfBoundsError < WebDriverError; end     # 34
+      class MoveTargetOutOfBoundsError < WebDriverError; end # 34
 
       # @api private
-      Errors = [
+      ERRORS = [
         IndexOutOfBoundsError,          # 1
         NoCollectionError,              # 2
         NoStringError,                  # 3
@@ -209,20 +207,19 @@ module Selenium
         InvalidSelectorError,           # 32
         SessionNotCreatedError,         # 33
         MoveTargetOutOfBoundsError      # 34
-      ]
+      ].freeze
 
       class << self
         def for_code(code)
           return if [nil, 0].include? code
-          return Errors[code - 1] if code.is_a? Fixnum
+          return ERRORS[code - 1] if code.is_a? Fixnum
 
           klass_name = code.split(' ').map(&:capitalize).join
-          Error.const_get("#{klass_name.gsub('Error','')}Error")
+          Error.const_get("#{klass_name.gsub('Error', '')}Error")
         rescue NameError
           WebDriverError
         end
       end
-
     end # Error
   end # WebDriver
 end # Selenium

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

@@ -19,21 +19,16 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api private
     #
 
     module FileReaper
-
       class << self
-        def reap=(bool)
-          @reap = bool
-        end
+        attr_writer :reap
 
         def reap?
-          @reap = true unless defined?(@reap)
-          !!@reap
+          @reap = defined?(@reap) ? @reap : true
         end
 
         def tmp_files
@@ -67,7 +62,6 @@ module Selenium
 
       # we *do* want child process reaping, so not using Platform.exit_hook here.
       at_exit { reap! }
-
     end # FileReaper
   end # WebDriver
-end # Selenium
+end # Selenium

data/lib/selenium/webdriver/common/html5/local_storage.rb

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     module HTML5
-
       class LocalStorage
         include SharedWebStorage
 
@@ -32,29 +31,28 @@ module Selenium
         end
 
         def [](key)
-          @bridge.getLocalStorageItem key
+          @bridge.local_storage_item key
         end
 
         def []=(key, value)
-          @bridge.setLocalStorageItem key, value
+          @bridge.local_storage_item key, value
         end
 
         def delete(key)
-          @bridge.removeLocalStorageItem key
+          @bridge.remove_local_storage_item key
         end
 
         def clear
-          @bridge.clearLocalStorage
+          @bridge.clear_local_storage
         end
 
         def size
-          @bridge.getLocalStorageSize
+          @bridge.local_storage_size
         end
 
         def keys
-          @bridge.getLocalStorageKeys.reverse
+          @bridge.local_storage_keys.reverse
         end
-
       end # LocalStorage
     end # HTML5
   end # WebDriver

data/lib/selenium/webdriver/common/html5/session_storage.rb

@@ -20,33 +20,32 @@
 module Selenium
   module WebDriver
     module HTML5
-
       class SessionStorage
         include Enumerable
         include SharedWebStorage
 
         def [](key)
-          @bridge.getSessionStorageItem key
+          @bridge.session_storage_item key
         end
 
         def []=(key, value)
-          @bridge.setSessionStorageItem key, value
+          @bridge.session_storage_item key, value
         end
 
         def delete(key)
-          @bridge.removeSessionStorageItem key
+          @bridge.remove_session_storage_item key
         end
 
         def clear
-          @bridge.clearSessionStorage
+          @bridge.clear_session_storage
         end
 
         def size
-          @bridge.getSessionStorageSize
+          @bridge.session_storage_size
         end
 
         def keys
-          @bridge.getSessionStorageKeys.reverse
+          @bridge.session_storage_keys.reverse
         end
 
         #
@@ -56,7 +55,6 @@ module Selenium
         def initialize(bridge)
           @bridge = bridge
         end
-
       end # SessionStorage
     end # HTML5
   end # WebDriver

data/lib/selenium/webdriver/common/html5/shared_web_storage.rb

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     module HTML5
-
       module SharedWebStorage
         include Enumerable
 
@@ -30,31 +29,23 @@ module Selenium
         alias_method :member?, :key?
         alias_method :has_key?, :key?
 
-        def fetch(key, &blk)
-          if self.key? key
-            return self[key]
-          end
-
-          if block_given?
-            yield key
-          else
-            # should be KeyError, but it's 1.9-specific
-            raise IndexError, "missing key #{key.inspect}"
-          end
+        def fetch(key)
+          return self[key] if key? key
+          return yield(key) if block_given?
+          raise KeyError, "missing key #{key.inspect}"
         end
 
         def empty?
-          size == 0
+          to_a.empty?
         end
 
-        def each(&blk)
+        def each
           return enum_for(:each) unless block_given?
 
           keys.each do |k|
             yield k, self[k]
           end
         end
-
       end # SharedWebStorage
     end # HTML5
   end # WebDriver

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

@@ -19,19 +19,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 +41,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 +53,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

@@ -20,85 +20,84 @@
 module Selenium
   module WebDriver
     module Keys
-
       #
       # @see Element#send_keys
       # @see http://www.google.com.au/search?&q=unicode+pua&btnG=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
+      }.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
 
       #
@@ -111,7 +110,7 @@ module Selenium
           when Symbol
             Keys[arg]
           when Array
-            arg = arg.map { |e| e.kind_of?(Symbol) ? Keys[e] : e }.join
+            arg = arg.map { |e| e.is_a?(Symbol) ? Keys[e] : e }.join
             arg << Keys[:null]
 
             arg
@@ -120,7 +119,6 @@ module Selenium
           end
         end
       end
-
     end # Keys
   end # WebDriver
 end # Selenium