testa_appium_driver 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65be3b1fd729bc6fae7bd56227ac9fd4e2167b0e132657ac19e40a0ad184adcf
-  data.tar.gz: bceb63d4ee18a492482d0b45ed41167a655cff3e565443fafeabf489672bcea2
+  metadata.gz: add83f6c9df4e695d9c8869c37d15611e0b87a065c6f844828264784e6d333a5
+  data.tar.gz: fa96bc1504a4863534aa9557041ce611594e6267c75f8b6a2d300a42605652d3
 SHA512:
-  metadata.gz: 2ac6d2ae6a120827a412f1ce018bef76d50080538607588cae5240db1cedc4d52599b13e6a4c1e7150f2d607495a76e890e0154a6abae147b501b6b22a69b5f0
-  data.tar.gz: 9dce5768f0f217de3ab7730a7b3d5645d66a5cbc0cb326f71c6df8cc9dca2d23351fb80661e52d6782d07f3e5f01fbfe21f8e56bf39f58ee954a73154e055f12
+  metadata.gz: b2fac94a46daef9a2782cc854f959434cc811ea3d853021c626c2b3eb12f9b80b8ce98e666472e916f0f2968524828c6635b9f52f5b0473a9a2f5ab92b230aef
+  data.tar.gz: 23f90e32e4c4bb11893a5140202b11a6c7d81681833cd3525539ae470144bce5f92611e57b6c0ac75c90cf6f357183e7c38791d123991d21728d2bdc86a0b4b3

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

@@ -67,14 +67,13 @@ module TestaAppiumDriver
     # If the distance is greater than the threshold, it will attempt to realign it up to 2 more times.
     # 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, max_attempts: 3, bounds_from_cache_element: true)
+    def align(with = :top, top: nil, bottom: nil, right: nil, left: nil, scroll_to_find: false, max_attempts: 3)
       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,
                              deadzone: deadzone,
-                             default_scroll_strategy: @default_scroll_strategy,
-                             bounds_from_cache_element: bounds_from_cache_element)
+                             default_scroll_strategy: @default_scroll_strategy)
       sa.align(with, scroll_to_find, max_attempts)
       self
     end
@@ -84,8 +83,8 @@ module TestaAppiumDriver
     # If the distance is greater than the threshold, it will attempt to realign it up to 2 more times.
     # The retry mechanism allows alignment even for dynamic layouts when elements are hidden/show when scrolling to certain direction
     # @return [TestaAppiumDriver::Locator]
-    def align_top(top: nil, bottom: nil, right: nil, left: nil, max_attempts: 3, bounds_from_cache_element: true)
-      align(:top, top: top, bottom: bottom, right: right, left: left, max_attempts: max_attempts, bounds_from_cache_element: bounds_from_cache_element)
+    def align_top(top: nil, bottom: nil, right: nil, left: nil, max_attempts: 3)
+      align(:top, top: top, bottom: bottom, right: right, left: left, max_attempts: max_attempts)
     end
 
     # Aligns element on bottom of the scrollable container, if the element does not exists it will scroll to find it
@@ -93,8 +92,8 @@ module TestaAppiumDriver
     # If the distance is greater than the threshold, it will attempt to realign it up to 2 more times.
     # The retry mechanism allows alignment even for dynamic layouts when elements are hidden/show when scrolling to certain direction
     # @return [TestaAppiumDriver::Locator]
-    def align_bottom(top: nil, bottom: nil, right: nil, left: nil, max_attempts: 3, bounds_from_cache_element: true)
-      align(:bottom, top: top, bottom: bottom, right: right, left: left, max_attempts: max_attempts, bounds_from_cache_element: bounds_from_cache_element)
+    def align_bottom(top: nil, bottom: nil, right: nil, left: nil, max_attempts: 3)
+      align(:bottom, top: top, bottom: bottom, right: right, left: left, max_attempts: max_attempts)
     end
 
     # Aligns element on left of the scrollable container, if the element does not exists it will scroll to find it
@@ -102,8 +101,8 @@ module TestaAppiumDriver
     # If the distance is greater than the threshold, it will attempt to realign it up to 2 more times.
     # The retry mechanism allows alignment even for dynamic layouts when elements are hidden/show when scrolling to certain direction
     # @return [TestaAppiumDriver::Locator]
-    def align_left(top: nil, bottom: nil, right: nil, left: nil, max_attempts: 3, bounds_from_cache_element: true)
-      align(:left, top: top, bottom: bottom, right: right, left: left, max_attempts: max_attempts, bounds_from_cache_element: bounds_from_cache_element)
+    def align_left(top: nil, bottom: nil, right: nil, left: nil, max_attempts: 3)
+      align(:left, top: top, bottom: bottom, right: right, left: left, max_attempts: max_attempts)
     end
 
     # Aligns element on right of the scrollable container, if the element does not exists it will scroll to find it
@@ -111,8 +110,8 @@ module TestaAppiumDriver
     # If the distance is greater than the threshold, it will attempt to realign it up to 2 more times.
     # The retry mechanism allows alignment even for dynamic layouts when elements are hidden/show when scrolling to certain direction
     # @return [TestaAppiumDriver::Locator]
-    def align_right(top: nil, bottom: nil, right: nil, left: nil,  max_attempts: 3, bounds_from_cache_element: true)
-      align(:right, top: top, bottom: bottom, right: right, left: left, max_attempts: max_attempts, bounds_from_cache_element: bounds_from_cache_element)
+    def align_right(top: nil, bottom: nil, right: nil, left: nil,  max_attempts: 3)
+      align(:right, top: top, bottom: bottom, right: right, left: left, max_attempts: max_attempts)
     end
 
     # Aligns element (by default) on top of the scrollable container, if the element does not exists it raise an exception
@@ -120,8 +119,8 @@ module TestaAppiumDriver
     # If the distance is greater than the threshold, it will attempt to realign it up to 2 more times.
     # 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,  max_attempts: 3, bounds_from_cache_element: true)
-      align(with, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true, max_attempts: max_attempts, bounds_from_cache_element: bounds_from_cache_element)
+    def align!(with = :top, top: nil, bottom: nil, right: nil, left: nil,  max_attempts: 3)
+      align(with, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true, max_attempts: max_attempts)
     end
 
     # Aligns element on top of the scrollable container, if the element does not exists it raise an exception
@@ -129,8 +128,8 @@ module TestaAppiumDriver
     # If the distance is greater than the threshold, it will attempt to realign it up to 2 more times.
     # The retry mechanism allows alignment even for dynamic layouts when elements are hidden/show when scrolling to certain direction
     # @return [TestaAppiumDriver::Locator]
-    def align_top!(top: nil, bottom: nil, right: nil, left: nil, max_attempts: 3, bounds_from_cache_element: true)
-      align(:top, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true, max_attempts: max_attempts, bounds_from_cache_element: bounds_from_cache_element)
+    def align_top!(top: nil, bottom: nil, right: nil, left: nil, max_attempts: 3)
+      align(:top, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true, max_attempts: max_attempts)
     end
 
     # Aligns element on bottom of the scrollable container, if the element does not exists it raise an exception
@@ -138,8 +137,8 @@ module TestaAppiumDriver
     # If the distance is greater than the threshold, it will attempt to realign it up to 2 more times.
     # The retry mechanism allows alignment even for dynamic layouts when elements are hidden/show when scrolling to certain direction
     # @return [TestaAppiumDriver::Locator]
-    def align_bottom!(top: nil, bottom: nil, right: nil, left: nil,  max_attempts: 3, bounds_from_cache_element: true)
-      align(:bottom, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true, max_attempts: max_attempts, bounds_from_cache_element: bounds_from_cache_element)
+    def align_bottom!(top: nil, bottom: nil, right: nil, left: nil,  max_attempts: 3)
+      align(:bottom, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true, max_attempts: max_attempts)
     end
 
     # Aligns element on left of the scrollable container, if the element does not exists it raise an exception
@@ -147,8 +146,8 @@ module TestaAppiumDriver
     # If the distance is greater than the threshold, it will attempt to realign it up to 2 more times.
     # The retry mechanism allows alignment even for dynamic layouts when elements are hidden/show when scrolling to certain direction
     # @return [TestaAppiumDriver::Locator]
-    def align_left!(top: nil, bottom: nil, right: nil, left: nil,  max_attempts: 3, bounds_from_cache_element: true)
-      align(:left, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true, max_attempts: max_attempts, bounds_from_cache_element: bounds_from_cache_element)
+    def align_left!(top: nil, bottom: nil, right: nil, left: nil,  max_attempts: 3)
+      align(:left, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true, max_attempts: max_attempts)
     end
 
     # Aligns element on right of the scrollable container, if the element does not exists it raise an exception
@@ -156,8 +155,8 @@ module TestaAppiumDriver
     # If the distance is greater than the threshold, it will attempt to realign it up to 2 more times.
     # The retry mechanism allows alignment even for dynamic layouts when elements are hidden/show when scrolling to certain direction
     # @return [TestaAppiumDriver::Locator]
-    def align_right!(top: nil, bottom: nil, right: nil, left: nil,  max_attempts: 3, bounds_from_cache_element: true)
-      align(:right, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true, max_attempts: max_attempts, bounds_from_cache_element: bounds_from_cache_element)
+    def align_right!(top: nil, bottom: nil, right: nil, left: nil,  max_attempts: 3)
+      align(:right, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true, max_attempts: max_attempts)
     end
 
     # First scrolls to the beginning of the scrollable container and then scrolls down until element is found or end is reached

data/lib/testa_appium_driver/common/locator.rb

@@ -187,7 +187,8 @@ module ::TestaAppiumDriver
       begin
         r = execute(skip_cache: true, ignore_implicit_wait: true)
         return r.count.positive? if r.is_a?(Array)
-        return r.displayed? if @driver.ios?
+        # ios17 has phantom child elements that overlap parent so this returns false positive
+        # return r.displayed? if @driver.ios?
       rescue StandardError
         found = false
       end
@@ -332,56 +333,51 @@ module ::TestaAppiumDriver
     # 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, 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.is_a?(Integer)
-          if x >= 0
-            x = b.top_left.x + x
-          else
-            x = b.bottom_right.x + x
-          end
-        elsif x.is_a?(Float) && x <= 1.0 && x >= 0
-          x = b.top_left.x + b.width * x
+    def click(x = nil, y = nil, double: false)
+      x = 0.5 if x.nil?
+      y = 0.5 if y.nil?
+
+      b = self.bounds
+      if x.is_a?(Integer)
+        if x >= 0
+          x = b.top_left.x + x
         else
-          raise "x value #{x} not supported. Use integer as pixel or float (0..1) as percentage of element width"
+          x = b.bottom_right.x + x
         end
+      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. Use integer as pixel or float (0..1) as percentage of element width"
+      end
 
-        if y.is_a?(Integer)
-          if y >= 0
-            y = b.top_left.y + y
-          else
-            y = b.bottom_right + y
-          end
-        elsif y.is_a?(Float) && y <= 1.0 && y >= 0
-          y = b.top_left.y + b.height * y
+      if y.is_a?(Integer)
+        if y >= 0
+          y = b.top_left.y + y
         else
-          raise "y value #{x} not supported. Use integer as pixel or float (0..1) as percentage of element height"
+          y = b.bottom_right + y
         end
+      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
-        f1 = action_builder.add_pointer_input(:touch, "finger1")
-        f1.create_pointer_move(duration: 0.1, x: x, y: y, origin: ::Selenium::WebDriver::Interactions::PointerMove::VIEWPORT)
+      action_builder = @driver.action
+      f1 = action_builder.add_pointer_input(:touch, "finger1")
+      f1.create_pointer_move(duration: 0.1, x: x, y: y, origin: ::Selenium::WebDriver::Interactions::PointerMove::VIEWPORT)
+      f1.create_pointer_down(:left)
+      f1.create_pointer_up(:left)
+      if double
+        if @driver.ios?
+          # NOTE: ios is stupid, we have to do another move
+          # NOTE: ios is stupid, works very wierd if duration is 0
+          f1.create_pointer_move(duration: 0.1, x: x, y: y, origin: ::Selenium::WebDriver::Interactions::PointerMove::VIEWPORT)
+        end
+        f1.create_pause(0.1)
         f1.create_pointer_down(:left)
         f1.create_pointer_up(:left)
-        if double
-          if @driver.ios?
-            # NOTE: ios is stupid, we have to do another move
-            # NOTE: ios is stupid, works very wierd if duration is 0
-            f1.create_pointer_move(duration: 0.1, x: x, y: y, origin: ::Selenium::WebDriver::Interactions::PointerMove::VIEWPORT)
-          end
-          f1.create_pause(0.1)
-          f1.create_pointer_down(:left)
-          f1.create_pointer_up(:left)
-        end
-        @driver.perform_actions [f1]
-      else
-        perform_driver_method(:click)
       end
+      @driver.perform_actions [f1]
     end
 
     alias_method :tap, :click

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

@@ -186,7 +186,7 @@ module ::TestaAppiumDriver
       stale_retries = 0
       begin
         until is_aligned?(with, element) || timeout == max_attempts
-          #           $ctx.puts("align roudn: #{timeout}")
+          # $ctx.puts("align roudn: #{timeout}")
           w3c_attempt_align(with, speed_coef)
           timeout += 1
         end
@@ -194,12 +194,12 @@ module ::TestaAppiumDriver
         # if boundElementsByIndex is enabled, we can get stale element reference while doing scroll each
         stale_retries += 1
         sleep 0.2
-        #         $ctx.puts "Looking for #{@locator.xpath_selector}"
+        # $ctx.puts "Looking for #{@locator.xpath_selector}"
         element = @locator.execute if @locator.instance_of?(TestaAppiumDriver::Locator)
         retry if stale_retries < 4
         raise
       end
-      #       $ctx.puts("end align")
+      # $ctx.puts("end align")
     end
 
     def w3c_attempt_align(with, speed_coef)
@@ -240,9 +240,9 @@ module ::TestaAppiumDriver
       rounds = 0
       max_scrolls_reached = false
       end_of_scroll_reached = false
-      #       $ctx.puts("starting scroll to")
+      # $ctx.puts("starting scroll to")
       until (element_found = ((@driver.android? && @locator.exists?) || (@driver.ios? && @locator.exists? && @locator.in_viewport?))) || end_of_scroll_reached
-        #         $ctx.puts("Scroll to round: #{rounds}")
+        # $ctx.puts("Scroll to round: #{rounds}")
         end_of_scroll_reached = is_end_of_scroll?
         case direction
         when :down
@@ -268,7 +268,7 @@ module ::TestaAppiumDriver
         max_scrolls_reached = true if rounds == @max_scrolls
         break if rounds == @max_scrolls
       end
-      #       $ctx.puts("end scroll to")
+      # $ctx.puts("end scroll to")
       raise Selenium::WebDriver::Error::NoSuchElementError if (max_scrolls_reached || end_of_scroll_reached) && !element_found
     end
 
@@ -362,8 +362,8 @@ module ::TestaAppiumDriver
         f1.create_pointer_move(duration: overscroll_pause, x: x1, y: y1, origin: ::Selenium::WebDriver::Interactions::PointerMove::VIEWPORT)
       end
       f1.create_pointer_up(:left)
-      # puts "Scroll execute[w3c_action]:  #{type}: {x0: #{x0}, y0: #{y0}} => (duration: #{duration}) => {x1: #{x1}, y1: #{y1}}"
-      #       $ctx.puts "Scroll execute[w3c_action]:  #{type}: {x0: #{x0}, y0: #{y0}} => (duration: #{duration}) => {x1: #{x1}, y1: #{y1}}"
+      puts "Scroll execute[w3c_action]:  #{type}: {x0: #{x0}, y0: #{y0}} => (duration: #{duration}) => {x1: #{x1}, y1: #{y1}}"
+      # $ctx.puts "Scroll execute[w3c_action]:  #{type}: {x0: #{x0}, y0: #{y0}} => (duration: #{duration}) => {x1: #{x1}, y1: #{y1}}"
       @driver.perform_actions [f1]
     end
 

data/lib/testa_appium_driver/common/scroll_actions.rb

@@ -16,7 +16,6 @@ module ::TestaAppiumDriver
     #     - deadzone - [Hash] that stores top, bottom, left and right deadzone values. If deadzone[:top] is 200 then 200px from top of the scrollable container will not be used for scrolling
     #     - max_scrolls - [Integer] maximum number of scrolls before exception is thrown
     #     - default_scroll_strategy - defines which scroll strategy will be used if a scroll action is valid for multiple strategies
-    #     - bounds_from_cache_element - true by default, use the cached element to get element bounds
     def initialize(scrollable, params = {})
       @scrollable = scrollable
       @locator = params[:locator]
@@ -24,9 +23,6 @@ module ::TestaAppiumDriver
       @deadzone = params[:deadzone]
       @max_scrolls = params[:max_scrolls]
       @default_scroll_strategy = params[:default_scroll_strategy]
-      @bounds_from_cache_element = params[:bounds_from_cache_element]
-      @bounds_from_cache_element = true if @bounds_from_cache_element.nil?
-
       @driver = @locator.driver
 
       if @scrollable.nil?
@@ -205,20 +201,7 @@ module ::TestaAppiumDriver
     end
 
     def is_aligned?(with, element)
-      if @bounds_from_cache_element
-        # in some cases, the cached element returns the same bounds, even though it was scrolled a split second ago
-        align_bounds = @locator.bounds(force_cache_element: element)
-      else
-        align_bounds = @locator.bounds
-      end
-
-      # $ctx.puts("Align bounds: ")
-      # $ctx.puts(align_bounds)
-      # $ctx.puts("Scrollable bounds: ")
-      # $ctx.puts(@bounds)
-
-      # $ctx.puts("Deadzone: ")
-      # $ctx.puts(@deadzone)
+      align_bounds = @locator.bounds(force_cache_element: element)
       case with
       when :top
         @align_offset = align_bounds.top_left.y - @bounds.top_left.y - @deadzone[:top]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testa_appium_driver
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors:
 - karlo.razumovic
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-25 00:00:00.000000000 Z
+date: 2024-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib_core
@@ -90,7 +90,7 @@ metadata:
   homepage_uri: https://github.com/Karazum/testa_appium_driver
   source_code_uri: https://github.com/Karazum/testa_appium_driver
   changelog_uri: https://github.com/Karazum/testa_appium_driver
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Appium made easy
 test_files: []