appium_lib_core 5.0.0.beta1 → 5.0.0.rc1

data/lib/appium_lib_core/common/base/device_ime.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# Licensed 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 Appium
+  module Core
+    class Base
+      #
+      # @api private
+      #
+      class DeviceIME
+        # @private this class is private
+        def initialize(bridge)
+          @bridge = bridge
+        end
+
+        def activate(ime_name)
+          @bridge.ime_activate(ime_name)
+        end
+
+        def available_engines
+          @bridge.ime_available_engines
+        end
+
+        def active_engine
+          @bridge.ime_active_engine
+        end
+
+        def activated?
+          @bridge.ime_activated
+        end
+
+        def deactivate
+          @bridge.ime_deactivate
+        end
+      end
+    end
+  end
+end

data/lib/appium_lib_core/common/base/driver.rb

@@ -13,6 +13,8 @@
 # limitations under the License.
 
 require 'base64'
+require_relative 'device_ime'
+require_relative 'driver_settings'
 require_relative 'search_context'
 require_relative 'screenshot'
 require_relative 'rotable'
@@ -36,23 +38,25 @@ module Appium
         include ::Appium::Core::Base::HasLocation
         include ::Appium::Core::Base::HasNetworkConnection
 
+        private
+
         # Private API.
         # Do not use this for general use. Used by flutter driver to get bridge for creating a new element
         attr_reader :bridge
 
-        # Almost same as self.handshake in ::Selenium::WebDriver::Remote::Bridge
-        #
+        def initialize(bridge: nil, listener: nil, **opts)
+          super
+        end
+
         # Implements protocol handshake which:
         #
         #   1. Creates session with driver.
         #   2. Sniffs response.
         #   3. Based on the response, understands which dialect we should use.
         #
-        # @return [Bridge::W3C]
+        # @return [::Appium::Core::Base::Bridge]
         #
-        # TODO: Fixme
         def create_bridge(**opts)
-          opts[:url] ||= service_url(opts)
           caps = opts.delete(:capabilities)
           # NOTE: This is deprecated
           cap_array = caps.is_a?(Hash) ? [caps] : Array(caps)
@@ -71,19 +75,15 @@ module Appium
           capabilities = generate_capabilities(cap_array)
 
           bridge_opts = { http_client: opts.delete(:http_client), url: opts.delete(:url) }
-          raise ArgumentError, "Unable to create a driver with parameters: #{opts}" unless opts.empty?
+          raise ::Appium::Core::Error::ArgumentError, "Unable to create a driver with parameters: #{opts}" unless opts.empty?
 
-          bridge = ::Appium::Core::Base::Bridge::W3C.new(**bridge_opts)
+          bridge = ::Appium::Core::Base::Bridge.new(**bridge_opts)
 
           bridge.create_session(capabilities)
           bridge
         end
 
-        # Get the dialect value
-        # @return [:oss|:w3c]
-        def dialect
-          @bridge.dialect
-        end
+        public
 
         # Update +server_url+ and HTTP clients following this arguments, protocol, host, port and path.
         # After this method, +@bridge.http+ will be a new instance following them instead of +server_url+ which is
@@ -109,6 +109,86 @@ module Appium
                                                   path: path)
         end
 
+        AVAILABLE_METHODS = [
+          :get, :head, :post, :put, :delete,
+          :connect, :options, :trace, :patch
+        ].freeze
+        # Define a new custom method to the driver so that you can define your own method for
+        # drivers/plugins in Appium 2.0. Appium 2.0 and its custom drivers/plugins allow you
+        # to define custom commands that are not part of W3C spec.
+        #
+        # @param [Symbol] method HTTP request method as https://www.w3.org/TR/webdriver/#endpoints
+        # @param [string] url The url to URL template as https://www.w3.org/TR/webdriver/#endpoints.
+        #                     +:session_id+ is the placeholder of 'session id'.
+        #                     Other place holders can be specified with +:+ prefix like +:id+.
+        #                     Then, the +:id+ will be replaced with a given value as the seconds argument of +execute+
+        # @param [Symbol] name The name of method that is called as the driver instance method.
+        # @param [Proc] block The block to involve as the method.
+        #                     Please define a method that has the same +name+ with arguments you want.
+        #                     The method must has +execute+ method. tHe +execute+ is calls the +url+
+        #                     with the given parameters.
+        #                     The first argument should be +name+ as symbol.
+        #                     The second argument should be hash. If keys in the hash matches +:+ prefix
+        #                     string in the given url, the matched string in the given url will be
+        #                     values in the hash.
+        #                     The third argument should be hash. The hash will be the request body.
+        #                     Please read examples below for more details.
+        # @raise [ArgumentError] If the given +method+ is invalid value.
+        #
+        # @example
+        #
+        #   @driver.add_command(
+        #     method: :get,
+        #     url: 'session/:session_id/path/to/custom/url',
+        #     name: :test_command
+        #   )
+        #   # Send a GET request to 'session/<session id>/path/to/custom/url'
+        #   @driver.test_command
+        #
+        #
+        #   @driver.add_command(
+        #     method: :post,
+        #     url: 'session/:session_id/path/to/custom/url',
+        #     name: :test_command
+        #   ) do
+        #     def test_command(argument)
+        #       execute(:test_command, {}, { dummy: argument })
+        #     end
+        #   end
+        #   # Send a POST request to 'session/<session id>/path/to/custom/url'
+        #   # with body "{ dummy: 1 }" as JSON object. "1" is the argument.
+        #   # ':session_id' in the given 'url' is replaced with current 'session id'.
+        #   @driver.test_command(1)
+        #
+        #
+        #   @driver.add_command(
+        #     method: :post,
+        #     url: 'session/:session_id/element/:id/custom/action',
+        #     name: :test_action_command
+        #   ) do
+        #     def test_action_command(element_id, action)
+        #       execute(:test_action_command, {id: element_id}, { dummy_action: action })
+        #     end
+        #   end
+        #   # Send a POST request to 'session/<session id>/element/<element id>/custom/action'
+        #   # with body "{ dummy_action: #{action} }" as JSON object. "action" is the seconds argument.
+        #   # ':session_id' in the given url is replaced with current 'session id'.
+        #   # ':id' in the given url is replaced with the given 'element_id'.
+        #   e = @driver.find_element :accessibility_id, 'an element'
+        #   _, element_id = e.ref
+        #   @driver.test_action_command(element_id, 'action')
+        #
+        def add_command(method:, url:, name:, &block)
+          unless AVAILABLE_METHODS.include? method
+            raise ::Appium::Core::Error::ArgumentError, "Available method is either #{AVAILABLE_METHODS}"
+          end
+
+          # TODO: Remove this logger before Appium 2.0 release
+          ::Appium::Logger.info '[Experimental] this method is experimental for Appium 2.0. This interface may change.'
+
+          @bridge.add_command method: method, url: url, name: name, &block
+        end
+
         ### Methods for Appium
 
         # Lock the device
@@ -191,36 +271,6 @@ module Appium
         end
         alias type send_keys
 
-        class DriverSettings
-          # @private this class is private
-          def initialize(bridge)
-            @bridge = bridge
-          end
-
-          # Get appium Settings for current test session.
-          #
-          # @example
-          #
-          #   @driver.settings.get
-          #
-          def get
-            @bridge.get_settings
-          end
-
-          # Update Appium Settings for current test session
-          #
-          # @param [Hash] settings Settings to update, keys are settings, values to value to set each setting to
-          #
-          # @example
-          #
-          #   @driver.settings.update({'allowInvisibleElements': true})
-          #
-          def update(settings)
-            @bridge.update_settings(settings)
-          end
-        end
-        private_constant :DriverSettings
-
         # Returns an instance of DriverSettings to call get/update.
         #
         # @example
@@ -229,7 +279,7 @@ module Appium
         #   @driver.settings.update('allowInvisibleElements': true)
         #
         def settings
-          @driver_settings ||= DriverSettings.new(@bridge) # rubocop:disable Naming/MemoizedInstanceVariableName
+          @settings ||= DriverSettings.new(@bridge)
         end
 
         # Get appium Settings for current test session.
@@ -260,34 +310,6 @@ module Appium
         end
         alias update_settings settings=
 
-        class DeviceIME
-          # @private this class is private
-          def initialize(bridge)
-            @bridge = bridge
-          end
-
-          def activate(ime_name)
-            @bridge.ime_activate(ime_name)
-          end
-
-          def available_engines
-            @bridge.ime_available_engines
-          end
-
-          def active_engine
-            @bridge.ime_active_engine
-          end
-
-          def activated?
-            @bridge.ime_activated
-          end
-
-          def deactivate
-            @bridge.ime_deactivate
-          end
-        end
-        private_constant :DeviceIME
-
         # Returns an instance of DeviceIME
         #
         # @return [Appium::Core::Base::Driver::DeviceIME]
@@ -301,7 +323,7 @@ module Appium
         #   @driver.ime.deactivate #=> Deactivate current IME engine
         #
         def ime
-          @device_ime ||= DeviceIME.new(@bridge) # rubocop:disable Naming/MemoizedInstanceVariableName
+          @ime ||= DeviceIME.new(@bridge)
         end
 
         # Android only. Make an engine that is available active.
@@ -421,30 +443,6 @@ module Appium
         end
         alias set_context context=
 
-        # Set the value to element directly
-        #
-        # @example
-        #
-        #   @driver.set_immediate_value element, 'hello'
-        #
-        def set_immediate_value(element, *value)
-          ::Appium::Logger.warn '[DEPRECATION] driver#set_immediate_value(element, *value) is deprecated. ' \
-            'Use Element#immediate_value(*value) instead'
-          @bridge.set_immediate_value(element, *value)
-        end
-
-        # Replace the value to element directly
-        #
-        # @example
-        #
-        #   @driver.replace_value element, 'hello'
-        #
-        def replace_value(element, *value)
-          ::Appium::Logger.warn '[DEPRECATION] driver#replace_value(element, *value) is deprecated. ' \
-            'Use Element#replace_value(*value) instead'
-          @bridge.replace_value(element, *value)
-        end
-
         # Place a file in a specific location on the device.
         # On iOS, the server should have ifuse libraries installed and configured properly for this feature to work on
         # real devices.
@@ -864,7 +862,7 @@ module Appium
         #    @driver.perform_actions [f1, f2] #=> 'nil' if the action succeed
         #
         def perform_actions(data)
-          raise ArgumentError, "'#{data}' must be Array" unless data.is_a? Array
+          raise ::Appium::Core::Error::ArgumentError, "'#{data}' must be Array" unless data.is_a? Array
 
           @bridge.send_actions data.map(&:encode).compact
           data.each(&:clear_actions)
@@ -942,8 +940,7 @@ module Appium
         #   #=> uiautomator2
         #   # <Selenium::WebDriver::Remote::Capabilities:0x007fa38dae1360
         #   # @capabilities=
-        #   #     {:proxy=>nil,
-        #   #      :browser_name=>nil,
+        #   #     {:browser_name=>nil,
         #   #      :browser_version=>nil,
         #   #      :platform_name=>"android",
         #   #      :page_load_strategy=>nil,
@@ -992,8 +989,7 @@ module Appium
         #   #=> XCUITest
         #   # <Selenium::WebDriver::Remote::Capabilities:0x007fb15dc01370
         #   # @capabilities=
-        #   #     {:proxy=>nil,
-        #   #      :browser_name=>"UICatalog",
+        #   #     {:browser_name=>"UICatalog",
         #   #      :browser_version=>nil,
         #   #      :platform_name=>"ios",
         #   #      :page_load_strategy=>nil,
@@ -1074,7 +1070,7 @@ module Appium
         #
         # @param [String] img_path A path to a partial image you'd like to find
         #
-        # @return [::Selenium::WebDriver::Element]
+        # @return [::Appium::Core::Element]
         #
         # @example
         #
@@ -1144,14 +1140,14 @@ module Appium
           @bridge.execute_driver(script: script, type: type, timeout_ms: timeout_ms)
         end
 
-        # Convert vanilla element response to ::Selenium::WebDriver::Element
+        # Convert vanilla element response to ::Appium::Core::Element
         #
         # @param [Hash] id The id which can get as a response from server
-        # @return [::Selenium::WebDriver::Element]
+        # @return [::Appium::Core::Element]
         #
         # @example
         #     response = {"element-6066-11e4-a52e-4f735466cecf"=>"xxxx", "ELEMENT"=>"xxxx"}
-        #     ele = @driver.convert_to_element(response) #=> ::Selenium::WebDriver::Element
+        #     ele = @driver.convert_to_element(response) #=> ::Appium::Core::Element
         #     ele.rect #=> Can get the rect of the element
         #
         def convert_to_element(id)

data/lib/appium_lib_core/common/base/driver_settings.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# Licensed 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 Appium
+  module Core
+    class Base
+      #
+      # @api private
+      #
+      class DriverSettings
+        # @private this class is private
+        def initialize(bridge)
+          @bridge = bridge
+        end
+
+        # Get appium Settings for current test session.
+        #
+        # @example
+        #
+        #   @driver.settings.get
+        #
+        def get
+          @bridge.get_settings
+        end
+
+        # Update Appium Settings for current test session
+        #
+        # @param [Hash] settings Settings to update, keys are settings, values to value to set each setting to
+        #
+        # @example
+        #
+        #   @driver.settings.update({'allowInvisibleElements': true})
+        #
+        def update(settings)
+          @bridge.update_settings(settings)
+        end
+      end
+    end
+  end
+end

data/lib/appium_lib_core/common/base/has_location.rb

@@ -52,19 +52,26 @@ module Appium
         # @param [String, Number] latitude Set the latitude.
         # @param [String, Number] longitude Set the longitude.
         # @param [String, Number] altitude Set the altitude.
-        # @param [String, Number] speed Set the speed to apply the location on Android real devices @since Appium 1.21.0.
+        # @param [String, Number] speed Set the speed to apply the location on Android real devices
+        #                               in meters/second @since Appium 1.21.0 and in knots for emulators @since Appium 1.22.0.
+        # @param [String, Number] satellites Sets the count of geo satellites being tracked in range 1..12 @since Appium 1.22.0.
+        #                                    This number is respected on Emulators.
         # @param [::Selenium::WebDriver::Location]
         #
         # @example
         #
         #   driver.location = ::Selenium::WebDriver::Location.new(10, 10, 10)
         #
-        def set_location(latitude, longitude, altitude, speed: nil)
-          if speed.nil?
+        def set_location(latitude, longitude, altitude, speed: nil, satellites: nil)
+          if speed.nil? && satellites.nil?
             self.location = ::Selenium::WebDriver::Location.new(Float(latitude), Float(longitude), Float(altitude))
           else
             loc = ::Selenium::WebDriver::Location.new(Float(latitude), Float(longitude), Float(altitude))
-            @bridge.set_location loc.latitude, loc.longitude, loc.altitude, speed: Float(speed)
+
+            speed = Float(speed) unless speed.nil?
+            satellites = Integer(satellites) unless satellites.nil?
+
+            @bridge.set_location loc.latitude, loc.longitude, loc.altitude, speed: speed, satellites: satellites
           end
         end
       end