testa_appium_driver 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: add83f6c9df4e695d9c8869c37d15611e0b87a065c6f844828264784e6d333a5
-  data.tar.gz: fa96bc1504a4863534aa9557041ce611594e6267c75f8b6a2d300a42605652d3
+  metadata.gz: 593c2444720244c32d1a237a40ed80b3f864595bd5f1f5a197fbf87790b0b8af
+  data.tar.gz: 5da6b35f561eb2deae604705957ce8a220f4d5dd940728188d67096c9c6c3a7b
 SHA512:
-  metadata.gz: b2fac94a46daef9a2782cc854f959434cc811ea3d853021c626c2b3eb12f9b80b8ce98e666472e916f0f2968524828c6635b9f52f5b0473a9a2f5ab92b230aef
-  data.tar.gz: 23f90e32e4c4bb11893a5140202b11a6c7d81681833cd3525539ae470144bce5f92611e57b6c0ac75c90cf6f357183e7c38791d123991d21728d2bdc86a0b4b3
+  metadata.gz: 142dbf94253246348e3802542de308034ba5286286824411d5ae5b711147e5201817bac6951c77286c7a52dd6f4c36d408aa474db860189484535b195846ea89
+  data.tar.gz: 1918230241d2f531bffb5205125dff3cafff25b3d997b219807a1e860ccb34d0ee41082ef4a954c5481101a77885e691364d295d2dee9e580ab730a00ac676a1

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

@@ -1,7 +1,7 @@
 module TestaAppiumDriver
   module Attributes
 
-    #noinspection RubyNilAnalysis
+    # noinspection RubyNilAnalysis
     def testa_attribute(name, *args)
       if self.instance_of?(::Selenium::WebDriver::Element) || self.instance_of?(::Appium::Core::Element)
         @driver = get_driver # does not get correct driver
@@ -10,13 +10,19 @@ module TestaAppiumDriver
         elements = execute(*args)
         raise "Element not found" if elements.nil?
       end
-      
+
       if elements.kind_of?(::Selenium::WebDriver::Element) || elements.kind_of?(::Appium::Core::Element)
-        r = elements.send(:attribute, name.to_s)
-        r = TestaAppiumDriver::Bounds.from_android(r, @driver) if name.to_s == "bounds"
+        if name.to_sym == :bounds
+          refresh_element = elements.find_element(xpath: ".")
+          r = TestaAppiumDriver::Bounds.from_android(refresh_element.send(:attribute, name), @driver)
+        else
+          r = elements.send(:attribute, name.to_s)
+        end
       else
+        # refreshing each element in collection would be too slow
+        # ignore the possibility that the bounds could be stale
         r = elements.map { |e| e.send(:attribute, name.to_s) }
-        r.map! { |b| TestaAppiumDriver::Bounds.from_android(b, @driver) } if name.to_s == "bounds"
+        r.map! { |b| TestaAppiumDriver::Bounds.from_android(b, @driver) } if name.to_sym == :bounds
       end
       r
     end
@@ -101,7 +107,7 @@ module TestaAppiumDriver
   class Locator
 
     # element index in parent element, starts from 0
-    #noinspection RubyNilAnalysis,RubyYardReturnMatch
+    # noinspection RubyNilAnalysis,RubyYardReturnMatch
     # @return [Integer, nil] index of element
     def index(*args)
       raise "Index not supported for uiautomator strategy" if @strategy == FIND_STRATEGY_UIAUTOMATOR

data/lib/testa_appium_driver/android/selenium_element.rb

@@ -9,4 +9,4 @@ module ::Appium
       end
     end
   end
-end
+end

data/lib/testa_appium_driver/common/bounds.rb

@@ -8,7 +8,6 @@ module TestaAppiumDriver
     attr_reader :height
     attr_reader :offset
 
-
     # @param top_left [Coordinates]
     # @param bottom_right [Coordinates]
     # @param window_width [Integer]
@@ -19,7 +18,7 @@ module TestaAppiumDriver
       @width = bottom_right.x - top_left.x
       @height = bottom_right.y - top_left.y
       @offset = Offset.new(self, window_width, window_height)
-      @center = TestaAppiumDriver::Coordinates.new(@top_left.x + @width/2, @top_left.y + @height / 2)
+      @center = TestaAppiumDriver::Coordinates.new(@top_left.x + @width / 2, @top_left.y + @height / 2)
     end
 
     def as_json
@@ -28,7 +27,7 @@ module TestaAppiumDriver
         height: @height,
         top_left: @top_left.as_json,
         bottom_right: @bottom_right.as_json,
-        offset: @offset.as_json
+        offset: @offset.as_json,
       }
     end
 
@@ -41,6 +40,7 @@ module TestaAppiumDriver
     def top_left
       @top_left
     end
+
     # @return [TestaAppiumDriver::Coordinates]
     def bottom_right
       @bottom_right
@@ -51,8 +51,12 @@ module TestaAppiumDriver
       @center
     end
 
+    def ai
+      as_json.ai
+    end
+
     def to_s
-      JSON.dump(as_json)
+      "[#{@top_left.x}, #{@top_left.y}][#{@bottom_right.x}, #{@bottom_right.y}]"
     end
 
     # @param bounds [String] bounds that driver.attribute("bounds") return
@@ -81,7 +85,7 @@ module TestaAppiumDriver
     end
   end
 
-  #noinspection ALL
+  # noinspection ALL
   class Coordinates
     def initialize(x, y)
       @x = x.to_i
@@ -95,7 +99,6 @@ module TestaAppiumDriver
       }
     end
 
-
     # @return [Integer]
     def x
       @x
@@ -107,7 +110,6 @@ module TestaAppiumDriver
     end
   end
 
-
   class Offset
     def initialize(bounds, window_width, window_height)
       @top = bounds.top_left.y
@@ -125,7 +127,6 @@ module TestaAppiumDriver
       }
     end
 
-
     # @return [Integer]
     def top
       @top
@@ -147,4 +148,4 @@ module TestaAppiumDriver
     end
 
   end
-end
+end

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

@@ -110,7 +110,7 @@ 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)
+    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
 
@@ -119,7 +119,7 @@ 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)
+    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
 
@@ -137,7 +137,7 @@ 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)
+    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
 
@@ -146,7 +146,7 @@ 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)
+    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
 
@@ -155,7 +155,7 @@ 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)
+    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
 
@@ -269,7 +269,12 @@ module TestaAppiumDriver
       end
 
       if to.kind_of?(::Selenium::WebDriver::Element) || to.kind_of?(::Appium::Core::Element)
-        bounds = TestaAppiumDriver::Bounds.from_android(to.bounds, @driver)
+        if @driver.device == :android
+          bounds = TestaAppiumDriver::Bounds.from_android(to.bounds, @driver)
+        else
+          bounds = TestaAppiumDriver::Bounds.from_ios(to.bounds, @driver)
+        end
+
         x = bounds.center.x
         y = bounds.center.y
       end
@@ -308,6 +313,7 @@ module TestaAppiumDriver
     end
 
     private
+
     def _process_deadzone(top, bottom, right, left)
       deadzone = nil
       if !top.nil? || !bottom.nil? || !right.nil? || !left.nil?

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

@@ -207,25 +207,25 @@ module ::TestaAppiumDriver
       when :top
         y0 = @bounds.bottom_right.y - @deadzone[:bottom]
         y1 = y0 - @align_offset
-        x0 = @bounds.width / 2
+        x0 = @bounds.center.x
         x1 = x0
         scroll_direction = :down
       when :bottom
         y0 = @bounds.top_left.y + @deadzone[:top]
         y1 = y0 + @align_offset
-        x0 = @bounds.width / 2
+        x0 = @bounds.center.x
         x1 = x0
         scroll_direction = :up
       when :left
         x0 = @bounds.bottom_right.x - @deadzone[:right]
         x1 = x0 - @align_offset
-        y0 = @bounds.height / 2
+        y0 = @bounds.center.y
         y1 = y0
         scroll_direction = :right
       when :right
         x0 = @bounds.top_left.x + @deadzone[:top]
         x1 = x0 + @align_offset
-        y0 = @bounds.height / 2
+        y0 = @bounds.center.y
         y1 = y0
         scroll_direction = :left
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testa_appium_driver
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
 platform: ruby
 authors:
 - karlo.razumovic
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-16 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib_core
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +104,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 +120,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: []