testa_appium_driver 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb79ce18b9e98f651e83630eff7efe2d71d77031231f88c04521e7d4f1baf483
-  data.tar.gz: 94d1b8a88844c8726b1b87cd500ca07842b7b92190df7ef223f2cac4f929c9d9
+  metadata.gz: 2dadb5244c71161bcdf995e9b057951ee4a5e979be496e65e828f7188baa85dc
+  data.tar.gz: bd5d23887285a260d5231525ad09d42f33219ac655432a74ba044b9b57805647
 SHA512:
-  metadata.gz: 9c2abf9c966c5e8d192c52e48226fcf0d73994315b3d865e48ce03f41aced48f3785dcaf7d46fd26b6e21fa51e0035cae6b00e416fffde3ae1ab0a5cf703b982
-  data.tar.gz: e7e087b4b4227eb4d355df738f53d4ea72903b80fe51d3408c8c7ec6ac855a2066f40882dbae55de3418a1827895bcbefa14aa9b3322d767e22cd94393c1a67c
+  metadata.gz: 463e52be3a9a6764bbcbc068a46cb0cdc5f6ff41e0651cd95b9bc26da6b2210ba8c90f6651e8f6a153b76b0d173905a8d4a3a3d8b68055ea1e07653af3f4ecf1
+  data.tar.gz: 7b6ba6de823bbfcc993e712fe11f846cabd3e263b63a23ebfab5bc08c980eeee2c27c9ed0b85690505ed1441e137b3495661a65ecec81db1c6bd8d3755de6638

data/.gitignore

@@ -13,4 +13,4 @@
 /.idea/deployment.xml
 /.idea/workspace.xml
 /.idea/misc.xml
-Gemfile.lock
+Gemfile.lock

data/.idea/deployment.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="On explicit save action" serverName="supertesta.com" autoUploadExternalChanges="true">
+  <component name="PublishConfigData" autoUpload="On explicit save action" serverName="supertesta.com" preserveTimestamps="false" autoUploadExternalChanges="true">
     <serverData>
       <paths name="supertesta.com">
         <serverdata>

data/.idea/runConfigurations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

data/README.md

@@ -202,12 +202,18 @@ siblings selector can only be used with xpath strategy.
 - search_views
 - spinner
 - spinners
+- switch
+- switches
 - toast
 - toasts
 - toolbar
 - toolbars
 - text_view
 - text_views
+- web_view
+- web_views
+- card_view
+- card_views
 
 Adjacent selectors
 - from_parent
@@ -323,11 +329,15 @@ Type Selector arguments
 
 # Scroll actions
 - each
-- align!
-- align_top!
-- align_bottom!
-- align_left!
-- align_right!
+- each_down
+- each_up
+- each_left
+- each_right
+- align! (if does not exist, will scroll to find)
+- align_top! (if does not exist, will scroll to find)
+- align_bottom! (if does not exist, will scroll to find)
+- align_left! (if does not exist, will scroll to find)
+- align_right! (if does not exist, will scroll to find)
 - align
 - align_top
 - align_bottom
@@ -355,6 +365,9 @@ Type Selector arguments
 - as_scrollable
 - wait_until_exists
 - wait_while_exists
+- wait_until
+- wait_while
+- when_exists
 - exists?
 - long_tap
 

data/lib/testa_appium_driver/android/class_selectors.rb

@@ -24,6 +24,9 @@ module TestaAppiumDriver
     # @param selectors [Hash]
     # @return [TestaAppiumDriver::Locator] first element
     def element(selectors = {})
+      unless selectors[:image].nil?
+        selectors[:strategy] = FIND_STRATEGY_IMAGE
+      end
       add_selector(selectors)
     end
 
@@ -31,24 +34,9 @@ module TestaAppiumDriver
     # @param params [Hash]
     # @return [TestaAppiumDriver::Locator] all elements that match given selectors
     def elements(params = {})
-      params[:single] = false
-      add_selector(params)
-    end
-
-
-    # first element that has scrollable: true
-    # @param selectors [Hash]
-    # @return [TestaAppiumDriver::Locator] first scrollable element
-    def scrollable(selectors = {})
-      selectors[:scrollable] = true
-      add_selector(selectors)
-    end
-
-    # all elements that have scrollable: true
-    # @param params [Hash]
-    # @return [TestaAppiumDriver::Locator] first scrollable element
-    def scrollables(params = {})
-      params[:scrollable] = true
+      unless params[:image].nil?
+        params[:strategy] = FIND_STRATEGY_IMAGE
+      end
       params[:single] = false
       add_selector(params)
     end
@@ -399,5 +387,52 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+
+    # first androidx.cardview.widget.CardView element that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def card_view(params = {})
+      params[:class] = "androidx.cardview.widget.CardView"
+      add_selector(params)
+    end
+
+    # all androidx.cardview.widget.CardView elements that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def card_views(params = {})
+      params[:class] = "androidx.cardview.widget.CardView"
+      params[:single] = false
+      add_selector(params)
+    end
+
+    # first android.widget.Switch element that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def switch(params = {})
+      params[:class] = "android.widget.Switch"
+      add_selector(params)
+    end
+
+    # all android.widget.Switch elements that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def switches(params = {})
+      params[:class] = "android.widget.Switch"
+      params[:single] = false
+      add_selector(params)
+    end
+
+
+    # first android.webkit.WebView element that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def web_view(params = {})
+      params[:class] = "android.webkit.WebView"
+      add_selector(params)
+    end
+
+    # all android.webkit.WebView elements that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def web_views(params = {})
+      params[:class] = "android.webkit.WebView"
+      params[:single] = false
+      add_selector(params)
+    end
+
   end
 end

data/lib/testa_appium_driver/android/driver.rb

@@ -24,6 +24,23 @@ module TestaAppiumDriver
     end
 
 
+    def scrollable
+      locator = Locator.new(self, self, {single: true})
+      locator.xpath_selector = "//androidx.recyclerview.widget.RecyclerView|//android.widget.ScrollView|//android.widget.ListView|//android.widget.HorizontalScrollView"
+      locator.ui_selector = "new UiSelector().scrollable(true).instance(0)"
+      locator
+    end
+
+
+    def scrollables
+      locator = Locator.new(self, self, {single: false})
+      locator.xpath_selector = "//androidx.recyclerview.widget.RecyclerView|//android.widget.ScrollView|//android.widget.ListView|//android.widget.HorizontalScrollView"
+      locator.ui_selector = "new UiSelector().scrollable(true)"
+      locator
+    end
+
+
+
     private
     def handle_testa_opts
       if @testa_opts[:default_find_strategy].nil?

data/lib/testa_appium_driver/android/locator.rb

@@ -48,6 +48,10 @@ module TestaAppiumDriver
       if @strategy.nil? || @strategy == FIND_STRATEGY_XPATH
         ss.push({"#{FIND_STRATEGY_XPATH}": @xpath_selector})
       end
+
+      if @strategy == FIND_STRATEGY_IMAGE
+        ss.push({"#{FIND_STRATEGY_IMAGE}": @image_selector})
+      end
       ss
     end
 
@@ -93,6 +97,8 @@ module TestaAppiumDriver
         add_xpath_child_selectors(locator, selectors, single)
       elsif @strategy == FIND_STRATEGY_UIAUTOMATOR
         locator = add_uiautomator_child_selector(locator, selectors, single)
+      elsif @strategy == FIND_STRATEGY_IMAGE
+        locator = add_image_child_selector(locator, selectors, single)
       else
         # both paths are valid
         add_xpath_child_selectors(locator, selectors, single)
@@ -127,5 +133,10 @@ module TestaAppiumDriver
         locator
       end
     end
+
+    def add_image_child_selector(locator, selectors, single)
+      params = selectors.merge({single: single, scrollable_locator: locator.scrollable_locator})
+      Locator.new(@driver, self, params)
+    end
   end
 end

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

@@ -4,8 +4,6 @@ module TestaAppiumDriver
     private
 
     def uiautomator_scroll_to_start_or_end(type)
-      @driver.disable_wait_for_idle
-      @driver.disable_implicit_wait
 
       scrollable_selector = @scrollable.ui_selector(false)
       orientation = @scrollable.scroll_orientation == :vertical ? ".setAsVerticalList()" : ".setAsHorizontalList()"
@@ -19,18 +17,12 @@ module TestaAppiumDriver
       end
 
 
-      @driver.enable_implicit_wait
-      @driver.enable_wait_for_idle
     end
 
 
     def uiautomator_scroll_to
       raise "UiAutomator scroll cannot work with specified direction" unless @direction.nil?
 
-
-      @driver.disable_wait_for_idle
-      @driver.disable_implicit_wait
-
       scrollable_selector = @scrollable.ui_selector(false)
       element_selector = @locator.ui_selector(false)
       orientation_command = @scrollable.scroll_orientation == :vertical ? ".setAsVerticalList()" : ".setAsHorizontalList()"
@@ -41,15 +33,11 @@ module TestaAppiumDriver
       rescue
         # Ignored
       ensure
-        @driver.enable_implicit_wait
-        @driver.enable_wait_for_idle
       end
     end
 
 
     def uiautomator_page_or_fling(type, direction)
-      @driver.disable_wait_for_idle
-      @driver.disable_implicit_wait
 
       scrollable_selector = @scrollable.ui_selector(false)
       orientation = direction == :up || direction == :down ? ".setAsVerticalList()" : ".setAsHorizontalList()"
@@ -67,8 +55,6 @@ module TestaAppiumDriver
       rescue
         # Ignored
       end
-      @driver.enable_implicit_wait
-      @driver.enable_wait_for_idle
     end
 
 

data/lib/testa_appium_driver/common/constants.rb

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

data/lib/testa_appium_driver/common/helpers.rb

@@ -120,7 +120,9 @@ module TestaAppiumDriver
         command = "#{ command }[@focused=\"#{ hash[:focused] }\"]" unless hash[:focused].nil?
         command = "#{ command }[@index=\"#{ hash[:index] }\"]" unless hash[:index].nil?
         command = "#{ command }[@selected=\"#{ hash[:selected] }\"]" unless hash[:selected].nil?
-        command = "#{ command }[@scrollable=\"#{ hash[:scrollable] }\"]" unless hash[:scrollable].nil?
+
+        # it seems like you cannot query by scrollable
+        # command = "#{ command }[@scrollable=\"#{ hash[:scrollable] }\"]" unless hash[:scrollable].nil?
       else
 
         hash[:type] = hash[:class] unless hash[:class].nil?
@@ -205,6 +207,8 @@ module TestaAppiumDriver
           :visible,
           :name,
           :value,
+
+          :image
       ].include?(key) }
       params = Hash[params.to_a - selectors.to_a]
 

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

@@ -250,6 +250,22 @@ module TestaAppiumDriver
       _fling(:right, _process_deadzone(top, bottom, right, left))
     end
 
+    def drag_up_by(amount)
+      drag_by(amount, direction: :top)
+    end
+
+    def drag_down_by(amount)
+      drag_by(amount, direction: :bottom)
+    end
+
+    def drag_left_by(amount)
+      drag_by(amount, direction: :left)
+    end
+
+    def drag_right_by(amount)
+      drag_by(amount, direction: :right)
+    end
+
 
     # @param [TestaAppiumDriver::Locator, Hash, Selenium::WebDriver::Element, String] to
     #noinspection RubyYardParamTypeMatch,RubyScope

data/lib/testa_appium_driver/common/locator.rb

@@ -17,6 +17,8 @@ module TestaAppiumDriver
     attr_accessor :last_selector_adjacent
     attr_accessor :can_use_id_strategy
 
+    attr_accessor :image_selector
+
     attr_accessor :from_element
     attr_accessor :scroll_orientation
     attr_accessor :scroll_deadzone
@@ -41,12 +43,21 @@ module TestaAppiumDriver
       # @type [TestaAppiumDriver::Driver]
       @driver = driver
       @index_for_multiple = nil
+      @image_selector = nil
 
       params, selectors = extract_selectors_from_params(params)
       single = params[:single]
 
       @single = single
 
+      if selectors[:image].nil?
+        if from_element.instance_of?(TestaAppiumDriver::Locator) && !from_element.image_selector.nil?
+          raise "Cannot chain non-image selectors to image selectors"
+        end
+      else
+        handle_image_selector(selectors, params)
+      end
+
       selectors[:id] = selectors[:name] unless selectors[:name].nil?
       if from_element.instance_of?(Selenium::WebDriver::Element)
         @xpath_selector = "//*" # to select current element
@@ -80,6 +91,8 @@ module TestaAppiumDriver
     end
 
 
+
+
     def is_only_id_selector?(selectors)
       # since, name and id is the same thing for iOS,
       if @driver.device == :android
@@ -95,7 +108,6 @@ module TestaAppiumDriver
     def method_missing(method, *args, &block)
       r = execute.send(method, *args, &block)
       @driver.invalidate_cache
-      r = r[@index_for_multiple] if !@index_for_multiple.nil? && !@single
       r
     end
 
@@ -103,14 +115,16 @@ module TestaAppiumDriver
     # @param [Boolean] skip_cache if true it will skip cache check and store
     # @param [Selenium::WebDriver::Element] force_cache_element, for internal use where we have already the element, and want to execute custom locator methods on it
     # @return [Selenium::WebDriver::Element, Array]
-    def execute(skip_cache: false, force_cache_element: nil)
+    def execute(skip_cache: false, force_cache_element: nil, ignore_implicit_wait: false)
       return force_cache_element unless force_cache_element.nil?
       # if we are looking for current element, then return from_element
       # for example when we have driver.element.elements[1].click
       # elements[2] will be resolved with xpath because we are looking for multiple elements from element
       # and since we are looking for instance 2, [](instance) method will return new "empty locator"
       # we are executing click on that "empty locator" so we have to return the instance 2 of elements for the click
-      if @xpath_selector == "//*/*[1]" && @from_element.instance_of?(Selenium::WebDriver::Element)
+      if @xpath_selector == "//*[1]" && !@from_element.nil? && @image_selector.nil?
+        return @from_element if @from_element.instance_of?(Selenium::WebDriver::Element)
+        return @from_element.execute(skip_cache: skip_cache, force_cache_element: force_cache_element, ignore_implicit_wait: ignore_implicit_wait) if @from_element.instance_of?(TestaAppiumDriver::Locator)
         return @from_element
       end
 
@@ -119,11 +133,30 @@ module TestaAppiumDriver
 
 
 
-      r = @driver.execute(@from_element, @single, strategies_and_selectors, skip_cache)
+      r = @driver.execute(@from_element, @single, strategies_and_selectors, skip_cache, 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)
+        found = true
+      rescue
+        #ignored
+      end
+      if found
+        if block_given? # block is given
+          block.call(self) # use call to execute the block
+        else # the value of block_argument becomes nil if you didn't give a block
+          # block was not given
+        end
+      end
+      self
+    end
+
 
     # @param [Integer] timeout in seconds
     # @return [TestaAppiumDriver::Locator]
@@ -157,16 +190,12 @@ module TestaAppiumDriver
     # all timeouts are disabled before check, and enabled after check
     # @return [boolean] true if it exists in the page regardless if visible or not
     def exists?
-      @driver.disable_wait_for_idle
-      @driver.disable_implicit_wait
       found = true
       begin
-        execute(skip_cache: true)
+        execute(skip_cache: true, ignore_implicit_wait: true)
       rescue StandardError
         found = false
       end
-      @driver.enable_implicit_wait
-      @driver.enable_wait_for_idle
       found
     end
 
@@ -200,7 +229,8 @@ module TestaAppiumDriver
         locator.can_use_id_strategy = false
         locator
       else
-        from_element = self.index_for_multiple = instance
+        from_element = self.dup
+        from_element.index_for_multiple = instance
         params = {}.merge({single: true, scrollable_locator: @scrollable_locator})
         #params[:strategy] = FIND_STRATEGY_XPATH
         #params[:strategy_reason] = "retrieved instance of a array"
@@ -482,6 +512,42 @@ module TestaAppiumDriver
       locator.single = false unless single # switching from single result to multiple
       locator.xpath_selector += hash_to_xpath(@driver.device, selectors, single)
     end
+
+
+    def handle_image_selector(selectors, params)
+      image_match_threshold = 0.4
+      image_match_threshold = params[:imageMatchThreshold] unless params[:imageMatchThreshold].nil?
+      image_match_threshold = params[:threshold] unless params[:threshold].nil?
+      fix_image_find_screenshot_dims = true
+      fix_image_find_screenshot_dims = params[:fixImageFindScreenshotDims] unless params[:fixImageFindScreenshotDims].nil?
+      fix_image_template_size = false
+      fix_image_template_size = params[:fixImageTemplateSize] unless params[:fixImageTemplateSize].nil?
+      fix_image_template_scale = false
+      fix_image_template_scale = params[:fixImageTemplateScale] unless params[:fixImageTemplateScale].nil?
+      default_image_template_scale = 1.0
+      default_image_template_scale = params[:defaultImageTemplateScale] unless params[:defaultImageTemplateScale].nil?
+      check_for_image_element_staleness = true
+      check_for_image_element_staleness = params[:checkForImageElementStaleness] unless params[:checkForImageElementStaleness].nil?
+      auto_update_image_element_position = false
+      auto_update_image_element_position = params[:autoUpdateImageElementPosition] unless params[:autoUpdateImageElementPosition].nil?
+      image_element_tap_strategy = "w3cActions"
+      image_element_tap_strategy = params[:imageElementTapStrategy] unless params[:imageElementTapStrategy].nil?
+      get_matched_image_result = false
+      get_matched_image_result = params[:getMatchedImageResult] unless params[:getMatchedImageResult].nil?
+
+      @image_selector = {
+        image: selectors[:image],
+        imageMatchThreshold: image_match_threshold,
+        fixImageFindScreenshotDims: fix_image_find_screenshot_dims,
+        fixImageTemplateSize: fix_image_template_size,
+        fixImageTemplateScale: fix_image_template_scale,
+        defaultImageTemplateScale: default_image_template_scale,
+        checkForImageElementStaleness: check_for_image_element_staleness,
+        autoUpdateImageElementPosition: auto_update_image_element_position,
+        imageElementTapStrategy: image_element_tap_strategy,
+        getMatchedImageResult: get_matched_image_result,
+      }
+    end
   end
 
 end

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

@@ -6,8 +6,6 @@ module TestaAppiumDriver
     def w3c_each(direction, &block)
       elements = []
       begin
-        @driver.disable_wait_for_idle
-        @driver.disable_implicit_wait
         default_deadzone!
 
         iterations = 0
@@ -38,15 +36,12 @@ module TestaAppiumDriver
         end
       rescue => e
         raise e
-      ensure
-        @driver.enable_implicit_wait
-        @driver.enable_wait_for_idle
+
       end
       elements
     end
 
     def w3c_align(with, scroll_to_find)
-      @driver.disable_wait_for_idle
       default_deadzone!
 
 
@@ -54,20 +49,6 @@ module TestaAppiumDriver
       @locator.scroll_to if scroll_to_find
 
       element = @locator.execute
-      @driver.disable_implicit_wait
-
-      case with
-      when :top
-        page_down if is_aligned?(with, element)
-      when :bottom
-        page_up if is_aligned?(with, element)
-      when :right
-        page_right if is_aligned?(with, element)
-      when :left
-        page_left if is_aligned?(with, element)
-      else
-        raise "Unsupported align with option: #{with}"
-      end
 
       timeout = 0
       until is_aligned?(with, element) || timeout == 3
@@ -75,8 +56,6 @@ module TestaAppiumDriver
         timeout += 1
       end
 
-      @driver.enable_implicit_wait
-      @driver.enable_wait_for_idle
     end
 
 
@@ -150,8 +129,6 @@ module TestaAppiumDriver
     end
 
     def w3c_scroll_to_start_or_end(type)
-      @driver.disable_wait_for_idle
-      @driver.disable_implicit_wait
       default_deadzone!
 
       @previous_elements = nil
@@ -179,15 +156,10 @@ module TestaAppiumDriver
 
       # reset the flag for end of scroll elements
       @previous_elements = nil
-
-      @driver.enable_implicit_wait
-      @driver.enable_wait_for_idle
     end
 
 
     def w3c_page_or_fling(type, direction)
-      @driver.disable_wait_for_idle
-      @driver.disable_implicit_wait
       default_deadzone!
 
       if direction == :down || direction == :up
@@ -216,8 +188,6 @@ module TestaAppiumDriver
 
       w3c_action(x0, y0, x1, y1, type)
 
-      @driver.enable_implicit_wait
-      @driver.enable_wait_for_idle
     end
 
 
@@ -258,7 +228,7 @@ module TestaAppiumDriver
 
 
 
-    def drag_to(x, y)
+    def w3c_drag_to(x, y)
       x0 = @bounds.center.x
       y0 = @bounds.center.y
       w3c_action(x0, y0, x, y, SCROLL_ACTION_TYPE_DRAG)

data/lib/testa_appium_driver/driver.rb

@@ -29,6 +29,8 @@ 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)
@@ -67,7 +69,7 @@ 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)
+    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
@@ -79,13 +81,13 @@ module TestaAppiumDriver
 
 
       # resolve from_element unique id, so that we can cache it properly
-      from_element_id = from_element.kind_of?(TestaAppiumDriver::Locator) ? from_element.strategy_and_selector[1] : nil
+      from_element_id = from_element.instance_of?(TestaAppiumDriver::Locator) ? from_element.strategies_and_selectors : nil
 
       begin
         ss = strategies_and_selectors[ss_index % strategies_and_selectors.count]
         ss_index +=1
 
-        puts "Executing #{from_element_id ? "from #{from_element.strategy}: #{from_element.strategy_and_selector} => " : ""}#{ss.keys[0]}: #{ss.values[0]}"
+        puts "Executing #{from_element_id ? "from #{from_element.strategy}: #{from_element.strategies_and_selectors} => " : ""}#{ss.keys[0]}: #{ss.values[0]}"
 
         if @cache[:selector] != ss.values[0] || # cache miss, selector is different
             @cache[:time] + 5 <= Time.now || # cache miss, older than 5 seconds
@@ -93,13 +95,24 @@ module TestaAppiumDriver
             @cache[:from_element_id] != from_element_id || # cache miss, search is started from different element
             skip_cache # cache is skipped
 
-          if single
-            execute_result = from_element.find_element(ss)
+          if ss.keys[0] == FIND_STRATEGY_IMAGE
+            set_find_by_image_settings(ss.values[0].dup)
+            if single
+              execute_result = from_element.find_element_by_image(ss.values[0][:image])
+            else
+              execute_result = from_element.find_elements_by_image(ss.values[0][:image])
+            end
+            restore_set_by_image_settings
           else
-            execute_result = from_element.find_elements(ss)
+            if single
+              execute_result = from_element.find_element(ss)
+            else
+              execute_result = from_element.find_elements(ss)
+            end
           end
 
 
+
           unless skip_cache
             @cache[:selector] = ss.values[0]
             @cache[:strategy] = ss.keys[0]
@@ -113,7 +126,7 @@ 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 || 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
           sleep EXISTS_WAIT if ss_index >= strategies_and_selectors.count
           retry
         else
@@ -131,39 +144,71 @@ module TestaAppiumDriver
     # method missing is used to forward methods to the actual appium driver
     # after the method is executed, find element cache is invalidated
     def method_missing(method, *args, &block)
+      r = @driver.send(method, *args, &block)
       invalidate_cache
-      @driver.send(method, *args, &block)
+      r
     end
 
     # disables implicit wait
     def disable_implicit_wait
-      @implicit_wait_ms = @driver.get_timeouts["implicit"]
-      @driver.manage.timeouts.implicit_wait = 0
+      unless @implicit_wait_disabled
+        @implicit_wait_ms = @driver.get_timeouts["implicit"]
+        @implicit_wait_uiautomator_ms = @driver.get_settings["waitForSelectorTimeout"]
+        @driver.manage.timeouts.implicit_wait = 0
+        @driver.update_settings({waitForSelectorTimeout: 0})
+        @implicit_wait_disabled = true
+      end
     end
 
     # enables implicit wait, can be called only after disabling implicit wait
     def enable_implicit_wait
-      raise "Implicit wait is not disabled" if @implicit_wait_ms.nil?
+      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
-      if @device == :android
-        @wait_for_idle_timeout = @driver.settings.get["waitForIdleTimeout"]
-        @driver.update_settings({waitForIdleTimeout: 0})
+      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" if @wait_for_idle_timeout.nil?
+        raise "Wait for idle is not disabled" unless @wait_for_idle_disabled
         @driver.update_settings({waitForIdleTimeout: @wait_for_idle_timeout})
       end
     end
 
+    def set_find_by_image_settings(settings)
+      settings.delete(:image)
+      @default_find_image_settings = {}
+      old_settings = @driver.get_settings
+      @default_find_image_settings[:imageMatchThreshold] = old_settings["imageMatchThreshold"]
+      @default_find_image_settings[:fixImageFindScreenshotDims] = old_settings["fixImageFindScreenshotDims"]
+      @default_find_image_settings[:fixImageTemplateSize] = old_settings["fixImageTemplateSize"]
+      @default_find_image_settings[:fixImageTemplateScale] = old_settings["fixImageTemplateScale"]
+      @default_find_image_settings[:defaultImageTemplateScale] = old_settings["defaultImageTemplateScale"]
+      @default_find_image_settings[:checkForImageElementStaleness] = old_settings["checkForImageElementStaleness"]
+      @default_find_image_settings[:autoUpdateImageElementPosition] = old_settings["autoUpdateImageElementPosition"]
+      @default_find_image_settings[:imageElementTapStrategy] = old_settings["imageElementTapStrategy"]
+      @default_find_image_settings[:getMatchedImageResult] = old_settings["getMatchedImageResult"]
+
+      @driver.update_settings(settings)
+    end
+
+    def restore_set_by_image_settings
+      @driver.update_settings(@default_find_image_settings) if @default_find_image_settings
+    end
+
 
     # @@return [String] current package under test
     def current_package
@@ -197,6 +242,8 @@ module TestaAppiumDriver
     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

data/lib/testa_appium_driver/ios/driver.rb

@@ -7,6 +7,19 @@ module TestaAppiumDriver
     include TypeSelectors
 
 
+
+    # @param params [Hash]
+    # @return [TestaAppiumDriver::Locator] first scrollable element
+    def scrollable(params = {})
+      scroll_view(params)
+    end
+
+    # @param params [Hash]
+    # @return [TestaAppiumDriver::Locator] first scrollable element
+    def scrollables(params = {})
+      scroll_views(params)
+    end
+
     private
     def handle_testa_opts
       if @testa_opts[:default_find_strategy].nil?

data/lib/testa_appium_driver/ios/locator.rb

@@ -29,7 +29,9 @@ module TestaAppiumDriver
       if @can_use_id_strategy
         ss.push({"#{FIND_STRATEGY_NAME}": @can_use_id_strategy})
       end
-      ss.push({"#{FIND_STRATEGY_XPATH}": @xpath_selector})
+
+      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
     end
 

data/lib/testa_appium_driver/ios/type_selectors.rb

@@ -111,19 +111,6 @@ module TestaAppiumDriver
     end
 
 
-    # @param params [Hash]
-    # @return [TestaAppiumDriver::Locator] first scrollable element
-    def scrollable(params = {})
-      scroll_view(params)
-    end
-
-    # @param params [Hash]
-    # @return [TestaAppiumDriver::Locator] first scrollable element
-    def scrollables(params = {})
-      scroll_views(params)
-    end
-
-
     # @return [TestaAppiumDriver::Locator]
     def scroll_view(params = {})
       params[:type] = "XCUIElementTypeScrollView"

data/lib/testa_appium_driver/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testa_appium_driver
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - karlo.razumovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib_core
@@ -80,6 +80,7 @@ files:
 - ".idea/inspectionProfiles/Project_Default.xml"
 - ".idea/misc.xml"
 - ".idea/modules.xml"
+- ".idea/runConfigurations.xml"
 - ".idea/runConfigurations/Android_Test.xml"
 - ".idea/sshConfigs.xml"
 - ".idea/vcs.xml"