testa_appium_driver 0.1.3 → 0.1.7

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/testa_appium_driver/android/class_selectors.rb

@@ -20,42 +20,36 @@ module TestaAppiumDriver
       end
     end
 
+    # first element that match given selectors
     # @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
 
+    # all elements that match given selectors
     # @param params [Hash]
     # @return [TestaAppiumDriver::Locator] all elements that match given selectors
     def elements(params = {})
+      unless params[:image].nil?
+        params[:strategy] = FIND_STRATEGY_IMAGE
+      end
       params[:single] = false
       add_selector(params)
     end
 
 
-    # @param selectors [Hash]
-    # @return [TestaAppiumDriver::Locator] first scrollable element
-    def scrollable(selectors = {})
-      selectors[:scrollable] = true
-      add_selector(selectors)
-    end
-
-    # @param params [Hash]
-    # @return [TestaAppiumDriver::Locator] first scrollable element
-    def scrollables(params = {})
-      params[:scrollable] = true
-      params[:single] = false
-      add_selector(params)
-    end
-
-
+    # first android.widget.ImageView element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def image_view(params = {})
       params[:class] = "android.widget.ImageView"
       add_selector(params)
     end
 
+    # all android.widget.ImageView elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def image_views(params = {})
       params[:class] = "android.widget.ImageView"
@@ -63,12 +57,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.FrameLayout element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def frame_layout(params = {})
       params[:class] = "android.widget.FrameLayout"
       add_selector(params)
     end
 
+    # all android.widget.FrameLayout elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def frame_layouts(params = {})
       params[:class] = "android.widget.FrameLayout"
@@ -76,12 +72,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.LinearLayout element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def linear_layout(params = {})
       params[:class] = "android.widget.LinearLayout"
       add_selector(params)
     end
 
+    # all android.widget.LinearLayout elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def linear_layouts(params = {})
       params[:class] = "android.widget.LinearLayout"
@@ -89,12 +87,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.view.View element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def view(params = {})
       params[:class] = "android.view.View"
       add_selector(params)
     end
 
+    # all android.view.View elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def views(params = {})
       params[:class] = "android.view.View"
@@ -102,12 +102,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.EditText element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def edit_text(params = {})
       params[:class] = "android.widget.EditText"
       add_selector(params)
     end
 
+    # all android.widget.EditText elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def edit_texts(params = {})
       params[:class] = "android.widget.EditText"
@@ -115,12 +117,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.ViewGroup element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def view_group(params = {})
       params[:class] = "android.widget.ViewGroup"
       add_selector(params)
     end
 
+    # all android.widget.ViewGroup elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def view_groups(params = {})
       params[:class] = "android.widget.ViewGroup"
@@ -128,12 +132,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.RelativeLayout element that match given selecotrs
     # @return [TestaAppiumDriver::Locator]
     def relative_layout(params = {})
       params[:class] = "android.widget.RelativeLayout"
       add_selector(params)
     end
 
+    # all android.widget.RelativeLayout elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def relative_layouts(params = {})
       params[:class] = "android.widget.RelativeLayout"
@@ -141,12 +147,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first androidx.recyclerview.widget.RecyclerView element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def recycler_view(params = {})
       params[:class] = "androidx.recyclerview.widget.RecyclerView"
       add_selector(params)
     end
 
+    # all androidx.recyclerview.widget.RecyclerView elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def recycler_views(params = {})
       params[:class] = "androidx.recyclerview.widget.RecyclerView"
@@ -154,12 +162,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.Button element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def button(params = {})
       params[:class] = "android.widget.Button"
       add_selector(params)
     end
 
+    # all android.widget.Button elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def buttons(params = {})
       params[:class] = "android.widget.Button"
@@ -167,12 +177,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.ImageButton element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def image_button(params = {})
       params[:class] = "android.widget.ImageButton"
       add_selector(params)
     end
 
+    # all android.widget.ImageButton elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def image_buttons(params = {})
       params[:class] = "android.widget.ImageButton"
@@ -180,12 +192,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.HorizontalScrollView element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def horizontal_scroll_view(params = {})
       params[:class] = "android.widget.HorizontalScrollView"
       add_selector(params)
     end
 
+    # all android.widget.HorizontalScrollView elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def horizontal_scroll_views(params = {})
       params[:class] = "android.widget.HorizontalScrollView"
@@ -193,12 +207,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.ScrollView element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def scroll_view(params = {})
       params[:class] = "android.widget.ScrollView"
       add_selector(params)
     end
 
+    # all android.widget.ScrollView elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def scroll_views(params = {})
       params[:class] = "android.widget.ScrollView"
@@ -206,12 +222,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first viewpager.widget.ViewPager element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def view_pager(params = {})
       params[:class] = "androidx.viewpager.widget.ViewPager"
       add_selector(params)
     end
 
+    # all viewpager.widget.ViewPager elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def view_pagers(params = {})
       params[:class] = "androidx.viewpager.widget.ViewPager"
@@ -219,12 +237,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.CheckBox element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def check_box(params = {})
       params[:class] = "android.widget.CheckBox"
       add_selector(params)
     end
 
+    # all android.widget.CheckBox elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def check_boxes(params = {})
       params[:class] = "android.widget.CheckBox"
@@ -232,12 +252,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.ListView element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def list_view(params = {})
       params[:class] = "android.widget.ListView"
       add_selector(params)
     end
 
+    # all android.widget.ListView elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def list_views(params = {})
       params[:class] = "android.widget.ListView"
@@ -245,12 +267,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.ProgressBar element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def progress_bar(params = {})
       params[:class] = "android.widget.ProgressBar"
       add_selector(params)
     end
 
+    # all android.widget.ProgressBar elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def progress_bars(params = {})
       params[:class] = "android.widget.ProgressBar"
@@ -258,12 +282,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.RadioButton element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def radio_button(params = {})
       params[:class] = "android.widget.RadioButton"
       add_selector(params)
     end
 
+    # all android.widget.RadioButton elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def radio_buttons(params = {})
       params[:class] = "android.widget.RadioButton"
@@ -271,12 +297,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.RadioGroup element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def radio_group(params = {})
       params[:class] = "android.widget.RadioGroup"
       add_selector(params)
     end
 
+    # all android.widget.RadioGroup elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def radio_groups(params = {})
       params[:class] = "android.widget.RadioGroup"
@@ -284,12 +312,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.SearchView element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def search_view(params = {})
       params[:class] = "android.widget.SearchView"
       add_selector(params)
     end
 
+    # all android.widget.SearchView elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def search_views(params = {})
       params[:class] = "android.widget.SearchView"
@@ -297,12 +327,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.Spinner element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def spinner(params = {})
       params[:class] = "android.widget.Spinner"
       add_selector(params)
     end
 
+    # all android.widget.Spinner elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def spinners(params = {})
       params[:class] = "android.widget.Spinner"
@@ -310,12 +342,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.Toast element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def toast(params = {})
       params[:class] = "android.widget.Toast"
       add_selector(params)
     end
 
+    # all android.widget.Toast elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def toasts(params = {})
       params[:class] = "android.widget.Toast"
@@ -323,12 +357,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.Toolbar element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def toolbar(params = {})
       params[:class] = "android.widget.Toolbar"
       add_selector(params)
     end
 
+    # all android.widget.Toolbar elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def toolbars(params = {})
       params[:class] = "android.widget.Toolbar"
@@ -336,12 +372,14 @@ module TestaAppiumDriver
       add_selector(params)
     end
 
+    # first android.widget.TextView element that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def text_view(params = {})
       params[:class] = "android.widget.TextView"
       add_selector(params)
     end
 
+    # all android.widget.TextView elements that match given selectors
     # @return [TestaAppiumDriver::Locator]
     def text_views(params = {})
       params[:class] = "android.widget.TextView"
@@ -349,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

@@ -8,11 +8,11 @@ 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']
     # @param [Integer] timeout Command timeout in milliseconds. If the command blocks for longer than this timeout then an exception is going to be thrown. The default timeout is 20000 ms
     # @param [Boolean] includeStderr 	Whether to include stderr stream into the returned result.
-    #noinspection RubyParameterNamingConvention
     def shell(command, args: nil, timeout: nil, includeStderr: true)
       params = {
           command: command,
@@ -24,6 +24,24 @@ 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?
         @default_find_strategy = DEFAULT_ANDROID_FIND_STRATEGY

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
 
 
@@ -75,7 +83,7 @@ module TestaAppiumDriver
     end
 
 
-    # @return [Locator] existing locator element
+    # @return [Locator] new child locator element
     def add_child_selector(params)
       params, selectors = extract_selectors_from_params(params)
       single = params[:single]
@@ -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)
@@ -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,7 @@ module TestaAppiumDriver
   FIND_STRATEGY_XPATH = :xpath
   FIND_STRATEGY_ID = :id
   FIND_STRATEGY_NAME = :name
+  FIND_STRATEGY_IMAGE = :image
 
   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?
@@ -205,6 +207,8 @@ module TestaAppiumDriver
           :visible,
           :name,
           :value,
+
+          :image
       ].include?(key) }
       params = Hash[params.to_a - selectors.to_a]