testa_appium_driver 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f2c8a8e6fd795af67dac4592eaffc07d186102a19b9ffec5bce2c390ebefbeb
-  data.tar.gz: 97a681eeb0170cd7563a83a9385d12b15af0af4d6fbbec535f7421d8fa0d8c49
+  metadata.gz: 42baeaf531486245427c9a3e2bc002e8c6bf659ec2f7e010cc7f46a56c863f2c
+  data.tar.gz: 31ea0d036c32405f744dfdbbce04d596ff3822cd54144270bed08fd4e7e6c90c
 SHA512:
-  metadata.gz: 5602bfd12d6c4473b09a5454f20f246e51924f791974047951b2923276464184bf96a61895847bc69650d59582eb768e8b2e8a233876c3a8b13b1bba0a533ec7
-  data.tar.gz: 0c20fa50c39cab7adb5462247a4eb1aeb6e9c8edaa1b6c47dd1e2894b8bfe6e4b12bae35ef7f179815dc37dfff34bfc393d3342c1153aa1fc8d45226f0863173
+  metadata.gz: 59ac915f5a1036eb9c943c8770295aaa5def6268685f9db2f7b802d9ac19128d39348c4a3cc9010d45fd0fea5f0ced98327f94a124b0eac55cfaff7b310193aa
+  data.tar.gz: aec59ca33a54aed586c832e82a5aa11ca9d331759aea810a89e6e6e0bd9193f48af7b69d6323427413dffba1d3e5bd693d726db4bc88d4f6f3d7439e55bcc00d

data/.gitattributes

@@ -0,0 +1,23 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Declare files that will always have LF line endings on checkout.
+*.rb text eol=lf
+*.yml text eol=lf
+*.sh text eol=lf
+*.Dockerfile eol=lf
+*.dockerfile eol=lf
+*.conf eol=lf
+*.ru eol=lf
+*.json eol=lf
+*.js eol=lf
+*.css eol=lf
+*.erb eol=lf
+*.html eol=lf
+*.map eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.bin binary
+*.zip binary

data/.gitignore

@@ -13,6 +13,4 @@
 /.idea/deployment.xml
 /.idea/workspace.xml
 /.idea/misc.xml
-Gemfile.lock
-testa_appium_driver.iml
 testa_appium_driver-*.gem

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7.6
 
 Style/StringLiterals:
   Enabled: true

data/Gemfile

@@ -9,4 +9,4 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
-gem "rubocop", "~> 1.7"
+gem "rubocop", "~> 1.26.0", require: false

data/Gemfile.lock

@@ -0,0 +1,74 @@
+PATH
+  remote: .
+  specs:
+    testa_appium_driver (0.1.131)
+      appium_lib_core (= 5.1.0)
+      json (~> 2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appium_lib_core (5.1.0)
+      faye-websocket (~> 0.11.0)
+      selenium-webdriver (~> 4.0)
+    ast (2.4.2)
+    childprocess (4.1.0)
+    diff-lcs (1.5.0)
+    eventmachine (1.2.7)
+    faye-websocket (0.11.1)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.5.1)
+    json (2.6.2)
+    parallel (1.22.1)
+    parser (3.1.2.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.4.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    rubyzip (2.3.2)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2)
+    unicode-display_width (2.1.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rubocop (~> 1.26.0)
+  testa_appium_driver!
+
+BUNDLED WITH
+   2.1.2

data/appium-driver.iml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="RVM: ruby-2.7.6" jdkType="RUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="appium_lib_core (v5.1.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="childprocess (v4.1.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.5.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="eventmachine (v1.2.7, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faye-websocket (v0.11.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v2.6.2, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.22.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="parser (v3.1.2.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.1.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.6, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="regexp_parser (v2.4.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.5, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.11.1, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.26.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.18.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.11.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubyzip (v2.3.2, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="selenium-webdriver (v4.1.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.1.0, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket-driver (v0.7.5, RVM: ruby-2.7.6) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="websocket-extensions (v0.1.5, RVM: ruby-2.7.6) [gem]" level="application" />
+  </component>
+  <component name="RakeTasksCache">
+    <option name="myRootTask">
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build testa_appium_driver-0.1.131.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
+          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
+          <RakeTaskImpl description="Build and install testa_appium_driver-0.1.131.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install testa_appium_driver-0.1.131.gem into system gems without network access" fullCommand="install:local" id="local" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Create tag v0.1.131 and build and push testa_appium_driver-0.1.131.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run RuboCop" fullCommand="rubocop" id="rubocop" />
+          <RakeTaskImpl id="rubocop">
+            <subtasks>
+              <RakeTaskImpl description="Auto-correct RuboCop offenses" fullCommand="rubocop:auto_correct" id="auto_correct" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Run RSpec code examples" fullCommand="spec" id="spec" />
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
+    </option>
+  </component>
+</module>

data/lib/testa_appium_driver/android/class_selectors.rb

@@ -1,14 +1,14 @@
-module TestaAppiumDriver
+module ::TestaAppiumDriver
   #noinspection ALL
   module ClassSelectors
 
     # @return [TestaAppiumDriver::Locator]
     def add_selector(*args, &block)
       # if class selector is executed from driver, create new locator instance
-      if self.kind_of?(TestaAppiumDriver::Driver) || self.instance_of?(Selenium::WebDriver::Element)
+      if self.kind_of?(TestaAppiumDriver::Driver) || self.instance_of?(::Selenium::WebDriver::Element) || self.instance_of?(::Appium::Core::Element)
         args.last[:default_find_strategy] = @default_find_strategy
         args.last[:default_scroll_strategy] = @default_scroll_strategy
-        if self.instance_of?(Selenium::WebDriver::Element)
+        if self.instance_of?(::Selenium::WebDriver::Element) || self.instance_of?(::Appium::Core::Element)
           driver = self.get_driver
         else
           driver = self
@@ -117,17 +117,17 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
-    # first android.widget.ViewGroup element that match given selectors
+    # first android.view.ViewGroup element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def view_group(params = {})
-      params[:class] = "android.widget.ViewGroup"
+      params[:class] = "android.view.ViewGroup"
       add_selector(params)
     end
 
-    # all android.widget.ViewGroup elements that match given selectors
+    # all android.view.ViewGroup elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def view_groups(params = {})
-      params[:class] = "android.widget.ViewGroup"
+      params[:class] = "android.view.ViewGroup"
       params[:single] = false
       add_selector(params)
     end

data/lib/testa_appium_driver/android/driver.rb

@@ -8,6 +8,7 @@ module TestaAppiumDriver
     include ClassSelectors
 
 
+
     # executes shell command
     # @param [String] command Shell command name to execute for example echo or rm
     # @param [Array<String>] args Array of command arguments, example: ['-f', '/sdcard/my_file.txt']

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

@@ -2,12 +2,18 @@ module TestaAppiumDriver
   module Attributes
 
     #noinspection RubyNilAnalysis
-    def attribute(name, *args)
-      elements = execute(*args)
+    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
+        elements = self
+      else
+        elements = execute(*args)
+        raise "Element not found" if elements.nil?
+      end
 
-      @driver = get_driver if self.instance_of?(Selenium::WebDriver::Element)
 
-      if elements.kind_of?(Selenium::WebDriver::Element)
+
+      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"
       else
@@ -18,86 +24,84 @@ module TestaAppiumDriver
     end
 
     def text(*args)
-      attribute("text", *args)
+      testa_attribute("text", *args)
     end
 
     def package(*args)
-      attribute("package", *args)
+      testa_attribute("package", *args)
     end
 
     def class_name(*args)
-      attribute("className", *args)
+      testa_attribute("className", *args)
     end
 
     def checkable?(*args)
-      attribute("checkable", *args).to_s == "true"
+      testa_attribute("checkable", *args).to_s == "true"
     end
 
     def checked?(*args)
-      attribute("checked", *args).to_s == "true"
+      testa_attribute("checked", *args).to_s == "true"
     end
 
     def clickable?(*args)
-      attribute("clickable", *args).to_s == "true"
+      testa_attribute("clickable", *args).to_s == "true"
     end
 
     def desc(*args)
-      attribute("contentDescription", *args)
+      testa_attribute("contentDescription", *args)
     end
 
     def enabled?(*args)
-      attribute("enabled", *args).to_s == "true"
+      testa_attribute("enabled", *args).to_s == "true"
     end
 
     def focusable?(*args)
-      attribute("focusable", *args).to_s == "true"
+      testa_attribute("focusable", *args).to_s == "true"
     end
 
     def focused?(*args)
-      attribute("focused", *args).to_s == "true"
+      testa_attribute("focused", *args).to_s == "true"
     end
 
     def long_clickable?(*args)
-      attribute("longClickable", *args).to_s == "true"
+      testa_attribute("longClickable", *args).to_s == "true"
     end
 
     def password?(*args)
-      attribute("password", *args).to_s == "true"
+      testa_attribute("password", *args).to_s == "true"
     end
 
     def id(*args)
-      attribute("resourceId", *args)
+      testa_attribute("resourceId", *args)
     end
 
     def scrollable?(*args)
-      attribute("scrollable", *args).to_s == "true"
+      testa_attribute("scrollable", *args).to_s == "true"
     end
 
     def selected?(*args)
-      attribute("selected", *args).to_s == "true"
+      testa_attribute("selected", *args).to_s == "true"
     end
 
     def displayed?(*args)
-      attribute("displayed", *args).to_s == "true"
+      testa_attribute("displayed", *args).to_s == "true"
     end
 
     def selection_start(*args)
-      attribute("selection-start", *args)
+      testa_attribute("selection-start", *args)
     end
 
     def selection_end(*args)
-      attribute("selection-end", *args)
+      testa_attribute("selection-end", *args)
     end
 
     def bounds(*args)
-      attribute("bounds", *args)
+      testa_attribute("bounds", *args)
     end
 
   end
 
   class Locator
-    include TestaAppiumDriver::Attributes
-
 
     # element index in parent element, starts from 0
     #noinspection RubyNilAnalysis,RubyYardReturnMatch

data/lib/testa_appium_driver/android/locator.rb

@@ -5,6 +5,7 @@ module TestaAppiumDriver
   class Locator
     attr_accessor :closing_parenthesis
     include ClassSelectors
+    include Attributes
 
     def init(params, selectors, single)
       @closing_parenthesis = 0
@@ -12,7 +13,6 @@ module TestaAppiumDriver
 
       @ui_selector = hash_to_uiautomator(selectors, single)
 
-
       if is_scrollable_selector?(selectors, single)
         if selectors[:class] == "android.widget.HorizontalScrollView"
           @scroll_orientation = :horizontal

data/lib/testa_appium_driver/android/selenium_element.rb

@@ -1,8 +1,12 @@
-module Selenium
-  module WebDriver
+module ::Appium
+  module Core
     class Element
       include TestaAppiumDriver::ClassSelectors
       include TestaAppiumDriver::Attributes
+
+      def parent
+        self.find_element(xpath: "./..")
+      end
     end
   end
 end

data/lib/testa_appium_driver/common/constants.rb

@@ -24,7 +24,8 @@ module TestaAppiumDriver
   DEFAULT_UIAUTOMATOR_MAX_SWIPES = 20
 
   DEFAULT_ANDROID_FIND_STRATEGY = FIND_STRATEGY_UIAUTOMATOR
-  DEFAULT_ANDROID_SCROLL_STRATEGY = SCROLL_STRATEGY_UIAUTOMATOR
+  #DEFAULT_ANDROID_SCROLL_STRATEGY = SCROLL_STRATEGY_UIAUTOMATOR
+  DEFAULT_ANDROID_SCROLL_STRATEGY = SCROLL_STRATEGY_W3C
 
 
   DEFAULT_IOS_FIND_STRATEGY = FIND_STRATEGY_XPATH

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

@@ -20,7 +20,7 @@ module TestaAppiumDriver
     # scrolls to the start of the scrollable containers and scrolls to the end,
     # everytime a locator element is found the given block is executed
     # @return [Array<Selenium::WebDriver::Element>]
-    def each(top: nil, bottom: nil, right: nil, left: nil, direction: nil, &block)
+    def scroll_each(top: nil, bottom: nil, right: nil, left: nil, direction: nil, &block)
       deadzone = _process_deadzone(top, bottom, right, left)
       raise "Each can only be performed on multiple elements locator" if @single
       deadzone = @scrollable_locator.scroll_deadzone if deadzone.nil? && !@scrollable_locator.nil?
@@ -29,38 +29,38 @@ module TestaAppiumDriver
                              deadzone: deadzone,
                              default_scroll_strategy: @default_scroll_strategy)
       if direction.nil?
-        sa.each(&block)
+        sa.scroll_each(&block)
       else
-        sa.send("each_#{direction}", &block)
+        sa.send("scroll_each_#{direction}", &block)
       end
     end
 
     # scrolls down from the current page view (without prior scrolling to the top) and
     # everytime a locator element is found the given block is executed
     # @return [Array<Selenium::WebDriver::Element>]
-    def each_down(top: nil, bottom: nil, right: nil, left: nil, &block)
-      each(top: top, bottom: bottom, right: right, left: left, direction: :down, &block)
+    def scroll_each_down(top: nil, bottom: nil, right: nil, left: nil, &block)
+      scroll_each(top: top, bottom: bottom, right: right, left: left, direction: :down, &block)
     end
 
     # scrolls up from the current page view (without prior scrolling to the bottom) and
     # everytime a locator element is found the given block is executed
     # @return [Array<Selenium::WebDriver::Element>]
-    def each_up(top: nil, bottom: nil, right: nil, left: nil, &block)
-      each(top: top, bottom: bottom, right: right, left: left, direction: :up, &block)
+    def scroll_each_up(top: nil, bottom: nil, right: nil, left: nil, &block)
+      scroll_each(top: top, bottom: bottom, right: right, left: left, direction: :up, &block)
     end
 
     # scrolls right from the current page view (without prior scrolling to the left) and
     # everytime a locator element is found the given block is executed
     # @return [Array<Selenium::WebDriver::Element>]
-    def each_right(top: nil, bottom: nil, right: nil, left: nil, &block)
-      each(top: top, bottom: bottom, right: right, left: left, direction: :right, &block)
+    def scroll_each_right(top: nil, bottom: nil, right: nil, left: nil, &block)
+      scroll_each(top: top, bottom: bottom, right: right, left: left, direction: :right, &block)
     end
 
     # scrolls left from the current page view (without prior scrolling to the right) and
     # everytime a locator element is found the given block is executed
     # @return [Array<Selenium::WebDriver::Element>]
-    def each_left(top: nil, bottom: nil, right: nil, left: nil, &block)
-      each(top: top, bottom: bottom, right: right, left: left, direction: :left, &block)
+    def scroll_each_left(top: nil, bottom: nil, right: nil, left: nil, &block)
+      scroll_each(top: top, bottom: bottom, right: right, left: left, direction: :left, &block)
     end
 
 
@@ -69,14 +69,14 @@ 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)
+    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)
-      sa.align(with, scroll_to_find)
+      sa.align(with, scroll_to_find, max_attempts)
       self
     end
 
@@ -85,8 +85,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)
-      align(:top, top: top, bottom: bottom, right: right, left: left)
+    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
@@ -94,8 +94,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)
-      align(:bottom, top: top, bottom: bottom, right: right, left: left)
+    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
@@ -103,8 +103,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)
-      align(:left, top: top, bottom: bottom, right: right, left: left)
+    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
@@ -112,8 +112,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)
-      align(:right, top: top, bottom: bottom, right: right, left: left)
+    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
@@ -121,8 +121,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)
-      align(with, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true)
+    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
@@ -130,8 +130,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)
-      align(:top, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true)
+    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
@@ -139,8 +139,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)
-      align(:bottom, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true)
+    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
@@ -148,8 +148,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)
-      align(:left, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true)
+    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
@@ -157,8 +157,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)
-      align(:right, top: top, bottom: bottom, right: right, left: left, scroll_to_find: true)
+    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
 
 
@@ -271,10 +271,10 @@ module TestaAppiumDriver
     # @param [TestaAppiumDriver::Locator, Hash, Selenium::WebDriver::Element, String] to
     #noinspection RubyYardParamTypeMatch,RubyScope
     def drag_to(to)
-      if !to.kind_of?(Selenium::WebDriver::Element) && !to.kind_of?(TestaAppiumDriver::Locator) && !to.kind_of?(Hash)
+      if !to.kind_of?(::Selenium::WebDriver::Element) && !to.kind_of?(::Appium::Core::Element) && !to.kind_of?(TestaAppiumDriver::Locator) && !to.kind_of?(Hash)
         raise "Parameter not accepted, acceptable instances of [TestaAppiumDriver::Locator, Hash, Selenium::WebDriver::Element]"
       end
-      if to.kind_of?(Selenium::WebDriver::Element)
+      if to.kind_of?(::Selenium::WebDriver::Element) || to.kind_of?(::Appium::Core::Element)
         bounds = TestaAppiumDriver::Bounds.from_android(to.bounds, @driver)
         x = bounds.center.x
         y = bounds.center.y