testa_appium_driver 0.1.7 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dadb5244c71161bcdf995e9b057951ee4a5e979be496e65e828f7188baa85dc
-  data.tar.gz: bd5d23887285a260d5231525ad09d42f33219ac655432a74ba044b9b57805647
+  metadata.gz: 1c55e4e3d29193b3bc89ea292de2c36d093897208050494204da865ea4902d6c
+  data.tar.gz: 35014def9a47f5fcfb1242cd1c897a4c13add7f1e9359b66170c2057aa450e3c
 SHA512:
-  metadata.gz: 463e52be3a9a6764bbcbc068a46cb0cdc5f6ff41e0651cd95b9bc26da6b2210ba8c90f6651e8f6a153b76b0d173905a8d4a3a3d8b68055ea1e07653af3f4ecf1
-  data.tar.gz: 7b6ba6de823bbfcc993e712fe11f846cabd3e263b63a23ebfab5bc08c980eeee2c27c9ed0b85690505ed1441e137b3495661a65ecec81db1c6bd8d3755de6638
+  metadata.gz: 3562a893791f45303d3cf4cbb3d2b1d1510122ae296e9fb257ce25bd83a9388efacd69ebc9e149219fc5a02fc42f80a9c05f0be72241909b6cd142abfec48e8b
+  data.tar.gz: 741a8b9d2b1683484e0100d01c53966d63f9eeacb19ca188589e32b62990ee1cc822d8306e6e23baf34f93ac0a34b929ce5342fdbe1d4a80f3be0e87acf7d28c

data/.idea/deployment.xml

@@ -12,7 +12,7 @@
       <paths name="testa.fun">
         <serverdata>
           <mappings>
-            <mapping deploy="/testa_docker/path_data/testa_appium_driver" local="$PROJECT_DIR$" web="/" />
+            <mapping local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>

data/lib/testa_appium_driver/android/locator/attributes.rb

@@ -7,7 +7,6 @@ module TestaAppiumDriver
 
       @driver = get_driver if self.instance_of?(Selenium::WebDriver::Element)
 
-      @driver.disable_wait_for_idle
       if elements.kind_of?(Selenium::WebDriver::Element)
         r = elements.send(:attribute, name.to_s)
         r = TestaAppiumDriver::Bounds.from_android(r, @driver) if name.to_s == "bounds"
@@ -15,7 +14,6 @@ module TestaAppiumDriver
         r = elements.map { |e| e.send(:attribute, name.to_s) }
         r.map! { |b| TestaAppiumDriver::Bounds.from_android(b, @driver) } if name.to_s == "bounds"
       end
-      @driver.enable_wait_for_idle
       r
     end
 
@@ -110,7 +108,7 @@ module TestaAppiumDriver
       children = self.dup.parent.children.execute
       index = children.index(this)
       raise "Index not found" if index.nil?
-      index
+      index.to_i
     end
   end
 end

data/lib/testa_appium_driver/android/locator.rb

@@ -106,7 +106,7 @@ module TestaAppiumDriver
       end
 
       if is_scrollable_selector?(selectors, single)
-        locator.scrollable_locator = self
+        locator.scrollable_locator = locator
         if selectors[:class] == "android.widget.HorizontalScrollView"
           locator.scrollable_locator.scroll_orientation = :horizontal
         else

data/lib/testa_appium_driver/android/scroll_actions/uiautomator_scroll_actions.rb

@@ -38,7 +38,6 @@ module TestaAppiumDriver
 
 
     def uiautomator_page_or_fling(type, direction)
-
       scrollable_selector = @scrollable.ui_selector(false)
       orientation = direction == :up || direction == :down ? ".setAsVerticalList()" : ".setAsHorizontalList()"
       if type == SCROLL_ACTION_TYPE_SCROLL

data/lib/testa_appium_driver/common/constants.rb

@@ -7,6 +7,7 @@ module TestaAppiumDriver
   FIND_STRATEGY_ID = :id
   FIND_STRATEGY_NAME = :name
   FIND_STRATEGY_IMAGE = :image
+  FIND_STRATEGY_CLASS_CHAIN = :class_chain
 
   SCROLL_STRATEGY_UIAUTOMATOR = :uiautomator
   SCROLL_STRATEGY_W3C = :w3c

data/lib/testa_appium_driver/common/helpers.rb

@@ -157,6 +157,33 @@ module TestaAppiumDriver
       command
     end
 
+
+    def hash_to_class_chain(hash, single = true)
+      command = "**/"
+
+      hash[:type] = hash[:class] unless hash[:class].nil?
+      hash[:label] = hash[:text] unless hash[:text].nil?
+      hash[:name] = hash[:id] unless hash[:id].nil?
+      if hash[:type] && hash[:type].kind_of?(String)
+        command = "#{ command }#{hash[:type] }"
+      else
+        command = "#{command}*"
+      end
+
+      command = "#{ command }[`enabled == #{ hash[:enabled] }`]" unless hash[:enabled].nil?
+      command = "#{ command }[`label == \"#{ %(#{hash[:label] }) }\"`]" if hash[:label] && hash[:label].kind_of?(String)
+      command = "#{ command }[`label CONTAINS \"#{ %(#{hash[:label].source }) }\"`]" if hash[:label] && hash[:label].kind_of?(Regexp)
+      command = "#{ command }[`name == \"#{ %(#{hash[:name] }) }\"`]" if hash[:name] && hash[:name].kind_of?(String)
+      command = "#{ command }[`name CONTAINS \"#{ %(#{hash[:name].source }) }\"`]" if hash[:name] && hash[:name].kind_of?(Regexp)
+      command = "#{ command }[`value == \"#{ %(#{hash[:value] }) }\"`]" if hash[:value] && hash[:value].kind_of?(String)
+      command = "#{ command }[`value CONTAINS \"#{ %(#{hash[:value].source }) }\"`]" if hash[:value] && hash[:value].kind_of?(Regexp)
+      command = "#{ command }[`visible == #{ hash[:visible] }`]" unless hash[:visible].nil?
+
+      command += "[1]" if single
+
+      command
+    end
+
     # check if selectors are for a scrollable element
     # @param [Boolean] single should the command return first instance or all of matched elements
     # @param [Hash] selectors for fetching elements

data/lib/testa_appium_driver/common/locator/scroll_actions.rb

@@ -70,6 +70,7 @@ module TestaAppiumDriver
     # The retry mechanism allows alignment even for dynamic layouts when elements are hidden/show when scrolling to certain direction
     # @return [TestaAppiumDriver::Locator]
     def align(with = :top, top: nil, bottom: nil, right: nil, left: nil, scroll_to_find: false)
+      deadzone = _process_deadzone(top, bottom, right, left)
       deadzone = @scrollable_locator.scroll_deadzone if deadzone.nil? && !@scrollable_locator.nil?
       sa = ScrollActions.new(@scrollable_locator,
                              locator: self,
@@ -289,7 +290,7 @@ module TestaAppiumDriver
         x = to[:x]
         y = to[:y]
       end
-      _drag_to(x, y)
+      _drag_to(bounds.center.x, bounds.center.y, x, y)
     end
 
     def drag_by(amount, direction: :top)
@@ -308,7 +309,7 @@ module TestaAppiumDriver
       else
         raise "Unknown direction #{direction}"
       end
-      _drag_to(x, y)
+      _drag_to(b.center.x, b.center.y, x, y)
     end
 
 
@@ -326,11 +327,11 @@ module TestaAppiumDriver
       deadzone
     end
 
-    def _drag_to(x, y)
+    def _drag_to(x0, y0, x1, y1)
       sa = ScrollActions.new(@scrollable_locator,
                              locator: self,
                              default_scroll_strategy: @default_scroll_strategy)
-      sa.drag_to(x, y)
+      sa.drag_to(x0, y0, x1, y1)
       self
     end
 

data/lib/testa_appium_driver/common/locator.rb

@@ -133,13 +133,12 @@ module TestaAppiumDriver
 
 
 
-      r = @driver.execute(@from_element, @single, strategies_and_selectors, skip_cache, ignore_implicit_wait)
+      r = @driver.execute(@from_element, @single, strategies_and_selectors, skip_cache: skip_cache, ignore_implicit_wait: ignore_implicit_wait)
       r = r[@index_for_multiple] if !@index_for_multiple.nil? && !@single
       r
     end
 
     def when_exists(timeout = nil, &block)
-      timeout = @driver.get_timeouts["implicit"] / 1000 if timeout.nil?
       found = false
       begin
         wait_until_exists(timeout)
@@ -161,7 +160,6 @@ module TestaAppiumDriver
     # @param [Integer] timeout in seconds
     # @return [TestaAppiumDriver::Locator]
     def wait_until_exists(timeout = nil)
-      timeout = @driver.get_timeouts["implicit"] / 1000 if timeout.nil?
       args = {timeout: timeout}
       _wait(:until, args)
     end
@@ -170,7 +168,6 @@ module TestaAppiumDriver
     # @param [Integer] timeout in seconds
     # @return [TestaAppiumDriver::Locator]
     def wait_while_exists(timeout = nil)
-      timeout = @driver.get_timeouts["implicit"] / 1000 if timeout.nil?
       args = {timeout: timeout}
       _wait(:while, args)
     end
@@ -221,13 +218,20 @@ module TestaAppiumDriver
 
     def [](instance)
       raise "Cannot add index selector to non-Array" if @single
-      if ((@strategy.nil? && !@last_selector_adjacent) || @strategy == FIND_STRATEGY_UIAUTOMATOR) && instance >= 0
+      if ((@strategy.nil? && !@last_selector_adjacent && @driver.device == :android) || @strategy == FIND_STRATEGY_UIAUTOMATOR) && instance >= 0
         locator = self.dup
         locator.strategy = FIND_STRATEGY_UIAUTOMATOR
         locator.ui_selector = "#{@ui_selector}.instance(#{instance})"
         locator.single = true
         locator.can_use_id_strategy = false
         locator
+      elsif (@driver.device == :ios && !@last_selector_adjacent && @strategy.nil?) || @strategy == FIND_STRATEGY_CLASS_CHAIN
+        locator = self.dup
+        locator.strategy = FIND_STRATEGY_CLASS_CHAIN
+        locator.class_chain_selector += "[#{instance + 1}]"
+        locator.single = true
+        locator.can_use_id_strategy = false
+        locator
       else
         from_element = self.dup
         from_element.index_for_multiple = instance
@@ -262,10 +266,8 @@ module TestaAppiumDriver
           strategy: @strategy,
           default_strategy: @default_find_strategy,
           single: @single,
-          context: @from_element.nil? ? nil : @from_element.to_s,
           uiautomator: defined?(self.ui_selector) ? ui_selector : nil,
           xpath: @xpath_selector,
-          scrollable: @scrollable_locator.nil? ? nil : @scrollable_locator.to_s,
           scroll_orientation: @scroll_orientation,
           resolved: strategies_and_selectors,
           index_for_multiple: @index_for_multiple
@@ -301,12 +303,56 @@ module TestaAppiumDriver
     end
 
 
-    def tap
-      click
+    def tap(x = nil, y = nil)
+      click(x, y)
     end
 
-    def click
-      perform_driver_method(:click)
+    # if both x or y, or both are not given, will click in the center of the element
+    # @param x If positive integer, will offset the click from the left side, if negative integer, will offset the click  from the right. If float value is given, it will threat it as percentage offset, giving it 0.5 will click in the middle
+    # @param y If positive integer, will offset the click from the bottom side, if negative integer, will offset the click  from the top. If float value is given, it will threat it as percentage offset, giving it 0.5 will click in the middle
+    def click(x = nil, y = nil)
+      if !x.nil? && !y.nil?
+
+        b = self.bounds
+        if x.kind_of? Integer
+          if x >= 0
+            x = b.top_left.x + x
+          else
+            x = b.bottom_right.x + x
+          end
+        elsif x.kind_of? Float
+          x = b.top_left.x + b.width*x
+        else
+          raise "x value #{x} not supported"
+        end
+
+        if y.kind_of? Integer
+          if y >= 0
+            y = b.bottom_right.y + y
+          else
+            y = b.top_left + y
+          end
+        elsif y.kind_of? Float
+          y = b.bottom_right.y + b.height*y
+        end
+
+        action_builder = @driver.action
+        f1 = action_builder.add_pointer_input(:touch, "finger1")
+        f1.create_pointer_move(duration: 0, x: x, y: y, origin: ::Selenium::WebDriver::Interactions::PointerMove::VIEWPORT)
+        f1.create_pointer_down(:left)
+        f1.create_pointer_up(:left)
+        @driver.perform_actions [f1]
+      else
+        if @driver.device == :android
+          perform_driver_method(:click)
+        else
+          # on ios, if element is not visible, first click will scroll to it
+          # then on second click actually perform the click
+          visible = visible?
+          perform_driver_method(:click)
+          perform_driver_method(:click) unless visible rescue nil
+        end
+      end
     end
 
     def send_key(*args)
@@ -336,15 +382,20 @@ module TestaAppiumDriver
     # @return [TestaAppiumDriver::Locator]
     def children
       raise "Cannot add children selector to array" unless @single
-      raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "children") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
+      raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "children") if @strategy != FIND_STRATEGY_XPATH &&  @strategy != FIND_STRATEGY_CLASS_CHAIN && !@strategy.nil?
 
       locator = self.dup
-      locator.strategy = FIND_STRATEGY_XPATH
       locator.strategy_reason = "children"
       locator.xpath_selector += "/*"
       locator.single = false
       locator.last_selector_adjacent = true
       locator.can_use_id_strategy = false
+
+      if @driver.device == :android
+        locator.strategy = FIND_STRATEGY_XPATH
+      else
+        locator.class_chain_selector += "/*"
+      end
       locator
     end
 
@@ -353,14 +404,20 @@ module TestaAppiumDriver
     # @return [TestaAppiumDriver::Locator]
     def child
       raise "Cannot add children selector to array" unless @single
-      raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "child") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
+      raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "child") if @strategy != FIND_STRATEGY_XPATH && @strategy != FIND_STRATEGY_CLASS_CHAIN && !@strategy.nil?
 
       locator = self.dup
-      locator.strategy = FIND_STRATEGY_XPATH
+
       locator.strategy_reason = "child"
       locator.xpath_selector += "/*[1]"
       locator.single = true
       locator.can_use_id_strategy = false
+
+      if @driver.device == :android
+        locator.strategy = FIND_STRATEGY_XPATH
+      else
+        locator.class_chain_selector += "/*[1]"
+      end
       locator
     end
 
@@ -461,7 +518,8 @@ module TestaAppiumDriver
       message = args[:message] unless args[:message].nil?
 
       if args[:timeout].nil?
-        timeout = @driver.get_timeouts["implicit"] / 1000
+        #timeout = @driver.get_timeouts["implicit"] / 1000
+        timeout = 10
       else
         timeout = args[:timeout]
       end

data/lib/testa_appium_driver/common/scroll_actions/w3c_scroll_actions.rb

@@ -23,6 +23,7 @@ module TestaAppiumDriver
         until is_end_of_scroll?
           matches = @locator.execute(skip_cache: true)
           matches.each_with_index do |m|
+            next if elements.include?(m)
             elements << m
             if block_given? # block is given
               block.call(m) # use call to execute the block
@@ -228,10 +229,8 @@ module TestaAppiumDriver
 
 
 
-    def w3c_drag_to(x, y)
-      x0 = @bounds.center.x
-      y0 = @bounds.center.y
-      w3c_action(x0, y0, x, y, SCROLL_ACTION_TYPE_DRAG)
+    def w3c_drag_to(x0, y0, x1, y1)
+      w3c_action(x0, y0, x1, y1, SCROLL_ACTION_TYPE_DRAG)
     end
 
   end

data/lib/testa_appium_driver/common/scroll_actions.rb

@@ -1,7 +1,6 @@
 require_relative 'scroll_actions/json_wire_scroll_actions'
 require_relative 'scroll_actions/w3c_scroll_actions'
 
-
 module TestaAppiumDriver
 
   # Class for handling scroll actions
@@ -21,7 +20,6 @@ module TestaAppiumDriver
       @default_scroll_strategy = params[:default_scroll_strategy]
       @driver = @locator.driver
 
-
       if @scrollable.nil?
         # if we dont have a scrollable element or if we do have it, but it is not compatible with uiautomator
         # then find first scrollable in document
@@ -30,16 +28,14 @@ module TestaAppiumDriver
 
       @strategy = nil
       if @scrollable.strategy == FIND_STRATEGY_XPATH || # uiautomator cannot resolve scrollable from a xpath locator
-          !@deadzone.nil? ||
-          !@scrollable.from_element.instance_of?(TestaAppiumDriver::Driver) # uiautomator cannot resolve nested scrollable
+        !@deadzone.nil? ||
+        !@scrollable.from_element.instance_of?(TestaAppiumDriver::Driver) # uiautomator cannot resolve nested scrollable
         @strategy = SCROLL_STRATEGY_W3C
       end
 
-
       @bounds = @scrollable.bounds
     end
 
-
     def align(with, scroll_to_find)
       w3c_align(with, scroll_to_find)
       @locator
@@ -66,7 +62,6 @@ module TestaAppiumDriver
       w3c_each(:left, &block)
     end
 
-
     def resolve_strategy
       if @strategy.nil?
         @default_scroll_strategy
@@ -75,7 +70,6 @@ module TestaAppiumDriver
       end
     end
 
-
     def scroll_to
       if @locator.strategy != FIND_STRATEGY_XPATH && resolve_strategy == SCROLL_STRATEGY_UIAUTOMATOR
         uiautomator_scroll_to
@@ -116,7 +110,6 @@ module TestaAppiumDriver
       end
     end
 
-
     def page_down
       if resolve_strategy == SCROLL_STRATEGY_UIAUTOMATOR
         uiautomator_page_or_fling(SCROLL_ACTION_TYPE_SCROLL, :down)
@@ -149,10 +142,10 @@ module TestaAppiumDriver
       end
     end
 
-
     def scroll_to_start
       if resolve_strategy == SCROLL_STRATEGY_UIAUTOMATOR
         uiautomator_scroll_to_start_or_end(:start)
+
       elsif resolve_strategy == SCROLL_STRATEGY_W3C
         w3c_scroll_to_start_or_end(:start)
       end
@@ -198,11 +191,10 @@ module TestaAppiumDriver
       end
     end
 
-    def drag_to(x, y)
-      w3c_drag_to(x, y)
+    def drag_to(x0, y0, x1, y1)
+      w3c_drag_to(x0, y0, x1, y1)
     end
 
-
     private
 
     def is_end_of_scroll?
@@ -211,7 +203,6 @@ module TestaAppiumDriver
       old_elements == @previous_elements
     end
 
-
     def default_deadzone!
       @deadzone = {} if @deadzone.nil?
       if @deadzone[:top].nil?

data/lib/testa_appium_driver/driver.rb

@@ -29,9 +29,6 @@ module TestaAppiumDriver
     def initialize(opts = {})
       @testa_opts = opts[:testa_appium_driver] || {}
 
-      @wait_for_idle_disabled = false
-      @implicit_wait_disabled = false
-
       core = Appium::Core.for(opts)
       extend_for(core.device, core.automation_name)
       @device = core.device
@@ -43,6 +40,9 @@ module TestaAppiumDriver
       invalidate_cache
 
 
+      disable_wait_for_idle
+      disable_implicit_wait
+
       Selenium::WebDriver::Element.set_driver(self, opts[:caps][:udid])
     end
 
@@ -69,11 +69,9 @@ module TestaAppiumDriver
     # @param [Array<Hash>] strategies_and_selectors array of usable strategies and selectors
     # @param [Boolean] skip_cache to skip checking and storing cache
     # @return [Selenium::WebDriver::Element, Array] element is returned if single is true, array otherwise
-    def execute(from_element, single, strategies_and_selectors, skip_cache = false, ignore_implicit_wait = false)
+    def execute(from_element, single, strategies_and_selectors, skip_cache: false, ignore_implicit_wait: false)
 
       # if user wants to wait for element to exist, he can use wait_until_present
-      disable_wait_for_idle
-      disable_implicit_wait
       start_time = Time.now.to_f
       ss_index = 0
 
@@ -126,15 +124,13 @@ module TestaAppiumDriver
           puts "Using cache from #{@cache[:time].strftime("%H:%M:%S.%L")}, strategy: #{@cache[:strategy]}"
         end
       rescue => e
-        if (start_time + @implicit_wait_ms/1000 < Time.now.to_f && !ignore_implicit_wait) || ss_index < strategies_and_selectors.count
+        #if (start_time + @implicit_wait_ms/1000 < Time.now.to_f && !ignore_implicit_wait) || ss_index < strategies_and_selectors.count
+        if ss_index < strategies_and_selectors.count
           sleep EXISTS_WAIT if ss_index >= strategies_and_selectors.count
           retry
         else
           raise e
         end
-      ensure
-        enable_implicit_wait
-        enable_wait_for_idle
       end
 
       execute_result
@@ -151,43 +147,23 @@ module TestaAppiumDriver
 
     # disables implicit wait
     def disable_implicit_wait
-      unless @implicit_wait_disabled
-        @implicit_wait_ms = @driver.get_timeouts["implicit"]
+        @implicit_wait_ms = @driver.get_timeouts["implicit"].to_i
+        @implicit_wait_ms = @implicit_wait_ms/1000 if @implicit_wait_ms > 100000
         @implicit_wait_uiautomator_ms = @driver.get_settings["waitForSelectorTimeout"]
         @driver.manage.timeouts.implicit_wait = 0
-        @driver.update_settings({waitForSelectorTimeout: 0})
-        @implicit_wait_disabled = true
-      end
+        @driver.update_settings({waitForSelectorTimeout: 1})
     end
 
-    # enables implicit wait, can be called only after disabling implicit wait
-    def enable_implicit_wait
-      raise "Implicit wait is not disabled" unless @implicit_wait_disabled
-      # get_timeouts always returns in milliseconds, but we should set in seconds
-      @driver.manage.timeouts.implicit_wait = @implicit_wait_ms / 1000
-      @driver.update_settings({waitForSelectorTimeout: @implicit_wait_uiautomator_ms})
-      @implicit_wait_disabled = false
-    end
 
     # disables wait for idle, only executed for android devices
     def disable_wait_for_idle
-      unless @wait_for_idle_disabled
-        if @device == :android
-          @wait_for_idle_timeout = @driver.settings.get["waitForIdleTimeout"]
-          @driver.update_settings({waitForIdleTimeout: 0})
-        end
-        @wait_for_idle_disabled = true
-      end
-    end
-
-    # enables wait for idle, only executed for android devices
-    def enable_wait_for_idle
       if @device == :android
-        raise "Wait for idle is not disabled" unless @wait_for_idle_disabled
-        @driver.update_settings({waitForIdleTimeout: @wait_for_idle_timeout})
+        @wait_for_idle_timeout = @driver.settings.get["waitForIdleTimeout"]
+        @driver.update_settings({waitForIdleTimeout: 1})
       end
     end
 
+
     def set_find_by_image_settings(settings)
       settings.delete(:image)
       @default_find_image_settings = {}
@@ -233,6 +209,33 @@ module TestaAppiumDriver
       @driver.hide_keyboard
     end
 
+    def home_key
+      @driver.press_keycode(3)
+    end
+    def tab_key
+      @driver.press_keycode(61)
+    end
+
+    def dpad_up_key
+      @driver.press_keycode(19)
+    end
+
+    def dpad_down_key
+      @driver.press_keycode(20)
+    end
+
+    def dpad_right_key
+      @driver.press_keycode(22)
+    end
+
+    def dpad_left_key
+      @driver.press_keycode(23)
+    end
+
+    def enter_key
+      @driver.press_keycode(66)
+    end
+
     def press_keycode(code)
       @driver.press_keycode(code)
     end
@@ -241,16 +244,42 @@ module TestaAppiumDriver
       @driver.long_press_keycode(code)
     end
 
+    def click(x, y)
+      ws = driver.window_size
+      window_width = ws.width.to_i
+      window_height = ws.height.to_i
+      if x.kind_of? Integer
+        if x < 0
+          x = window_width + x
+        end
+      elsif x.kind_of? Float
+        x = window_width*x
+      else
+        raise "x value #{x} not supported"
+      end
+
+      if y.kind_of? Integer
+        if y < 0
+          y = window_height + y
+        end
+      elsif y.kind_of? Float
+        y = window_height*y
+      end
+
+
+      action_builder = @driver.action
+      f1 = action_builder.add_pointer_input(:touch, "finger1")
+      f1.create_pointer_move(duration: 0, x: x, y: y, origin: ::Selenium::WebDriver::Interactions::PointerMove::VIEWPORT)
+      f1.create_pointer_down(:left)
+      f1.create_pointer_up(:left)
+      @driver.perform_actions [f1]
+    end
 
 
 
     # @return [Array<Selenium::WebDriver::Element] array of 2 elements, the first element without children and the last element without children in the current page
     def first_and_last_leaf(from_element = @driver)
-      disable_wait_for_idle
-      disable_implicit_wait
       elements = from_element.find_elements(xpath: "//*[not(*)]")
-      enable_implicit_wait
-      enable_wait_for_idle
       return nil if elements.count == 0
       [elements[0], elements[-1]]
     end

data/lib/testa_appium_driver/ios/locator.rb

@@ -3,6 +3,7 @@ require_relative 'locator/attributes'
 module TestaAppiumDriver
   class Locator
     include TypeSelectors
+    attr_accessor :class_chain_selector
 
     def init(params, selectors, single)
       if is_scrollable_selector?(selectors, single)
@@ -19,6 +20,9 @@ module TestaAppiumDriver
         params[:scrollable_locator] = self.dup
       end
 
+      @class_chain_selector = hash_to_class_chain(selectors, single)
+
+
       @scrollable_locator = params[:scrollable_locator] if params[:scrollable_locator]
     end
 
@@ -29,7 +33,7 @@ module TestaAppiumDriver
       if @can_use_id_strategy
         ss.push({"#{FIND_STRATEGY_NAME}": @can_use_id_strategy})
       end
-
+      ss.push({"#{FIND_STRATEGY_CLASS_CHAIN}": @class_chain_selector}) if @strategy.nil? || @strategy == FIND_STRATEGY_CLASS_CHAIN
       ss.push({"#{FIND_STRATEGY_XPATH}": @xpath_selector}) if @strategy.nil? || @strategy == FIND_STRATEGY_XPATH
       ss.push({"#{FIND_STRATEGY_IMAGE}": @image_selector}) if @strategy == FIND_STRATEGY_IMAGE
       ss
@@ -45,13 +49,23 @@ module TestaAppiumDriver
 
       locator = self.dup
       add_xpath_child_selectors(locator, selectors, single)
+      if @strategy.nil? || @strategy == FIND_STRATEGY_CLASS_CHAIN
+        add_class_chain_child_selectors(locator, selectors, single)
+      end
+
       if is_scrollable_selector?(selectors, single)
         locator.scrollable_locator.scroll_orientation = :vertical
-        locator.scrollable_locator = self.dup
+        locator.scrollable_locator = locator
       end
 
       locator.last_selector_adjacent = false
       locator
     end
+
+
+    def add_class_chain_child_selectors(locator, selectors, single)
+      locator.single = false unless single # switching from single result to multiple
+      locator.class_chain_selector += "/" + hash_to_class_chain(selectors, single)
+    end
   end
 end

data/lib/testa_appium_driver/ios/type_selectors.rb

@@ -5,10 +5,15 @@ module TestaAppiumDriver
     # @return [TestaAppiumDriver::Locator]
     def add_selector(*args, &block)
       # if class selector is executed from driver, create new locator instance
-      if self.kind_of?(TestaAppiumDriver::Driver) || self.kind_of(Selenium::WebDriver::Element)
+      if self.kind_of?(TestaAppiumDriver::Driver) || self.instance_of?(Selenium::WebDriver::Element)
         args.last[:default_find_strategy] = @default_find_strategy
         args.last[:default_scroll_strategy] = @default_scroll_strategy
-        Locator.new(self, self, *args)
+        if self.instance_of?(Selenium::WebDriver::Element)
+          driver = self.get_driver
+        else
+          driver = self
+        end
+        Locator.new(driver, self, *args)
       else
         # class selector is executed from locator, just add child selector criteria
         self.add_child_selector(*args)
@@ -150,5 +155,34 @@ module TestaAppiumDriver
       params[:single] = false
       add_selector(params)
     end
+
+
+
+    # @return [TestaAppiumDriver::Locator]
+    def text_field(params = {})
+      params[:type] = "XCUIElementTypeTextField"
+      add_selector(params)
+    end
+
+    # @return [TestaAppiumDriver::Locator]
+    def text_fields(params = {})
+      params[:type] = "XCUIElementTypeTextField"
+      params[:single] = false
+      add_selector(params)
+    end
+
+
+    # @return [TestaAppiumDriver::Locator]
+    def secure_text_field(params = {})
+      params[:type] = "XCUIElementTypeSecureTextField"
+      add_selector(params)
+    end
+
+    # @return [TestaAppiumDriver::Locator]
+    def secure_text_fields(params = {})
+      params[:type] = "XCUIElementTypeSecureTextField"
+      params[:single] = false
+      add_selector(params)
+    end
   end
 end

data/lib/testa_appium_driver/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestaAppiumDriver
-  VERSION = "0.1.7"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testa_appium_driver
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.11
 platform: ruby
 authors:
 - karlo.razumovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib_core