testa_appium_driver 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57c9443d16200ae583fc1d8a4cae4b27890566bfd0cd919dc7aae5b7e9f371f9
-  data.tar.gz: 4fd4ec8bd0b7bb3f0f9ccea250873878e17553ef06993d7f11d8c03db224a065
+  metadata.gz: d6d109085373d1b5104d594c05d198294301d008d6a59db3069c78af30694ec5
+  data.tar.gz: d7cd88ba139a0ee76ed56b7c1c60fba948ddb6986178286c940397b3b30ef0a9
 SHA512:
-  metadata.gz: abadbdf89242733883b65c781d2b6875a7a373f5667a7aab7ba4c77bd13bacc4069d7a9ac031d3cc541bc292c9dd48e5bf520dff9dcbb996b8abe6bc5e565e1a
-  data.tar.gz: 221a32b22c15d0ee23a75cb65fb61862700ff176c13a8fd573878a83896f65f518401a768218b3460fcaef12dc32780199a0e96fa718f07c3a8ac9d43087f0a4
+  metadata.gz: 6a4e0b8f0021eebf8adb857ca9ec261b0031d4dca89a83530302b95b0fa82e0f199aeda872031ecbdb3b7f8e6425b6c1be9bc4fec0b97731c91382040e394f7a
+  data.tar.gz: fbbd93b4dea4dc65a1350c0453984bfd9c345bf591040de63402ed4958780d730231aeed99e399d2caf30d52e104b961c8b653d1ac077faf403942a23b238447

data/.gitignore

@@ -13,4 +13,4 @@
 /.idea/deployment.xml
 /.idea/workspace.xml
 /.idea/misc.xml
-Gemfile.lock
+Gemfile.lock

data/.idea/deployment.xml

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData">
+  <component name="PublishConfigData" autoUpload="On explicit save action" serverName="supertesta.com" preserveTimestamps="false" autoUploadExternalChanges="true">
     <serverData>
       <paths name="supertesta.com">
+        <serverdata>
+          <mappings>
+            <mapping deploy="/testa_docker/path_data/testa_appium_driver" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="testa.fun">
         <serverdata>
           <mappings>
             <mapping local="$PROJECT_DIR$" web="/" />
@@ -10,5 +17,6 @@
         </serverdata>
       </paths>
     </serverData>
+    <option name="myAutoUpload" value="ON_EXPLICIT_SAVE" />
   </component>
 </project>

data/.idea/runConfigurations.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

data/.idea/sshConfigs.xml

@@ -5,6 +5,9 @@
       <sshConfig authType="PASSWORD" host="supertesta.com" id="ea45cb27-d516-4292-a1f7-430f02857685" port="22" customName="Supertesta.com" nameFormat="CUSTOM" username="testa">
         <option name="customName" value="Supertesta.com" />
       </sshConfig>
+      <sshConfig authType="PASSWORD" host="testa.fun" id="54640192-a130-4edc-ac3c-f3bc32df1130" port="22" customName="testa.fun" nameFormat="CUSTOM" username="root">
+        <option name="customName" value="testa.fun" />
+      </sshConfig>
     </configs>
   </component>
 </project>

data/.idea/webServers.xml

@@ -9,6 +9,13 @@
           </advancedOptions>
         </fileTransfer>
       </webServer>
+      <webServer id="e1897dc5-c089-49e3-802d-1c69de9874a7" name="testa.fun" url="http://something">
+        <fileTransfer rootFolder="/ruby_apps" accessType="SFTP" host="testa.fun" port="22" sshConfigId="54640192-a130-4edc-ac3c-f3bc32df1130" sshConfig="testa.fun">
+          <advancedOptions>
+            <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
+          </advancedOptions>
+        </fileTransfer>
+      </webServer>
     </option>
   </component>
 </project>

data/README.md

@@ -202,12 +202,18 @@ siblings selector can only be used with xpath strategy.
 - search_views
 - spinner
 - spinners
+- switch
+- switches
 - toast
 - toasts
 - toolbar
 - toolbars
 - text_view
 - text_views
+- web_view
+- web_views
+- card_view
+- card_views
 
 Adjacent selectors
 - from_parent
@@ -323,11 +329,15 @@ Type Selector arguments
 
 # Scroll actions
 - each
-- align!
-- align_top!
-- align_bottom!
-- align_left!
-- align_right!
+- each_down
+- each_up
+- each_left
+- each_right
+- align! (if does not exist, will scroll to find)
+- align_top! (if does not exist, will scroll to find)
+- align_bottom! (if does not exist, will scroll to find)
+- align_left! (if does not exist, will scroll to find)
+- align_right! (if does not exist, will scroll to find)
 - align
 - align_top
 - align_bottom
@@ -355,6 +365,9 @@ Type Selector arguments
 - as_scrollable
 - wait_until_exists
 - wait_while_exists
+- wait_until
+- wait_while
+- when_exists
 - exists?
 - long_tap
 

data/lib/testa_appium_driver/android/class_selectors.rb

@@ -24,6 +24,9 @@ module TestaAppiumDriver
     # @param selectors [Hash]
     # @return [TestaAppiumDriver::Locator] first element
     def element(selectors = {})
+      unless selectors[:image].nil?
+        selectors[:strategy] = FIND_STRATEGY_IMAGE
+      end
       add_selector(selectors)
     end
 
@@ -31,24 +34,9 @@ module TestaAppiumDriver
     # @param params [Hash]
     # @return [TestaAppiumDriver::Locator] all elements that match given selectors
     def elements(params = {})
-      params[:single] = false
-      add_selector(params)
-    end
-
-
-    # first element that has scrollable: true
-    # @param selectors [Hash]
-    # @return [TestaAppiumDriver::Locator] first scrollable element
-    def scrollable(selectors = {})
-      selectors[:scrollable] = true
-      add_selector(selectors)
-    end
-
-    # all elements that have scrollable: true
-    # @param params [Hash]
-    # @return [TestaAppiumDriver::Locator] first scrollable element
-    def scrollables(params = {})
-      params[:scrollable] = true
+      unless params[:image].nil?
+        params[:strategy] = FIND_STRATEGY_IMAGE
+      end
       params[:single] = false
       add_selector(params)
     end
@@ -399,5 +387,52 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+
+    # first androidx.cardview.widget.CardView element that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def card_view(params = {})
+      params[:class] = "androidx.cardview.widget.CardView"
+      add_selector(params)
+    end
+
+    # all androidx.cardview.widget.CardView elements that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def card_views(params = {})
+      params[:class] = "androidx.cardview.widget.CardView"
+      params[:single] = false
+      add_selector(params)
+    end
+
+    # first android.widget.Switch element that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def switch(params = {})
+      params[:class] = "android.widget.Switch"
+      add_selector(params)
+    end
+
+    # all android.widget.Switch elements that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def switches(params = {})
+      params[:class] = "android.widget.Switch"
+      params[:single] = false
+      add_selector(params)
+    end
+
+
+    # first android.webkit.WebView element that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def web_view(params = {})
+      params[:class] = "android.webkit.WebView"
+      add_selector(params)
+    end
+
+    # all android.webkit.WebView elements that match given selectors
+    # @return [TestaAppiumDriver::Locator]
+    def web_views(params = {})
+      params[:class] = "android.webkit.WebView"
+      params[:single] = false
+      add_selector(params)
+    end
+
   end
 end

data/lib/testa_appium_driver/android/driver.rb

@@ -24,6 +24,23 @@ module TestaAppiumDriver
     end
 
 
+    def scrollable
+      locator = Locator.new(self, self, {single: true})
+      locator.xpath_selector = "//androidx.recyclerview.widget.RecyclerView|//android.widget.ScrollView|//android.widget.ListView|//android.widget.HorizontalScrollView"
+      locator.ui_selector = "new UiSelector().scrollable(true).instance(0)"
+      locator
+    end
+
+
+    def scrollables
+      locator = Locator.new(self, self, {single: false})
+      locator.xpath_selector = "//androidx.recyclerview.widget.RecyclerView|//android.widget.ScrollView|//android.widget.ListView|//android.widget.HorizontalScrollView"
+      locator.ui_selector = "new UiSelector().scrollable(true)"
+      locator
+    end
+
+
+
     private
     def handle_testa_opts
       if @testa_opts[:default_find_strategy].nil?

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

@@ -7,7 +7,6 @@ module TestaAppiumDriver
 
       @driver = get_driver if self.instance_of?(Selenium::WebDriver::Element)
 
-      @driver.disable_wait_for_idle
       if elements.kind_of?(Selenium::WebDriver::Element)
         r = elements.send(:attribute, name.to_s)
         r = TestaAppiumDriver::Bounds.from_android(r, @driver) if name.to_s == "bounds"
@@ -15,7 +14,6 @@ module TestaAppiumDriver
         r = elements.map { |e| e.send(:attribute, name.to_s) }
         r.map! { |b| TestaAppiumDriver::Bounds.from_android(b, @driver) } if name.to_s == "bounds"
       end
-      @driver.enable_wait_for_idle
       r
     end
 
@@ -110,7 +108,7 @@ module TestaAppiumDriver
       children = self.dup.parent.children.execute
       index = children.index(this)
       raise "Index not found" if index.nil?
-      index
+      index.to_i
     end
   end
 end

data/lib/testa_appium_driver/android/locator.rb

@@ -36,15 +36,23 @@ module TestaAppiumDriver
 
 
     # resolve selector which will be used for finding element
-    def strategy_and_selector
+    def strategies_and_selectors
+      ss = []
       if @can_use_id_strategy
-        return FIND_STRATEGY_ID, @can_use_id_strategy
+        ss.push({"#{FIND_STRATEGY_ID}": @can_use_id_strategy})
       end
-      if (@strategy.nil? && @default_find_strategy == FIND_STRATEGY_UIAUTOMATOR) || @strategy == FIND_STRATEGY_UIAUTOMATOR
-        [FIND_STRATEGY_UIAUTOMATOR, ui_selector]
-      elsif (@strategy.nil? && @default_find_strategy == FIND_STRATEGY_XPATH) || @strategy == FIND_STRATEGY_XPATH
-        [FIND_STRATEGY_XPATH, @xpath_selector]
+      if @strategy.nil? || @strategy == FIND_STRATEGY_UIAUTOMATOR
+        ss.push({"#{FIND_STRATEGY_UIAUTOMATOR}": ui_selector})
       end
+
+      if @strategy.nil? || @strategy == FIND_STRATEGY_XPATH
+        ss.push({"#{FIND_STRATEGY_XPATH}": @xpath_selector})
+      end
+
+      if @strategy == FIND_STRATEGY_IMAGE
+        ss.push({"#{FIND_STRATEGY_IMAGE}": @image_selector})
+      end
+      ss
     end
 
 
@@ -89,6 +97,8 @@ module TestaAppiumDriver
         add_xpath_child_selectors(locator, selectors, single)
       elsif @strategy == FIND_STRATEGY_UIAUTOMATOR
         locator = add_uiautomator_child_selector(locator, selectors, single)
+      elsif @strategy == FIND_STRATEGY_IMAGE
+        locator = add_image_child_selector(locator, selectors, single)
       else
         # both paths are valid
         add_xpath_child_selectors(locator, selectors, single)
@@ -96,7 +106,7 @@ module TestaAppiumDriver
       end
 
       if is_scrollable_selector?(selectors, single)
-        locator.scrollable_locator = self
+        locator.scrollable_locator = locator
         if selectors[:class] == "android.widget.HorizontalScrollView"
           locator.scrollable_locator.scroll_orientation = :horizontal
         else
@@ -123,5 +133,10 @@ module TestaAppiumDriver
         locator
       end
     end
+
+    def add_image_child_selector(locator, selectors, single)
+      params = selectors.merge({single: single, scrollable_locator: locator.scrollable_locator})
+      Locator.new(@driver, self, params)
+    end
   end
 end

data/lib/testa_appium_driver/android/scroll_actions/uiautomator_scroll_actions.rb

@@ -4,8 +4,6 @@ module TestaAppiumDriver
     private
 
     def uiautomator_scroll_to_start_or_end(type)
-      @driver.disable_wait_for_idle
-      @driver.disable_implicit_wait
 
       scrollable_selector = @scrollable.ui_selector(false)
       orientation = @scrollable.scroll_orientation == :vertical ? ".setAsVerticalList()" : ".setAsHorizontalList()"
@@ -19,18 +17,12 @@ module TestaAppiumDriver
       end
 
 
-      @driver.enable_implicit_wait
-      @driver.enable_wait_for_idle
     end
 
 
     def uiautomator_scroll_to
       raise "UiAutomator scroll cannot work with specified direction" unless @direction.nil?
 
-
-      @driver.disable_wait_for_idle
-      @driver.disable_implicit_wait
-
       scrollable_selector = @scrollable.ui_selector(false)
       element_selector = @locator.ui_selector(false)
       orientation_command = @scrollable.scroll_orientation == :vertical ? ".setAsVerticalList()" : ".setAsHorizontalList()"
@@ -41,15 +33,11 @@ module TestaAppiumDriver
       rescue
         # Ignored
       ensure
-        @driver.enable_implicit_wait
-        @driver.enable_wait_for_idle
       end
     end
 
 
     def uiautomator_page_or_fling(type, direction)
-      @driver.disable_wait_for_idle
-      @driver.disable_implicit_wait
 
       scrollable_selector = @scrollable.ui_selector(false)
       orientation = direction == :up || direction == :down ? ".setAsVerticalList()" : ".setAsHorizontalList()"
@@ -67,8 +55,6 @@ module TestaAppiumDriver
       rescue
         # Ignored
       end
-      @driver.enable_implicit_wait
-      @driver.enable_wait_for_idle
     end
 
 

data/lib/testa_appium_driver/common/constants.rb

@@ -6,6 +6,8 @@ module TestaAppiumDriver
   FIND_STRATEGY_XPATH = :xpath
   FIND_STRATEGY_ID = :id
   FIND_STRATEGY_NAME = :name
+  FIND_STRATEGY_IMAGE = :image
+  FIND_STRATEGY_CLASS_CHAIN = :class_chain
 
   SCROLL_STRATEGY_UIAUTOMATOR = :uiautomator
   SCROLL_STRATEGY_W3C = :w3c

data/lib/testa_appium_driver/common/helpers.rb

@@ -120,7 +120,9 @@ module TestaAppiumDriver
         command = "#{ command }[@focused=\"#{ hash[:focused] }\"]" unless hash[:focused].nil?
         command = "#{ command }[@index=\"#{ hash[:index] }\"]" unless hash[:index].nil?
         command = "#{ command }[@selected=\"#{ hash[:selected] }\"]" unless hash[:selected].nil?
-        command = "#{ command }[@scrollable=\"#{ hash[:scrollable] }\"]" unless hash[:scrollable].nil?
+
+        # it seems like you cannot query by scrollable
+        # command = "#{ command }[@scrollable=\"#{ hash[:scrollable] }\"]" unless hash[:scrollable].nil?
       else
 
         hash[:type] = hash[:class] unless hash[:class].nil?
@@ -155,6 +157,33 @@ module TestaAppiumDriver
       command
     end
 
+
+    def hash_to_class_chain(hash, single = true)
+      command = "**/"
+
+      hash[:type] = hash[:class] unless hash[:class].nil?
+      hash[:label] = hash[:text] unless hash[:text].nil?
+      hash[:name] = hash[:id] unless hash[:id].nil?
+      if hash[:type] && hash[:type].kind_of?(String)
+        command = "#{ command }#{hash[:type] }"
+      else
+        command = "#{command}*"
+      end
+
+      command = "#{ command }[`enabled == #{ hash[:enabled] }`]" unless hash[:enabled].nil?
+      command = "#{ command }[`label == \"#{ %(#{hash[:label] }) }\"`]" if hash[:label] && hash[:label].kind_of?(String)
+      command = "#{ command }[`label CONTAINS \"#{ %(#{hash[:label].source }) }\"`]" if hash[:label] && hash[:label].kind_of?(Regexp)
+      command = "#{ command }[`name == \"#{ %(#{hash[:name] }) }\"`]" if hash[:name] && hash[:name].kind_of?(String)
+      command = "#{ command }[`name CONTAINS \"#{ %(#{hash[:name].source }) }\"`]" if hash[:name] && hash[:name].kind_of?(Regexp)
+      command = "#{ command }[`value == \"#{ %(#{hash[:value] }) }\"`]" if hash[:value] && hash[:value].kind_of?(String)
+      command = "#{ command }[`value CONTAINS \"#{ %(#{hash[:value].source }) }\"`]" if hash[:value] && hash[:value].kind_of?(Regexp)
+      command = "#{ command }[`visible == #{ hash[:visible] }`]" unless hash[:visible].nil?
+
+      command += "[1]" if single
+
+      command
+    end
+
     # check if selectors are for a scrollable element
     # @param [Boolean] single should the command return first instance or all of matched elements
     # @param [Hash] selectors for fetching elements
@@ -205,6 +234,8 @@ module TestaAppiumDriver
           :visible,
           :name,
           :value,
+
+          :image
       ].include?(key) }
       params = Hash[params.to_a - selectors.to_a]
 

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

@@ -250,6 +250,22 @@ module TestaAppiumDriver
       _fling(:right, _process_deadzone(top, bottom, right, left))
     end
 
+    def drag_up_by(amount)
+      drag_by(amount, direction: :top)
+    end
+
+    def drag_down_by(amount)
+      drag_by(amount, direction: :bottom)
+    end
+
+    def drag_left_by(amount)
+      drag_by(amount, direction: :left)
+    end
+
+    def drag_right_by(amount)
+      drag_by(amount, direction: :right)
+    end
+
 
     # @param [TestaAppiumDriver::Locator, Hash, Selenium::WebDriver::Element, String] to
     #noinspection RubyYardParamTypeMatch,RubyScope
@@ -273,7 +289,7 @@ module TestaAppiumDriver
         x = to[:x]
         y = to[:y]
       end
-      _drag_to(x, y)
+      _drag_to(bounds.center.x, bounds.center.y, x, y)
     end
 
     def drag_by(amount, direction: :top)
@@ -292,7 +308,7 @@ module TestaAppiumDriver
       else
         raise "Unknown direction #{direction}"
       end
-      _drag_to(x, y)
+      _drag_to(b.center.x, b.center.y, x, y)
     end
 
 
@@ -310,11 +326,11 @@ module TestaAppiumDriver
       deadzone
     end
 
-    def _drag_to(x, y)
+    def _drag_to(x0, y0, x1, y1)
       sa = ScrollActions.new(@scrollable_locator,
                              locator: self,
                              default_scroll_strategy: @default_scroll_strategy)
-      sa.drag_to(x, y)
+      sa.drag_to(x0, y0, x1, y1)
       self
     end