testa_appium_driver 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81983750f782941f5fb92f5261e63e70a7ec3ebfc539d75cdcb0ae89e7466ee1
-  data.tar.gz: 0ebb35e812a6bbe96b3301e4420fac3ff4cfe0ab4dc6681d4db2b272f7a1fad9
+  metadata.gz: 1c55e4e3d29193b3bc89ea292de2c36d093897208050494204da865ea4902d6c
+  data.tar.gz: 35014def9a47f5fcfb1242cd1c897a4c13add7f1e9359b66170c2057aa450e3c
 SHA512:
-  metadata.gz: 81235f7492aa031cbb25cfda0a74c1e08b14e723b293085e23f145fbf7eff59883fa677720b074306afef4ece650cad6f56e6d5a6f524b5a7eaaa5e160577c47
-  data.tar.gz: 4ad3449934ca4f3cec3b7b886970eb66fc2dc64207ef4cc14d50d21fb33cc0a232bdbe631922ec34e6a88228ab0735c466d58a6527cd11628f4919dc7199ee15
+  metadata.gz: 3562a893791f45303d3cf4cbb3d2b1d1510122ae296e9fb257ce25bd83a9388efacd69ebc9e149219fc5a02fc42f80a9c05f0be72241909b6cd142abfec48e8b
+  data.tar.gz: 741a8b9d2b1683484e0100d01c53966d63f9eeacb19ca188589e32b62990ee1cc822d8306e6e23baf34f93ac0a34b929ce5342fdbe1d4a80f3be0e87acf7d28c

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/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,

data/lib/testa_appium_driver/common/locator.rb

@@ -139,7 +139,6 @@ module TestaAppiumDriver
     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
@@ -269,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
@@ -308,19 +303,55 @@ module TestaAppiumDriver
     end
 
 
-    def tap
-      click
+    def tap(x = nil, y = nil)
+      click(x, y)
     end
 
-    def click
-      if @driver.device == :android
-        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
-        # 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
+        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
 
@@ -487,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/driver.rb

@@ -151,7 +151,7 @@ module TestaAppiumDriver
         @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})
+        @driver.update_settings({waitForSelectorTimeout: 1})
     end
 
 
@@ -159,7 +159,7 @@ module TestaAppiumDriver
     def disable_wait_for_idle
       if @device == :android
         @wait_for_idle_timeout = @driver.settings.get["waitForIdleTimeout"]
-        @driver.update_settings({waitForIdleTimeout: 0})
+        @driver.update_settings({waitForIdleTimeout: 1})
       end
     end
 
@@ -244,6 +244,36 @@ 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
 
 
 

data/lib/testa_appium_driver/version.rb

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

data/testa_appium_driver.iml

@@ -11,12 +11,12 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="appium_lib_core (v4.7.0, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, ruby-2.6.5-p114) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, ruby-2.6.5-p114) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.2.24, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="childprocess (v3.0.0, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.4.4, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="eventmachine (v1.2.7, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="faye-websocket (v0.11.1, ruby-2.6.5-p114) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v2.1.0, ruby-2.6.5-p114) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v2.5.1, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parallel (v1.20.1, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parser (v3.0.2.0, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, ruby-2.6.5-p114) [gem]" level="application" />
@@ -28,8 +28,8 @@
     <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.10.1, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.10.2, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.10.2, ruby-2.6.5-p114) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.19.0, ruby-2.6.5-p114) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.10.0, ruby-2.6.5-p114) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.20.0, ruby-2.6.5-p114) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.11.0, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.11.0, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubyzip (v2.3.2, ruby-2.6.5-p114) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="selenium-webdriver (v3.142.7, ruby-2.6.5-p114) [gem]" level="application" />

metadata

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