Merge upstream/master resolving conflict by keeping symbolize_keys removal

Author: aguspe

CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 Read `release_notes.md` for commit level details.
 
+## [12.1.0] - 2026-03-21
+- Replace internal `add_command` method with Selnium Bridge's `add_command` to simplify the codebase.
+
+## [12.0.1] - 2026-03-07
+- Improve Steep
+
 ## [12.0.0] - 2025-12-28
 - Remove `Appium::Core::WebSocket` which was for `appium/device/logcat` endpoint. Please use BiDi log endpoint such as [this test](https://github.com/appium/ruby_lib_core/blob/master/test/functional/android/webdriver/bidi_test.rb) instead.
 - update RBS files

Gemfile

@@ -8,7 +8,7 @@ gem 'minitest', '~> 5.0'
 gem 'minitest-reporters', '~> 1.1'
 gem 'parallel_tests'
 gem 'rake', '~> 13.0'
-gem 'rubocop', '1.85.0'
+gem 'rubocop', '1.86.0'
 gem 'simplecov'
 gem 'steep', '~> 1.10.0'
 gem 'webmock', '~> 3.26.0'

lib/appium_lib_core/common/base/bridge.rb

@@ -47,8 +47,6 @@ class Bridge < ::Selenium::WebDriver::Remote::Bridge
         # No 'browserName' means the session is native appium connection
         APPIUM_NATIVE_BROWSER_NAME = 'appium'
 
-        attr_reader :available_commands
-
         def browser
           @browser ||= begin
             name = @capabilities&.browser_name
@@ -74,7 +72,6 @@ def browser
         #   )
         #
         def attach_to(session_id, platform_name, automation_name)
-          @available_commands = ::Appium::Core::Commands::COMMANDS.dup
           @session_id = session_id
 
           # generate a dummy capabilities instance which only has the given platformName and automationName
@@ -109,10 +106,8 @@ def attach_to(session_id, platform_name, automation_name)
         #   driver = core.start_driver
         #
         def create_session(capabilities)
-          @available_commands = ::Appium::Core::Commands::COMMANDS.dup
-
           always_match = add_appium_prefix(capabilities)
-          response = execute(:new_session, {}, { capabilities: { alwaysMatch: always_match, firstMatch: [{}] } })
+          response = execute(:new_session, {}, { capabilities: { alwaysMatch: always_match, firstMatch: [{}] } }) # steep:ignore
 
           @session_id = response['sessionId']
           raise ::Selenium::WebDriver::Error::WebDriverError, 'no sessionId in returned payload' unless @session_id
@@ -162,29 +157,16 @@ def json_create(value)
 
         public
 
-        # command for Appium 2.0.
-
-        # Example:
-        #   driver.add_command(name: :available_contexts, method: :get, url: 'session/:session_id/contexts') do
-        #     execute(:available_contexts, {}) || []
-        #   end
-        # Then,
-        #   driver.available_contexts #=> ["NATIVE_APP"]
-
-        # def add_command(method:, url:, name:, &block)
-        #   Bridge.add_command name, method, url, &block
-        # end
-
-        def add_command(method:, url:, name:, &block)
-          ::Appium::Logger.info "Overriding the method '#{name}' for '#{url}'" if @available_commands.key? name
-
-          @available_commands[name] = [method, url]
-
-          ::Appium::Core::Device.add_endpoint_method name, &block
+        # Override Selenium's command_list to use Appium's command definitions
+        # instead of the default W3C COMMANDS from Selenium.
+        def command_list
+          ::Appium::Core::Commands::COMMANDS
         end
 
+        # Override Selenium's commands to resolve extra_commands from this subclass
+        # rather than the parent Selenium::WebDriver::Remote::Bridge.
         def commands(command)
-          @available_commands[command] || Bridge.extra_commands[command]
+          command_list[command] || self.class.extra_commands&.[](command)
         end
 
         def status
@@ -273,7 +255,7 @@ def set_location(lat, lon, alt = 0.0, speed: nil, satellites: nil)
         # No implementation for W3C webdriver module
         def available_log_types
           types = execute :get_available_log_types
-          Array(types).map(&:to_sym)
+          Array(types).map(&:to_sym) # steep:ignore
         end
 
         # For Appium
@@ -297,7 +279,7 @@ def log_event(vendor, event)
 
         # For Appium
         def log_events(type = nil)
-          args = {}
+          args = {} # steep:ignore
           args['type'] = type unless type.nil?
 
           execute :get_log_events, {}, args

lib/appium_lib_core/common/base/driver.rb

@@ -135,25 +135,21 @@ def update_sending_request_to(protocol:, host:, port:, path:)
         # 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.
         #
+        # Uses Selenium's +Bridge.add_command+ under the hood to register the command
+        # and define the method on the bridge.
+        #
         # @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.
+        # @param [Proc] block The block becomes the method body. It is executed in the context of
+        #                     the bridge instance, so +execute+ is available. When no block is given,
+        #                     a default implementation calling +execute(name)+ is used.
         # @raise [ArgumentError] If the given +method+ is invalid value.
         #
-        # @example
+        # @example Simple GET command (no block)
         #
         #   @driver.add_command(
         #     method: :get,
@@ -163,30 +159,37 @@ def update_sending_request_to(protocol:, host:, port:, path:)
         #   # Send a GET request to 'session/<session id>/path/to/custom/url'
         #   @driver.test_command
         #
+        # @example POST command with arguments (do/end block)
         #
         #   @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
+        #   ) do |argument|
+        #     execute(:test_command, {}, { dummy: argument })
         #   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)
         #
+        # @example POST command with arguments (inline block)
+        #
+        #   @driver.add_command(
+        #     method: :post,
+        #     url: 'session/:session_id/path/to/custom/url',
+        #     name: :test_command
+        #   ) { |argument| execute(:test_command, {}, { dummy: argument }) }
+        #   @driver.test_command(1)
+        #
+        # @example POST command with URL placeholders (do/end block)
         #
         #   @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
+        #   ) do |element_id, action|
+        #     execute(:test_action_command, {id: element_id}, { dummy_action: action })
         #   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.
@@ -195,10 +198,28 @@ def update_sending_request_to(protocol:, host:, port:, path:)
         #   e = @driver.find_element :accessibility_id, 'an element'
         #   @driver.test_action_command(e.id, 'action')
         #
+        # @example POST command with URL placeholders (inline block)
+        #
+        #   @driver.add_command(
+        #     method: :post,
+        #     url: 'session/:session_id/element/:id/custom/action',
+        #     name: :test_action_command
+        #   ) { |element_id, action| execute(:test_action_command, {id: element_id}, { dummy_action: action }) }
+        #   e = @driver.find_element :accessibility_id, 'an element'
+        #   @driver.test_action_command(e.id, 'action')
+        #
         def add_command(method:, url:, name:, &block)
           raise ::Appium::Core::Error::ArgumentError, "Available method is either #{AVAILABLE_METHODS}" unless AVAILABLE_METHODS.include? method
 
-          @bridge.add_command method: method, url: url, name: name, &block
+          ::Appium::Logger.info "Overriding the command '#{name}' for '#{url}'" if Bridge.extra_commands&.key?(name)
+
+          # Use Selenium's Bridge.add_command to register the command and define the method.
+          # When no block is given, create a default implementation that calls execute.
+          block ||= proc { execute(name) }
+          Bridge.add_command(name, method, url, &block)
+
+          # Ensure the driver delegates the new method to bridge
+          self.class.class_eval { def_delegator :@bridge, name } unless self.class.method_defined?(name)
         end
 
         ### Methods for Appium

lib/appium_lib_core/common/command.rb

@@ -208,7 +208,7 @@ module Commands
         chrome_send_command: [:post, 'session/:session_id/goog/cdp/execute']
       }.freeze
 
-      COMMANDS = {}.merge(COMMAND).merge(COMMAND_ANDROID).freeze
+      COMMANDS = {}.merge(COMMAND).merge(COMMAND_ANDROID).freeze # steep:ignore
     end # module Commands
   end # module Core
 end # module Appium

lib/appium_lib_core/common/device/app_management.rb

@@ -18,7 +18,7 @@ class Base
       module Device
         module AppManagement
           def app_strings(language = nil)
-            opts = language ? { language: language } : {}
+            opts = language ? { language: language } : {} # steep:ignore
             execute_script 'mobile:getAppStrings', opts
           end
 
@@ -27,7 +27,7 @@ def background_app(duration = 0)
             raise NotImplementedError
           end
 
-          def install_app(path, options = {})
+          def install_app(path, options = {}) # steep:ignore
             args = { appPath: path }
             args[:options] = options unless options&.empty?
 

lib/appium_lib_core/common/device/device.rb

@@ -22,7 +22,7 @@ def shake
           end
 
           def device_time(format = nil)
-            arg = {}
+            arg = {} # steep:ignore
             arg[:format] = format unless format.nil?
 
             execute_script 'mobile:getDeviceTime', arg

lib/appium_lib_core/common/device/device_lock.rb

@@ -18,7 +18,7 @@ class Base
       module Device
         module DeviceLock
           def lock(duration = nil)
-            opts = duration ? { seconds: duration } : {}
+            opts = duration ? { seconds: duration } : {} # steep:ignore
             execute_script 'mobile:lock', opts
           end
 

lib/appium_lib_core/common/device/image_comparison.rb

@@ -68,7 +68,7 @@ def match_images_features(first_image:,
             raise ::Appium::Core::Error::ArgumentError, "match_func should be #{MATCH_FEATURES[:match_func]}" unless MATCH_FEATURES[:match_func].member?(match_func.to_s)
             raise ::Appium::Core::Error::ArgumentError, "visualize should be #{MATCH_FEATURES[:visualize]}" unless MATCH_FEATURES[:visualize].member?(visualize)
 
-            options = {}
+            options = {} # steep:ignore
             options[:detectorName] = detector_name.to_s.upcase
             options[:matchFunc] = match_func.to_s
             options[:goodMatchesFactor] = good_matches_factor.to_i unless good_matches_factor.nil?
@@ -108,7 +108,7 @@ def find_image_occurrence(full_image:, partial_image:, visualize: false, thresho
                     "visualize should be #{MATCH_TEMPLATE[:visualize]}"
             end
 
-            options = {}
+            options = {} # steep:ignore
             options[:visualize] = visualize
             options[:threshold] = threshold unless threshold.nil?
             options[:multiple] = multiple unless multiple.nil?
@@ -138,7 +138,7 @@ def get_images_similarity(first_image:, second_image:, visualize: false)
                     "visualize should be #{GET_SIMILARITY[:visualize]}"
             end
 
-            options = {}
+            options = {} # steep:ignore
             options[:visualize] = visualize
 
             compare_images(mode: :getSimilarity, first_image: first_image, second_image: second_image, options: options)
@@ -160,7 +160,7 @@ def get_images_similarity(first_image:, second_image:, visualize: false)
           def compare_images(mode: :matchFeatures, first_image:, second_image:, options: nil)
             raise ::Appium::Core::Error::ArgumentError, "content_type should be #{MODE}" unless MODE.member?(mode)
 
-            params = {}
+            params = {} # steep:ignore
             params[:mode] = mode
             params[:firstImage] = Base64.strict_encode64 first_image
             params[:secondImage] = Base64.strict_encode64 second_image

lib/appium_lib_core/common/device/keyboard.rb

@@ -18,7 +18,7 @@ class Base
       module Device
         module Keyboard
           def hide_keyboard(close_key = nil)
-            option = {}
+            option = {} # steep:ignore
 
             option[:key] = close_key || 'Done' # default to Done key.