selenium-webdriver 2.53.4 → 3.8.0

data/lib/selenium/webdriver/common/html5/local_storage.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
     module HTML5
-
       class LocalStorage
         include SharedWebStorage
 
@@ -32,29 +29,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

@@ -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,33 +18,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 +53,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

@@ -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
     module HTML5
-
       module SharedWebStorage
         include Enumerable
 
@@ -30,31 +27,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|
+          keys.each do |k| # rubocop:disable Performance/HashEachMethods
             yield k, self[k]
           end
         end
-
       end # SharedWebStorage
     end # HTML5
   end # WebDriver

data/lib/selenium/webdriver/{safari/options.rb → common/interactions/input_device.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
@@ -17,46 +15,37 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'securerandom'
+
 module Selenium
   module WebDriver
-    module Safari
-      class Options
-        DEFAULT_PORT = 56485
-
-        attr_accessor :port, :data_dir, :skip_extension_installation
+    module Interactions
+      class InputDevice
+        attr_reader :name, :actions
 
-        def initialize(opts = {})
-          extract_options(opts)
+        def initialize(name = nil)
+          @name = name || SecureRandom.uuid
+          @actions = []
         end
 
-        def clean_session?
-          !!@clean_session
+        def add_action(action)
+          raise TypeError, "#{action.inspect} is not a valid action" unless action.class < Interaction
+          @actions << action
         end
 
-        def to_capabilities
-          caps = Remote::Capabilities.safari
-          caps.merge!('safari.options' => as_json)
-
-          caps
+        def clear_actions
+          @actions.clear
         end
 
-        def as_json
-          {
-            'port'         => port,
-            'dataDir'      => data_dir,
-            'cleanSession' => clean_session?,
-          }
+        def create_pause(duration = nil)
+          add_action(Pause.new(self, duration))
         end
 
-        private
-
-        def extract_options(opts)
-          @port          = Integer(opts[:port] || DEFAULT_PORT)
-          @data_dir      = opts[:custom_data_dir] || opts[:data_dir]
-          @clean_session = opts[:clean_session]
+        def no_actions? # Determine if only pauses are present
+          actions = @actions.reject { |action| action.type == Interaction::PAUSE }
+          actions.empty?
         end
-
-      end # Options
-    end # Safari
+      end # InputDevice
+    end # Interactions
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/interactions/interaction.rb

@@ -0,0 +1,50 @@
+# 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.
+
+module Selenium
+  module WebDriver
+    module Interactions
+      class Interaction
+        PAUSE = :pause
+
+        attr_reader :source
+
+        def initialize(source)
+          raise TypeError, "#{source.type} is not a valid input type" unless Interactions::SOURCE_TYPES.include? source.type
+          @source = source
+        end
+      end
+
+      class Pause < Interaction
+        def initialize(source, duration = nil)
+          super(source)
+          @duration = duration
+        end
+
+        def type
+          PAUSE
+        end
+
+        def encode
+          output = {type: type}
+          output[:duration] = (@duration * 1000).to_i if @duration
+          output
+        end
+      end # Interaction
+    end # Interactions
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/{safari/browser.rb → common/interactions/interactions.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
@@ -15,26 +13,29 @@
 # "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.
+# under the License
 
 module Selenium
   module WebDriver
-    module Safari
-
-      class Browser
-        def start(*args)
-          Platform.exit_hook { stop } # make sure we don't leave the browser running
+    module Interactions
+      KEY = :key
+      POINTER = :pointer
+      NONE = :none
+      SOURCE_TYPES = [KEY, POINTER, NONE].freeze
 
-          @process = ChildProcess.new(Safari.path, *args)
-          @process.io.inherit! if $DEBUG
-          @process.start
+      class << self
+        def key(name)
+          KeyInput.new(name)
         end
 
-        def stop
-          @process.stop if @process
+        def pointer(kind, **kwargs)
+          PointerInput.new(kind, **kwargs)
         end
 
-      end # Browser
-    end # Safari
+        def none(name = nil)
+          NoneInput.new(name)
+        end
+      end
+    end # Interactions
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/interactions/key_actions.rb

@@ -0,0 +1,143 @@
+# 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.
+
+module Selenium
+  module WebDriver
+    module KeyActions
+      #
+      # Performs a key press. Does not release the key - subsequent interactions may assume it's kept pressed.
+      # Note that the key is never released implicitly - either W3CActionBuilder#key_up(key) or W3CActionBuilder#release_actions
+      # must be called to release the key.
+      #
+      # @example Press a key
+      #
+      #    driver.action.key_down(:control).perform
+      #
+      # @example Press a key on an element
+      #
+      #    el = driver.find_element(id: "some_id")
+      #    driver.action.key_down(el, :shift).perform
+      #
+      # @overload key_down(key, device: nil)
+      #   @param [Symbol, String] key The key to press
+      #   @param [Symbol, String] device Optional name of the KeyInput device to press the key on
+      # @overload key_down(element, key, device: nil)
+      #   @param [Element] element An optional element to move to first
+      #   @param [Symbol, String] key The key to press
+      #   @param [Symbol, String] device Optional name of the KeyInput device to press the key on
+      # @return [W3CActionBuilder] A self reference
+      #
+
+      def key_down(*args, device: nil)
+        key_action(*args, action: :create_key_down, device: device)
+      end
+
+      #
+      # Performs a key release.
+      # Releasing a non-depressed key will yield undefined behaviour.
+      #
+      # @example Release a key
+      #
+      #   driver.action.key_up(:shift).perform
+      #
+      # @example Release a key from an element
+      #
+      #   el = driver.find_element(id: "some_id")
+      #   driver.action.key_up(el, :alt).perform
+      #
+      # @overload key_up(key, device: nil)
+      #   @param [Symbol, String] key The key to press
+      #   @param [Symbol, String] device Optional name of the KeyInput device to press the key on
+      # @overload key_up(element, key, device: nil)
+      #   @param [Element] element An optional element to move to first
+      #   @param [Symbol, String] key The key to release
+      #   @param [Symbol, String] device Optional name of the KeyInput device to release the key on
+      # @return [W3CActionBuilder] A self reference
+      #
+
+      def key_up(*args, device: nil)
+        key_action(*args, action: :create_key_up, device: device)
+      end
+
+      #
+      # Sends keys to the active element. This differs from calling
+      # Element#send_keys(keys) on the active element in two ways:
+      #
+      # * The modifier keys included in this call are not released.
+      # * There is no attempt to re-focus the element - so send_keys(:tab) for switching elements should work.
+      #
+      # @example Send the text "help" to an element
+      #
+      #   el = driver.find_element(id: "some_id")
+      #   driver.action.send_keys(el, "help").perform
+      #
+      # @example Send the text "help" to the currently focused element
+      #
+      #   driver.action.send_keys("help").perform
+      #
+      # @overload send_keys(keys, device: nil)
+      #   @param [Array, Symbol, String] keys The key(s) to press and release
+      #   @param [Symbol, String] device Optional name of the KeyInput device to press and release the keys on
+      # @overload send_keys(element, keys, device: nil)
+      #   @param [Element] element An optional element to move to first
+      #   @param [Array, Symbol, String] keys The key(s) to press and release
+      #   @param [Symbol, String] device Optional name of the KeyInput device to press and release the keys on
+      # @return [W3CActionBuilder] A self reference
+      #
+
+      def send_keys(*args, device: nil)
+        click(args.shift) if args.first.is_a? Element
+        args.map { |x| x.is_a?(String) ? x.chars : x }.flatten.each do |arg|
+          key_down(arg, device: device)
+          key_up(arg, device: device)
+        end
+        self
+      end
+
+      private
+
+      #
+      # @api private
+      #
+      # @overload key_down(key, action: nil, device: nil)
+      #   @param [Symbol, String] key The key to press
+      #   @param [Symbol] action The name of the key action to perform
+      #   @param [Symbol, String] device Optional name of the KeyInput device to press the key on
+      # @overload key_down(element, key, action: nil, device: nil)
+      #   @param [Element] element An optional element to move to first
+      #   @param [Symbol, String] key The key to press
+      #   @param [Symbol] action The name of the key action to perform
+      #   @param [Symbol, String] device Optional name of the KeyInput device to press the key on
+      #
+      # @param [Array] args
+      # @option args [Element] element An optional element to move to first
+      # @option args [Symbol, String] key The key to perform the action with
+      # @param [Symbol] action The name of the key action to perform
+      # @param [Symbol, String] device optional name of the KeyInput device to press the key on
+      # @return [W3CActionBuilder] A self reference
+      #
+
+      def key_action(*args, action: nil, device: nil)
+        key_input = get_device(device) || key_inputs.first
+        click(args.shift) if args.first.is_a? Element
+        key_input.send(action, args.last)
+        tick(key_input)
+        self
+      end
+    end # KeyActions
+  end # WebDriver
+end # Selenium