testa_appium_driver 0.1.0 → 0.1.4

data/lib/testa_appium_driver/android/class_selectors.rb

@@ -20,12 +20,14 @@ module TestaAppiumDriver
       end
     end
 
+    # first element that match given selectors
     # @param selectors [Hash]
     # @return [TestaAppiumDriver::Locator] first element
     def element(selectors = {})
       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 = {})
@@ -34,6 +36,7 @@ module TestaAppiumDriver
     end
 
 
+    # first element that has scrollable: true
     # @param selectors [Hash]
     # @return [TestaAppiumDriver::Locator] first scrollable element
     def scrollable(selectors = {})
@@ -41,6 +44,7 @@ module TestaAppiumDriver
       add_selector(selectors)
     end
 
+    # all elements that have scrollable: true
     # @param params [Hash]
     # @return [TestaAppiumDriver::Locator] first scrollable element
     def scrollables(params = {})
@@ -50,12 +54,14 @@ module TestaAppiumDriver
     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 +69,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 +84,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 +99,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 +114,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 +129,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 +144,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 +159,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 +174,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 +189,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 +204,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 +219,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 +234,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 +249,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 +264,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 +279,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 +294,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 +309,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 +324,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 +339,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 +354,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 +369,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 +384,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"

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,7 @@ module TestaAppiumDriver
     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/attributes.rb

@@ -1,5 +1,5 @@
 module TestaAppiumDriver
-  module AndroidAttributeModule
+  module Attributes
 
     #noinspection RubyNilAnalysis
     def attribute(name, *args)
@@ -63,8 +63,8 @@ module TestaAppiumDriver
       attribute("longClickable", *args).to_s == "true"
     end
 
-    def password(*args)
-      attribute("password", *args)
+    def password?(*args)
+      attribute("password", *args).to_s == "true"
     end
 
     def id(*args)
@@ -98,7 +98,7 @@ module TestaAppiumDriver
   end
 
   class Locator
-    include TestaAppiumDriver::AndroidAttributeModule
+    include TestaAppiumDriver::Attributes
 
 
     # element index in parent element, starts from 0

data/lib/testa_appium_driver/android/locator.rb

@@ -19,6 +19,15 @@ module TestaAppiumDriver
         else
           @scroll_orientation = :vertical
         end
+
+        if !params[:top].nil? || !params[:bottom].nil? || !params[:right].nil? || !params[:left].nil?
+          @scroll_deadzone = {}
+          @scroll_deadzone[:top] = params[:top].to_f unless params[:top].nil?
+          @scroll_deadzone[:bottom] = params[:bottom].to_f unless params[:bottom].nil?
+          @scroll_deadzone[:right] = params[:right].to_f unless params[:right].nil?
+          @scroll_deadzone[:left] = params[:left].to_f unless params[:left].nil?
+        end
+
         params[:scrollable_locator] = self.dup
       end
 
@@ -27,16 +36,18 @@ module TestaAppiumDriver
 
 
     # resolve selector which will be used for finding element
-    def selector
+    def strategy_and_selector
+      if @can_use_id_strategy
+        return FIND_STRATEGY_ID, @can_use_id_strategy
+      end
       if (@strategy.nil? && @default_find_strategy == FIND_STRATEGY_UIAUTOMATOR) || @strategy == FIND_STRATEGY_UIAUTOMATOR
-        ui_selector
+        [FIND_STRATEGY_UIAUTOMATOR, ui_selector]
       elsif (@strategy.nil? && @default_find_strategy == FIND_STRATEGY_XPATH) || @strategy == FIND_STRATEGY_XPATH
-        @xpath_selector
+        [FIND_STRATEGY_XPATH, @xpath_selector]
       end
     end
 
 
-
     # @param [Boolean] include_semicolon should the semicolon be included at the end
     # @return ui_selector for uiautomator find strategy
     def ui_selector(include_semicolon = true)
@@ -64,13 +75,14 @@ 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]
       raise "Cannot add child selector to Array" if single && !@single
 
       locator = self.dup
+      locator.can_use_id_strategy = false
       if (@strategy.nil? && !single) || @strategy == FIND_STRATEGY_XPATH
         locator.strategy = FIND_STRATEGY_XPATH
         locator.strategy_reason = "multiple child selector"