testa_appium_driver 0.1.13 → 0.1.16

data/lib/testa_appium_driver/common/locator.rb

@@ -1,7 +1,6 @@
 require_relative 'locator/scroll_actions'
 
-
-module TestaAppiumDriver
+module ::TestaAppiumDriver
   #noinspection RubyTooManyInstanceVariablesInspection,RubyTooManyMethodsInspection
   class Locator
     include Helpers
@@ -29,7 +28,6 @@ module TestaAppiumDriver
 
     attr_accessor :index_for_multiple
 
-
     # locator parameters are:
     #   single: true or false
     #   scrollable_locator: [TestaAppiumDriver::Locator, nil] for scrolling if needed later
@@ -59,19 +57,17 @@ module TestaAppiumDriver
       end
 
       selectors[:id] = selectors[:name] unless selectors[:name].nil?
-      if from_element.instance_of?(Selenium::WebDriver::Element)
-        @xpath_selector = "//*" # to select current element
-        @xpath_selector += hash_to_xpath(@driver.device, selectors, single)[1..-1]
+      if from_element.instance_of?(::Selenium::WebDriver::Element) || from_element.instance_of?(::Appium::Core::Element) || from_element.instance_of?(::TestaAppiumDriver::Locator)
+        @xpath_selector = "."
+        @xpath_selector += hash_to_xpath(@driver.device, selectors, single)
       else
         @xpath_selector = hash_to_xpath(@driver.device, selectors, single)
       end
 
-
       @from_element = from_element
       @default_find_strategy = params[:default_find_strategy]
       @default_scroll_strategy = params[:default_scroll_strategy]
 
-
       @can_use_id_strategy = is_only_id_selector?(selectors)
       if @can_use_id_strategy
         if @driver.device == :android
@@ -81,7 +77,6 @@ module TestaAppiumDriver
         end
       end
 
-
       @strategy = params[:strategy]
       @strategy_reason = params[:strategy_reason]
 
@@ -90,9 +85,6 @@ module TestaAppiumDriver
       init(params, selectors, single)
     end
 
-
-
-
     def is_only_id_selector?(selectors)
       # since, name and id is the same thing for iOS,
       if @driver.device == :android
@@ -103,7 +95,6 @@ module TestaAppiumDriver
       end
     end
 
-
     # method missing is used to fetch the element before executing additional commands like click, send_key, count
     def method_missing(method, *args, &block)
       r = execute.send(method, *args, &block)
@@ -111,7 +102,6 @@ module TestaAppiumDriver
       r
     end
 
-
     # @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]
@@ -122,17 +112,12 @@ module TestaAppiumDriver
       # 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.nil? && @image_selector.nil?
-        return @from_element if @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) || @from_element.instance_of?(::Appium::Core::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
 
-
-
-
-
-
       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
@@ -149,30 +134,28 @@ module TestaAppiumDriver
       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
+        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]
     def wait_until_exists(timeout = nil)
-      args = {timeout: timeout}
+      args = { timeout: timeout }
       _wait(:until, args)
     end
 
-
     # @param [Integer] timeout in seconds
     # @return [TestaAppiumDriver::Locator]
     def wait_while_exists(timeout = nil)
-      args = {timeout: timeout}
+      args = { timeout: timeout }
       _wait(:while, args)
     end
 
-
     def wait_while(timeout = nil, args = {})
       args[:timeout] = timeout
       _wait(:while, args)
@@ -183,13 +166,13 @@ module TestaAppiumDriver
       _wait(:until, args)
     end
 
-
     # 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?
       found = true
       begin
-        execute(skip_cache: true, ignore_implicit_wait: true)
+        r = execute(skip_cache: true, ignore_implicit_wait: true)
+        return r.count.positive? if r.is_a?(Array)
       rescue StandardError
         found = false
       end
@@ -235,7 +218,7 @@ module TestaAppiumDriver
       else
         from_element = self.dup
         from_element.index_for_multiple = instance
-        params = {}.merge({single: true, scrollable_locator: @scrollable_locator})
+        params = {}.merge({ single: true, scrollable_locator: @scrollable_locator })
         #params[:strategy] = FIND_STRATEGY_XPATH
         #params[:strategy_reason] = "retrieved instance of a array"
         params[:default_find_strategy] = @default_find_strategy
@@ -244,33 +227,32 @@ module TestaAppiumDriver
       end
     end
 
-
     # @param [TestaAppiumDriver::Locator, Selenium::WebDriver::Element, Array] other
     #noinspection RubyNilAnalysis,RubyUnnecessaryReturnStatement
     def ==(other)
       elements = execute
-      other = other.execute if other.kind_of?(TestaAppiumDriver::Locator)
+      other = other.execute if other.is_a?(TestaAppiumDriver::Locator)
 
-      if elements.kind_of?(Array)
-        return false unless other.kind_of?(Array)
+      if elements.is_a?(Array)
+        return false unless other.is_a?(Array)
         return false if other.count != elements.count
         return (elements - other).empty?
       else
-        return false if other.kind_of?(Array)
+        return false if other.is_a?(Array)
         return elements == other
       end
     end
 
     def as_json
       {
-          strategy: @strategy,
-          default_strategy: @default_find_strategy,
-          single: @single,
-          uiautomator: defined?(self.ui_selector) ? ui_selector : nil,
-          xpath: @xpath_selector,
-          scroll_orientation: @scroll_orientation,
-          resolved: strategies_and_selectors,
-          index_for_multiple: @index_for_multiple
+        strategy: @strategy,
+        default_strategy: @default_find_strategy,
+        single: @single,
+        uiautomator: defined?(self.ui_selector) ? ui_selector : nil,
+        xpath: @xpath_selector,
+        scroll_orientation: @scroll_orientation,
+        resolved: strategies_and_selectors,
+        index_for_multiple: @index_for_multiple
       }
     end
 
@@ -282,7 +264,6 @@ module TestaAppiumDriver
       [self.to_s]
     end
 
-
     # @return [TestaAppiumDriver::Locator]
     def as_scrollable(orientation: :vertical, top: nil, bottom: nil, right: nil, left: nil)
       @scroll_orientation = orientation
@@ -297,43 +278,50 @@ module TestaAppiumDriver
       self
     end
 
-
     def first_and_last_leaf
       @driver.first_and_last_leaf(execute)
     end
 
+    def first_and_last_child
+      @driver.first_and_last_child(execute)
+    end
 
-    def tap(x = nil, y = nil)
-      click(x, y)
+    def double_click(x = nil, y = nil)
+      click(x, y, double: true)
     end
 
     # 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?
+    def click(x = nil, y = nil, double: false, by_coords: false)
+      if !x.nil? && !y.nil? || double || by_coords
+
+        x = 0.5 if x.nil?
+        y = 0.5 if y.nil?
 
         b = self.bounds
-        if x.kind_of? Integer
+        if x.is_a?(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
+        elsif x.is_a?(Float) && x <= 1.0 && x >= 0
+          x = b.top_left.x + b.width * x
         else
-          raise "x value #{x} not supported"
+          raise "x value #{x} not supported. Use integer as pixel or float (0..1) as percentage of element width"
         end
 
-        if y.kind_of? Integer
+        if y.is_a?(Integer)
           if y >= 0
-            y = b.bottom_right.y + y
+            y = b.top_left.y + y
           else
-            y = b.top_left + y
+            y = b.bottom_right + y
           end
-        elsif y.kind_of? Float
-          y = b.bottom_right.y + b.height*y
+        elsif y.is_a?(Float) && y <= 1.0 && y >= 0
+          y = b.top_left.y + b.height * y
+        else
+          raise "y value #{x} not supported. Use integer as pixel or float (0..1) as percentage of element height"
         end
 
         action_builder = @driver.action
@@ -341,6 +329,11 @@ module TestaAppiumDriver
         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)
+        if double
+          f1.create_pause(0.1)
+          f1.create_pointer_down(:left)
+          f1.create_pointer_up(:left)
+        end
         @driver.perform_actions [f1]
       else
         if @driver.device == :android
@@ -348,13 +341,16 @@ module TestaAppiumDriver
         else
           # on ios, if element is not visible, first click will scroll to it
           # then on second click actually perform the click
-          visible = visible?
+          #visible = visible?
           perform_driver_method(:click)
-          perform_driver_method(:click) unless visible rescue nil
+          #perform_driver_method(:click) unless visible rescue nil
         end
       end
     end
 
+    alias_method :tap, :click
+    alias_method :double_tap, :double_click
+
     def send_key(*args)
       perform_driver_method(:send_keys, *args)
     end
@@ -363,12 +359,11 @@ module TestaAppiumDriver
       perform_driver_method(:clear)
     end
 
-
     # Return parent element
     # @return [TestaAppiumDriver::Locator]
     def parent
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "parent") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add parent selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add parent selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]") && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -382,7 +377,7 @@ 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 != FIND_STRATEGY_CLASS_CHAIN && !@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_reason = "children"
@@ -399,7 +394,6 @@ module TestaAppiumDriver
       locator
     end
 
-
     # Return first child element
     # @return [TestaAppiumDriver::Locator]
     def child
@@ -421,12 +415,11 @@ module TestaAppiumDriver
       locator
     end
 
-
     # @return [TestaAppiumDriver::Locator]
     def siblings
       raise "Cannot add siblings selector to array" unless @single
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "siblings") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add siblings selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add siblings selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]") && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -442,7 +435,7 @@ module TestaAppiumDriver
     def preceding_siblings
       raise "Cannot add preceding_siblings selector to array" unless @single
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "preceding_siblings") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add preceding_siblings selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add preceding_siblings selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]") && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -458,7 +451,7 @@ module TestaAppiumDriver
     def preceding_sibling
       raise "Cannot add preceding_sibling selector to array" unless @single
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "preceding_sibling") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add preceding siblings selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add preceding siblings selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]") && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -472,12 +465,11 @@ module TestaAppiumDriver
       locator
     end
 
-
     # @return [TestaAppiumDriver::Locator]
     def following_siblings
       raise "Cannot add following_siblings selector to array" unless @single
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "following_siblings") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add following_siblings selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add following_siblings selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]") && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -493,7 +485,7 @@ module TestaAppiumDriver
     def following_sibling
       raise "Cannot add following_sibling selector to array" unless @single
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "following_sibling") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add following_sibling selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add following_sibling selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]") && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -507,7 +499,6 @@ module TestaAppiumDriver
       locator
     end
 
-
     private
 
     def _wait(type, args)
@@ -528,10 +519,8 @@ module TestaAppiumDriver
       args.delete(:interval)
       args.delete(:timeout)
 
-
-
       start_time = Time.now.to_f
-      if type ==  :while
+      if type == :while
         while exists? && _attributes_match(args)
           raise message if start_time + timeout < Time.now.to_f
           sleep interval
@@ -548,7 +537,7 @@ module TestaAppiumDriver
     def _attributes_match(attributes)
       all_match = true
       attributes.each do |key, value|
-        unless attribute(key) == value
+        unless testa_attribute(key) == value
           all_match = false
           break
         end
@@ -559,7 +548,7 @@ module TestaAppiumDriver
     #noinspection RubyNilAnalysis
     def perform_driver_method(name, *args)
       elements = execute
-      if elements.kind_of?(Array)
+      if elements.is_a?(Array)
         elements.map { |e| e.send(name, *args) }
       else
         elements.send(name, *args)
@@ -571,7 +560,6 @@ module TestaAppiumDriver
       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?

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

@@ -1,4 +1,4 @@
 module TestaAppiumDriver
-  class ScrollActions
+  module JsonWireScrollActions
   end
 end

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

@@ -1,7 +1,7 @@
-module TestaAppiumDriver
-  class ScrollActions
+module ::TestaAppiumDriver
+  module W3cScrollActions
+
 
-    private
     # @return [Array]
     def w3c_scroll_each(direction, &block)
       elements = []
@@ -19,48 +19,105 @@ module TestaAppiumDriver
             direction = :right
           end
         end
+        case direction
+        when :up
+          align_with = :bottom
+        when :down
+          align_with = :top
+        when :right
+          align_with = :left
+        when :left
+          align_with = :right
+        else
+          align_with = :top
+        end
+
+
+
+        ignore_element_ids = []
+        previous_element = nil
 
         until is_end_of_scroll?
+          aligned_items = 0
+          new_ignore_element_ids = []
           matches = @locator.execute(skip_cache: true)
-          matches.each_with_index do |m|
-            next if elements.include?(m)
+          matches.each_with_index do |m, index|
+            if ignore_element_ids.include?(m.id)
+              previous_element = m
+              next
+            end
+
+            sa = self.dup
+            sa.locator = m
+            sa.w3c_align(align_with, false, 1, speed_coef: 2.0)
+            is_aligned = sa.is_aligned?(align_with, m)
+            if !is_aligned && !previous_element.nil?
+              new_ignore_element_ids << previous_element.id
+            end
+
+            if is_aligned
+              aligned_items += 1
+            end
+
+            if matches.count == index + 1
+              new_ignore_element_ids << m.id
+            end
+
             elements << m
             if block_given? # block is given
+              @locator.driver.invalidate_cache
               block.call(m) # 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
+            previous_element = m
           end
+
           iterations += 1
           break if !@max_scrolls.nil? && iterations == @max_scrolls
-          self.send("page_#{direction}")
+
+          if aligned_items == 0
+            self.send("page_#{direction}")
+          else
+            ignore_element_ids = new_ignore_element_ids.dup
+          end
+
+
+
         end
       rescue => e
         raise e
-
       end
+
       elements
     end
 
-    def w3c_align(with, scroll_to_find)
+    def w3c_align(with, scroll_to_find, max_attempts, speed_coef: 1.25)
       default_deadzone!
 
 
 
       @locator.scroll_to if scroll_to_find
 
-      element = @locator.execute
+      if @locator.instance_of?(TestaAppiumDriver::Locator)
+        element = @locator.execute
+      else
+        element = @locator
+      end
+
+
+      max_attempts = 3 if max_attempts.nil? || max_attempts <= 0
 
       timeout = 0
-      until is_aligned?(with, element) || timeout == 3
-        w3c_attempt_align(with)
+      until is_aligned?(with, element) || timeout == max_attempts
+        w3c_attempt_align(with, speed_coef)
         timeout += 1
       end
 
     end
 
 
-    def w3c_attempt_align(with)
+    def w3c_attempt_align(with, speed_coef)
       case with
       when :top
         y0 = @bounds.bottom_right.y - @deadzone[:bottom]
@@ -91,7 +148,7 @@ module TestaAppiumDriver
       end
 
       x1, y1 = apply_w3c_correction(x1, y1, scroll_direction) if @driver.device == :android
-      w3c_action(x0, y0, x1, y1, SCROLL_ACTION_TYPE_SCROLL)
+      w3c_action(x0, y0, x1, y1, SCROLL_ACTION_TYPE_SCROLL, speed_coef: speed_coef)
     end
 
 
@@ -171,7 +228,9 @@ module TestaAppiumDriver
           y0 = @bounds.top_left.y + @deadzone[:top].to_i
           y1 = @bounds.bottom_right.y - @deadzone[:bottom].to_i
         end
-        x0 = @bounds.width / 2
+        x0 = @bounds.top_left.x + (@bounds.width - @deadzone[:left].to_i - @deadzone[:right].to_i)/ 2
+        x0 = @bounds.top_left.x if x0 < @bounds.top_left.x
+        x0 = @bounds.bottom_right.x if x0 > @bounds.bottom_right.x
         x1 = x0
       else
         if direction == :right
@@ -181,24 +240,32 @@ module TestaAppiumDriver
           x0 = @bounds.top_left.x + @deadzone[:left].to_i
           x1 = @bounds.bottom_right.x - @deadzone[:right].to_i
         end
-        y0 = @bounds.height / 2
+
+        y0 = @bounds.top_left.y + (@bounds.height -  @deadzone[:top].to_i - @deadzone[:bottom].to_i)/ 2
+        y0 = @bounds.top_left.y if y0 < @bounds.top_left.y
+        y0 = @bounds.bottom_right.y if y0 > @bounds.bottom_right.y
         y1 = y0
       end
       x1, y1 = apply_w3c_correction(x1, y1, direction) if @driver.device == :android
 
+      speed_coef = 1
+      if type == SCROLL_ACTION_TYPE_SCROLL
+        speed_coef = 1.5
+      end
 
-      w3c_action(x0, y0, x1, y1, type)
+      w3c_action(x0, y0, x1, y1, type, speed_coef: speed_coef)
 
     end
 
 
-    def w3c_action(x0, y0, x1, y1, type)
+    def w3c_action(x0, y0, x1, y1, type, speed_coef: 1.0)
+      speed_coef = 1/speed_coef
       if type == SCROLL_ACTION_TYPE_SCROLL
-        duration = 1.8
+        duration = 1.8*speed_coef
       elsif type == SCROLL_ACTION_TYPE_FLING
-        duration = 0.1
+        duration = 0.1*speed_coef
       elsif type == SCROLL_ACTION_TYPE_DRAG
-        duration = 3.5
+        duration = 3.5*speed_coef
       else
         raise "Unknown scroll action type #{type}"
       end