appium_lib 10.6.0 → 12.0.0.rc1

data/lib/appium_lib/android/common/helper.rb

@@ -27,7 +27,7 @@ module Appium
         @filter = value.to_s.downcase
       end
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         reset
         @filter   = false
       end
@@ -217,7 +217,7 @@ module Appium
       # [^\/]+          - type is made up of at least one non-/ characters
       # \\/             - / ends the type and starts the name
       # [\S]+$          - the name contains at least one non-space character and then the line is ended
-      resource_id = /^[a-zA-Z_][a-zA-Z0-9\._]*:[^\/]+\/[\S]+$/
+      resource_id = /^[a-zA-Z_][a-zA-Z0-9._]*:[^\/]+\/\S+$/
       string.match(resource_id) ? on_match : ''
     end
 
@@ -234,11 +234,11 @@ module Appium
 
       if class_name == '*'
         return "//*[contains(translate(@text,'#{value.upcase}', '#{value}'), '#{value}')" \
-          " or contains(translate(@content-desc,'#{value.upcase}', '#{value}'), '#{value}')" + r_id + ']'
+               " or contains(translate(@content-desc,'#{value.upcase}', '#{value}'), '#{value}')" + r_id + ']'
       end
 
       "//#{class_name}[contains(translate(@text,'#{value.upcase}', '#{value}'), '#{value}')" \
-        " or contains(translate(@content-desc,'#{value.upcase}', '#{value}'), '#{value}')" + r_id + ']'
+      " or contains(translate(@content-desc,'#{value.upcase}', '#{value}'), '#{value}')" + r_id + ']'
     end
 
     # Returns a string that matches the first element that contains value

data/lib/appium_lib/android/element/button.rb

@@ -60,9 +60,9 @@ module Appium
       # uiautomator index doesn't support last
       # and it's 0 indexed
       button_index = tags(BUTTON).length
-      button_index -= 1 if button_index > 0
+      button_index -= 1 if button_index.positive?
       image_button_index = tags(IMAGE_BUTTON).length
-      image_button_index -= 1 if image_button_index > 0
+      image_button_index -= 1 if image_button_index.positive?
 
       find_element :uiautomator,
                    _button_visible_selectors(button_index: button_index,
@@ -98,10 +98,10 @@ module Appium
 
       if button_index && image_button_index
         "new UiSelector().className(#{BUTTON}).instance(#{button_index});" \
-        "new UiSelector().className(#{IMAGE_BUTTON}).instance(#{image_button_index});"
+          "new UiSelector().className(#{IMAGE_BUTTON}).instance(#{image_button_index});"
       else
         "new UiSelector().className(#{BUTTON});" \
-        "new UiSelector().className(#{IMAGE_BUTTON});"
+          "new UiSelector().className(#{IMAGE_BUTTON});"
       end
     end
 

data/lib/appium_lib/android/element/generic.rb

@@ -56,12 +56,10 @@ module Appium
       rid  = resource_id(text, "new UiSelector().resourceId(#{text})")
       args = rid.empty? ? ["new UiSelector().textContains(#{text})", "new UiSelector().descriptionContains(#{text})"] : [rid]
       args.each_with_index do |arg, index|
-        begin
-          elem = find_element :uiautomator, scroll_uiselector(arg, scrollable_index)
-          return elem
-        rescue StandardError => e
-          raise e if index == args.size - 1
-        end
+        elem = find_element :uiautomator, scroll_uiselector(arg, scrollable_index)
+        return elem
+      rescue StandardError => e
+        raise e if index == args.size - 1
       end
     end
 
@@ -74,12 +72,10 @@ module Appium
       rid  = resource_id(text, "new UiSelector().resourceId(#{text})")
       args = rid.empty? ? ["new UiSelector().text(#{text})", "new UiSelector().description(#{text})"] : [rid]
       args.each_with_index do |arg, index|
-        begin
-          elem = find_element :uiautomator, scroll_uiselector(arg, scrollable_index)
-          return elem
-        rescue StandardError => e
-          raise e if index == args.size - 1
-        end
+        elem = find_element :uiautomator, scroll_uiselector(arg, scrollable_index)
+        return elem
+      rescue StandardError => e
+        raise e if index == args.size - 1
       end
     end
   end # module Android

data/lib/appium_lib/android/espresso/element/button.rb

@@ -63,9 +63,9 @@ module Appium
           # uiautomator index doesn't support last
           # and it's 0 indexed
           button_index = tags(::Appium::Android::BUTTON).length
-          button_index -= 1 if button_index > 0
+          button_index -= 1 if button_index.positive?
           image_button_index = tags(::Appium::Android::IMAGE_BUTTON).length
-          image_button_index -= 1 if image_button_index > 0
+          image_button_index -= 1 if image_button_index.positive?
 
           _button_visible_selectors_xpath(button_index: button_index,
                                           image_button_index: image_button_index)

data/lib/appium_lib/android/espresso/element/generic.rb

@@ -25,19 +25,17 @@ module Appium
           w_s = window_rect
 
           (1..30).each do |_count|
-            begin
-              action
-                .move_to_location(w_s.width / 2, (w_s.height * 2) / 5) # pointer based magic number
-                .pointer_down(:left)
-                .move_to_location(0, w_s.height / 5)
-                .release
-                .perform
-              sleep 1 # we must wait finish scrolling
+            action
+              .move_to_location(w_s.width / 2, (w_s.height * 2) / 5) # pointer based magic number
+              .pointer_down(:left)
+              .move_to_location(0, w_s.height / 5)
+              .release
+              .perform
+            sleep 1 # we must wait finish scrolling
 
-              return text(text)
-            rescue StandardError => e
-              err = e
-            end
+            return text(text)
+          rescue StandardError => e
+            err = e
           end
 
           raise err
@@ -52,19 +50,17 @@ module Appium
           w_s = window_rect
 
           (1..30).each do |_count|
-            begin
-              action
-                .move_to_location(w_s.width / 2, (w_s.height * 2) / 5) # pointer based magic number
-                .pointer_down(:left)
-                .move_to_location(0, w_s.height / 5)
-                .release
-                .perform
-              sleep 1 # we must wait finish scrolling
+            action
+              .move_to_location(w_s.width / 2, (w_s.height * 2) / 5) # pointer based magic number
+              .pointer_down(:left)
+              .move_to_location(0, w_s.height / 5)
+              .release
+              .perform
+            sleep 1 # we must wait finish scrolling
 
-              return text_exact(text)
-            rescue StandardError => e
-              err = e
-            end
+            return text_exact(text)
+          rescue StandardError => e
+            err = e
           end
 
           raise err

data/lib/appium_lib/android/uiautomator2/element/button.rb

@@ -60,9 +60,9 @@ module Appium
           # uiautomator index doesn't support last
           # and it's 0 indexed
           button_index = tags(::Appium::Android::Button).length
-          button_index -= 1 if button_index > 0
+          button_index -= 1 if button_index.positive?
           image_button_index = tags(::Appium::Android::ImageButton).length
-          image_button_index -= 1 if image_button_index > 0
+          image_button_index -= 1 if image_button_index.positive?
 
           elements = find_elements :uiautomator,
                                    _button_visible_selectors(button_index: button_index,
@@ -101,10 +101,10 @@ module Appium
 
           if button_index && image_button_index
             "new UiSelector().className(#{::Appium::Android::Button}).instance(#{button_index});" \
-        "new UiSelector().className(#{::Appium::Android::ImageButton}).instance(#{image_button_index});"
+              "new UiSelector().className(#{::Appium::Android::ImageButton}).instance(#{image_button_index});"
           else
             "new UiSelector().className(#{::Appium::Android::Button});" \
-        "new UiSelector().className(#{::Appium::Android::ImageButton});"
+              "new UiSelector().className(#{::Appium::Android::ImageButton});"
           end
         end
 

data/lib/appium_lib/appium.rb

@@ -77,9 +77,8 @@ module Appium
       Appium::Logger.info "Loading #{toml}" if verbose
 
       data = Tomlrb.load_file(toml, symbolize_keys: true)
-      if verbose
-        Appium::Logger.info data unless data.empty?
-      end
+
+      Appium::Logger.info data if verbose && !data.empty?
 
       if data && data[:caps] && data[:caps][:app] && !data[:caps][:app].empty?
         data[:caps][:app] = Appium::Driver.absolute_app_path data
@@ -157,18 +156,16 @@ module Appium
 
       target_modules.each do |const|
         # noinspection RubyResolve
-        # rubocop:disable Style/MultilineIfModifier
         driver.public_methods(false).each do |m|
+          # override unless there's an existing method with matching arity
+          next if const.respond_to?(m) && const.method(m).arity == driver.method(m).arity
+
           const.send(:define_singleton_method, m) do |*args, &block|
-            begin
-              super(*args, &block) # promote.rb
-            rescue NoMethodError, ArgumentError
-              driver.send m, *args, &block if driver.respond_to?(m)
-            end
-            # override unless there's an existing method with matching arity
-          end unless const.respond_to?(m) && const.method(m).arity == driver.method(m).arity
+            super(*args, &block) # promote.rb
+          rescue NoMethodError, ArgumentError
+            driver.send m, *args, &block if driver.respond_to?(m)
+          end
         end
-        # rubocop:enable Style/MultilineIfModifier
       end
     end
 
@@ -200,29 +197,32 @@ module Appium
       raise 'Driver is nil' if driver.nil?
 
       # Wrap single class into an array
-      class_array = [class_array] unless class_array.class == Array
+      class_array = [class_array] unless class_array.instance_of? Array
       # Promote Appium driver methods to class instance methods.
       class_array.each do |klass|
-        driver.public_methods(false).each do |m|
+        driver.public_methods(false).each do |method|
           klass.class_eval do
-            define_method m do |*args, &block|
-              begin
-                # Prefer existing method.
-                # super will invoke method missing on driver
-                super(*args, &block)
-
-                # minitest also defines a name method,
-                # so rescue argument error
-                # and call the name method on $driver
-              rescue NoMethodError, ArgumentError
-                if args.size == 1 && args.first.is_a?(Hash)
-                  # To prevent warnings by keyword arguments (for Ruby 2.7 and 3)
-                  driver.send m, **args.first, &block if driver.respond_to?(m)
-                else
-                  ::Appium::Logger.warn "Should fix this '#{args}' for Ruby 2.7 (and 3)" if args.first.is_a?(Hash)
-
-                  driver.send m, *args, &block if driver.respond_to?(m)
-                end
+            if method_defined? method
+              ::Appium::Logger.warn "'#{method}' is already defined. Skipping to override it."
+              next
+            end
+
+            define_method method do |*args, &block|
+              # Prefer existing method.
+              # super will invoke method missing on driver
+              super(*args, &block)
+
+              # minitest also defines a name method,
+              # so rescue argument error
+              # and call the name method on $driver
+            rescue NoMethodError, ArgumentError
+              if args.size == 1 && args.first.is_a?(Hash)
+                # To prevent warnings by keyword arguments (for Ruby 2.7 and 3)
+                driver.send method, **args.first, &block if driver.respond_to?(method)
+              else
+                ::Appium::Logger.warn "Should fix this '#{args}' for Ruby 2.7 (and 3)" if args.first.is_a?(Hash)
+
+                driver.send method, *args, &block if driver.respond_to?(method)
               end
             end
           end

data/lib/appium_lib/common/helper.rb

@@ -29,7 +29,8 @@ module Appium
     # Return yield and ignore any exceptions.
     def ignore
       yield
-    rescue Exception # rubocop:disable Lint/HandleExceptions, Lint/RescueException
+    rescue Exception # rubocop:disable Lint/RescueException
+      # Ignored
     end
 
     # Navigate back.
@@ -73,7 +74,7 @@ module Appium
     class CountElements < Nokogiri::XML::SAX::Document
       attr_reader :result
 
-      def initialize(platform)
+      def initialize(platform) # rubocop:disable Lint/MissingSuper
         reset
         @platform = platform
       end
@@ -213,7 +214,7 @@ module Appium
         @filter = value.to_s.downcase
       end
 
-      def initialize
+      def initialize # rubocop:disable Lint/MissingSuper
         reset
         @filter = false
       end
@@ -232,8 +233,9 @@ module Appium
             "#{string}  #{attr[0]}: #{attr1}\n"
           end
 
-          r.concat "\n#{name}\n#{attr_string}" unless attr_string.nil? || attr_string.empty?
-          r
+          return r if attr_string.nil? || attr_string.empty?
+
+          "#{r}\n#{name}\n#{attr_string}"
         end
       end
 

data/lib/appium_lib/common/wait.rb

@@ -42,10 +42,10 @@ module Appium
     #     wait_true(20) { button_exact('Back') }.click
     #
     def wait_true(opts = {})
-      opts = opts.is_a?(Numeric) ? { timeout: opts } : opts
+      opts = { timeout: opts } if opts.is_a? Numeric
 
       if opts.is_a? Hash
-        opts.empty? ? @core.wait_true { yield } : @core.wait_true(opts) { yield }
+        opts.empty? ? @core.wait_true { yield } : @core.wait_true(**opts) { yield }
       else
         ::Appium::Logger.warn('Arguments should be Hash like {timeout: 100}')
       end
@@ -71,8 +71,7 @@ module Appium
     #     wait(20) { button_exact('Back') }.click
     #
     def wait(opts = {})
-      opts = opts.is_a?(Numeric) ? { timeout: opts } : opts
-
+      opts = { timeout: opts } if opts.is_a? Numeric
       if opts.is_a? Hash
         opts.empty? ? @core.wait { yield } : @core.wait(**opts) { yield }
       else

data/lib/appium_lib/driver.rb

@@ -151,21 +151,12 @@ module Appium
     # @param opts [Object] A hash containing various options.
     # @param global_driver [Bool] A bool require global driver before initialize.
     # @return [Driver]
-    def initialize(opts = {}, global_driver = nil)
-      # TODO: set `global_driver = false` by default in the future.
+    def initialize(opts = {}, global_driver = false)
       # Capybara can't put `global_driver` as the 2nd argument.
       global_driver = opts.delete :global_driver if global_driver.nil?
 
-      if global_driver.nil?
-        warn '[DEPRECATION] Appium::Driver.new(opts) will not generate global driver by default.' \
-                 'If you would like to generate the global driver dy default, ' \
-                 'please initialise driver with Appium::Driver.new(opts, true)'
-        global_driver = true # if global_driver is nil, then global_driver must be default value.
-      end
+      $driver&.driver_quit if global_driver
 
-      if global_driver
-        $driver.driver_quit if $driver
-      end
       raise 'opts must be a hash' unless opts.is_a? Hash
 
       @core = ::Appium::Core.for(opts)
@@ -277,7 +268,6 @@ module Appium
 
     # Returns a hash of the driver attributes
     def driver_attributes
-      # rubocop:disable Layout/AlignHash
       {
         caps:                @core.caps,
         automation_name:     @core.automation_name,
@@ -295,7 +285,6 @@ module Appium
         wait_timeout:        @core.wait_timeout,
         wait_interval:       @core.wait_interval
       }
-      # rubocop:enable Layout/AlignHash
     end
 
     def device_is_android?
@@ -328,27 +317,7 @@ module Appium
       !@core.automation_name.nil? && @core.automation_name == :xcuitest
     end
 
-    # Get the dialect value whether current driver is OSS or W3C
-    #
-    # @return [:oss | :w3c]
-    #
-    #  @example
-    #
-    #      if dialect == :w3c
-    #        driver.action
-    #              .move_to_location(500, 500).pointer_down(:left)
-    #              .move_to_location(0, 700)
-    #              .release.perform
-    #      else
-    #        action = TouchAction.new(driver).press(x: 500, y: 500).move_to(500, 700).release
-    #        action.perform
-    #      end
-    #
-    def dialect
-      @driver.dialect
-    end
-
-    # An entry point to chain W3C actions. Returns `TouchAction.new` if it works as MJSONWP instead of W3C action.
+    # An entry point to chain W3C actions
     # Read https://www.rubydoc.info/github/appium/ruby_lib_core/Appium/Core/Base/Bridge/W3C#action-instance_method
     #
     # @return [TouchAction|Selenium::WebDriver::PointerActions]
@@ -359,12 +328,7 @@ module Appium
     #     action.click(element).perform # The `click` is a part of `PointerActions`
     #
     def action
-      if @driver.dialect != :w3c
-        ::Appium::Logger.info('Calls TouchAction instead of W3C actions for MJSONWP module')
-        TouchAction.new($driver || @driver)
-      else
-        @driver.action
-      end
+      @driver.action
     end
 
     # Returns the server's version info
@@ -426,14 +390,12 @@ module Appium
       return app_path if app_path =~ URI::DEFAULT_PARSER.make_regexp # public URL for Sauce
 
       absolute_app_path = File.expand_path app_path
-      app_path = if File.exist? absolute_app_path
-                   absolute_app_path
-                 else
-                   ::Appium::Logger.info("Use #{app_path}")
-                   app_path
-                 end
-
-      app_path
+      if File.exist? absolute_app_path
+        absolute_app_path
+      else
+        ::Appium::Logger.info("Use #{app_path}")
+        app_path
+      end
     end
 
     # Get the server url

data/lib/appium_lib/ios/common/helper.rb

@@ -49,6 +49,7 @@ module Appium
         puts "   visible: #{visible}" if visible
       end
     end
+
     # iOS only. On Android uiautomator always returns an empty string for EditText password.
     #
     # Password character returned from value of UIASecureTextField
@@ -76,7 +77,7 @@ module Appium
       source = get_source
 
       # current_context may be nil which breaks start_with
-      if current_context && current_context.start_with?('WEBVIEW')
+      if current_context&.start_with?('WEBVIEW')
         parser = @android_html_parser ||= Nokogiri::HTML::SAX::Parser.new(Appium::Common::HTMLElements.new)
         parser.document.reset
         parser.document.filter = class_name
@@ -470,7 +471,7 @@ module Appium
       # will be present.
       _validate_object opts[:name], opts[:label], opts[:value]
 
-      # note that mainWindow is sometimes nil so it's passed as a param
+      # NOTE: that mainWindow is sometimes nil so it's passed as a param
       # $._elementOrElementsByType will validate that the window isn't nil
       element_or_elements_by_type = <<-JS
         (function() {

data/lib/appium_lib/ios/xcuitest/command/gestures.rb

@@ -24,7 +24,7 @@ module Appium
         #   ```
         def swipe(direction:, element: nil)
           args = { direction: direction }
-          args[:element] = element.ref if element
+          args[:element] = element.id if element
 
           @driver.execute_script 'mobile: swipe', args
         end
@@ -47,7 +47,7 @@ module Appium
           return 'Set "up", "down", "left" or "right" for :direction' unless %w(up down left right).include?(direction)
 
           args = { direction: direction }
-          args[:element] = element.ref if element
+          args[:element] = element.id if element
           args[:distance] = distance if distance
           args[:name] = name if name
           args[:toVisible] = to_visible if to_visible
@@ -66,7 +66,7 @@ module Appium
         #   ```
         def pinch(scale:, velocity: 1.0, element: nil)
           args = { scale: scale, velocity: velocity }
-          args[:element] = element.ref if element
+          args[:element] = element.id if element
 
           @driver.execute_script 'mobile: pinch', args
         end
@@ -79,10 +79,10 @@ module Appium
         #   double_tap x: 100, y: 100
         #   double_tap element: find_element(:accessibility_id, "some item")
         #   ```
-        def double_tap(x: nil, y: nil, element: nil) # rubocop:disable Naming/UncommunicativeMethodParamName
+        def double_tap(x: nil, y: nil, element: nil)
           return 'Set x, y or element' if (x.nil? || y.nil?) && element.nil?
 
-          args = element.nil? ? { x: x, y: y } : { element: element.ref }
+          args = element.nil? ? { x: x, y: y } : { element: element.id }
           @driver.execute_script 'mobile: doubleTap', args
         end
 
@@ -96,10 +96,10 @@ module Appium
         #   touch_and_hold x: 100, y: 100, duration: 2.0
         #   touch_and_hold element: find_element(:accessibility_id, "some item")
         #   ```
-        def touch_and_hold(x: nil, y: nil, element: nil, duration: 1.0) # rubocop:disable Naming/UncommunicativeMethodParamName
+        def touch_and_hold(x: nil, y: nil, element: nil, duration: 1.0)
           return 'Set x, y or element' if (x.nil? || y.nil?) && element.nil?
 
-          args = element.nil? ? { x: x, y: y } : { element: element.ref }
+          args = element.nil? ? { x: x, y: y } : { element: element.id }
           args[:duration] = duration
           @driver.execute_script 'mobile: touchAndHold', args
         end
@@ -110,7 +110,7 @@ module Appium
         #   two_finger_tap element: find_element(:accessibility_id, "some item")
         #   ```
         def two_finger_tap(element:)
-          args = { element: element.ref }
+          args = { element: element.id }
           @driver.execute_script 'mobile: twoFingerTap', args
         end
 
@@ -121,12 +121,12 @@ module Appium
         #   Otherwise they should be calculated relatively to screen borders.
         #
         #   ```ruby
-        #   tap x: 100, y: 100
-        #   tap x: 100, y: 100, element: find_element(:accessibility_id, "some item")
+        #   one_finger_tap x: 100, y: 100
+        #   one_finger_tap x: 100, y: 100, element: find_element(:accessibility_id, "some item")
         #   ```
-        def tap(x:, y:, element: nil) # rubocop:disable Naming/UncommunicativeMethodParamName
+        def one_finger_tap(x:, y:, element: nil)
           args = { x: x, y: y }
-          args[:element] = element.ref if element
+          args[:element] = element.id if element
           @driver.execute_script 'mobile: tap', args
         end
 
@@ -146,7 +146,7 @@ module Appium
         #   ```
         def drag_from_to_for_duration(from_x:, from_y:, to_x:, to_y:, duration: 1.0, element: nil)
           args = { fromX: from_x, fromY: from_y, toX: to_x, toY: to_y, duration: duration }
-          args[:element] = element.ref if element
+          args[:element] = element.id if element
           @driver.execute_script 'mobile: dragFromToForDuration', args
         end
         # rubocop:enable Metrics/ParameterLists
@@ -164,7 +164,7 @@ module Appium
         def select_picker_wheel(element:, order:, offset: nil)
           return 'Set "next" or "previous" for :order' unless %w(next previous).include?(order)
 
-          args = { element: element.ref, order: order }
+          args = { element: element.id, order: order }
           args[:offset] = offset if offset
           @driver.execute_script 'mobile: selectPickerWheelValue', args
         end

data/lib/appium_lib/ios/xcuitest/command/multi_app_handler.rb

@@ -33,8 +33,7 @@ module Appium
         #     xcuitest_install_app(app: "path/to/app.app")
         #
         def xcuitest_install_app(app:)
-          args = { app: app }
-          @driver.execute_script 'mobile: installApp', args
+          @driver.install_app app
         end
 
         # Verifies whether the application with given bundle identifier is installed on the device.
@@ -47,8 +46,7 @@ module Appium
         #     xcuitest_app_installed?(bundle_id: "io.appium.bundle") #=> true or false
         #
         def xcuitest_app_installed?(bundle_id:)
-          args = { bundleId: bundle_id }
-          @driver.execute_script 'mobile: isAppInstalled', args
+          @driver.app_installed? bundle_id
         end
 
         # Uninstalls an existing application from the device under test. This endpoint does not verify
@@ -62,8 +60,7 @@ module Appium
         #     xcuitest_remove_app(bundle_id: "io.appium.bundle") #=> 1
         #
         def xcuitest_remove_app(bundle_id:)
-          args = { bundleId: bundle_id }
-          @driver.execute_script 'mobile: removeApp', args
+          @driver.remove_app bundle_id
         end
 
         # Executes an existing application on the device. If the application is already running then
@@ -92,8 +89,7 @@ module Appium
         #     xcuitest_terminate_app(bundle_id: "io.appium.bundle") #=> 1
         #
         def xcuitest_terminate_app(bundle_id:)
-          args = { bundleId: bundle_id }
-          @driver.execute_script 'mobile: terminateApp', args
+          @driver.terminate_app bundle_id
         end
 
         # Get the status of an existing application on the device.
@@ -114,8 +110,7 @@ module Appium
         #     xcuitest_query_app_status(bundle_id: "io.appium.bundle") #=> 1
         #
         def xcuitest_query_app_status(bundle_id:)
-          args = { bundleId: bundle_id }
-          @driver.execute_script 'mobile: queryAppState', args
+          @driver.app_state bundle_id
         end
 
         # Activates an existing application on the device under test and moves it to the foreground.
@@ -130,8 +125,7 @@ module Appium
         #     xcuitest_activate_app(bundle_id: "io.appium.bundle") #=> 1
         #
         def xcuitest_activate_app(bundle_id:)
-          args = { bundleId: bundle_id }
-          @driver.execute_script 'mobile: activateApp', args
+          @driver.activate_app bundle_id
         end
       end
     end # module Xcuitest

data/lib/appium_lib/ios/xcuitest/helper.rb

@@ -74,7 +74,7 @@ module Appium
           c_names = class_names.map { |class_name| %(type == "#{class_name}") }.join(' || ')
 
           predicate = if value
-                        %((#{c_names}) && (name contains[c] "#{value}" || label contains[c] "#{value}" || value contains[c] "#{value}")) # rubocop:disable Metrics/LineLength
+                        %((#{c_names}) && (name contains[c] "#{value}" || label contains[c] "#{value}" || value contains[c] "#{value}")) # rubocop:disable Layout/LineLength
                       else
                         c_names
                       end

data/lib/appium_lib/ios/xcuitest.rb

@@ -15,7 +15,6 @@
 require_relative 'xcuitest/element'
 require_relative 'xcuitest/command'
 require_relative 'xcuitest/helper'
-require_relative 'xcuitest/element'
 require_relative 'xcuitest/bridge'
 
 module Appium

data/lib/appium_lib/version.rb

@@ -14,6 +14,6 @@
 
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '10.6.0' unless defined? ::Appium::VERSION
-  DATE    = '2020-04-03' unless defined? ::Appium::DATE
+  VERSION = '12.0.0.rc1' unless defined? ::Appium::VERSION
+  DATE    = '2021-10-15' unless defined? ::Appium::DATE
 end