testa_appium_driver 0.1.11 → 0.1.14

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

@@ -1,62 +1,62 @@
-module TestaAppiumDriver
-  #noinspection RubyInstanceMethodNamingConvention
-  class ScrollActions
-    private
-
-    def uiautomator_scroll_to_start_or_end(type)
-
-      scrollable_selector = @scrollable.ui_selector(false)
-      orientation = @scrollable.scroll_orientation == :vertical ? ".setAsVerticalList()" : ".setAsHorizontalList()"
-      scroll_command = type == :start ? ".scrollToBeginning(#{DEFAULT_UIAUTOMATOR_MAX_SWIPES})" : ".scrollToEnd(#{DEFAULT_UIAUTOMATOR_MAX_SWIPES})"
-      cmd = "new UiScrollable(#{scrollable_selector})#{orientation}#{scroll_command};"
-      begin
-        puts "Scroll execute[uiautomator_#{type}]: #{cmd}"
-        @driver.find_element(uiautomator: cmd)
-      rescue
-        # Ignored
-      end
-
-
-    end
-
-
-    def uiautomator_scroll_to
-      raise "UiAutomator scroll cannot work with specified direction" unless @direction.nil?
-
-      scrollable_selector = @scrollable.ui_selector(false)
-      element_selector = @locator.ui_selector(false)
-      orientation_command = @scrollable.scroll_orientation == :vertical ? ".setAsVerticalList()" : ".setAsHorizontalList()"
-      cmd = "new UiScrollable(#{scrollable_selector})#{orientation_command}.scrollIntoView(#{element_selector});"
-      begin
-        puts "Scroll execute[uiautomator_scroll_to]: #{cmd}"
-        @driver.find_element(uiautomator: cmd)
-      rescue
-        # Ignored
-      ensure
-      end
-    end
-
-
-    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
-        direction_command = direction == :down || direction == :right ? ".scrollForward()" : ".scrollBackward()"
-      elsif type == SCROLL_ACTION_TYPE_FLING
-        direction_command = direction == :down || direction == :right ? ".flingForward()" : ".flingBackward()"
-      else
-        raise "Unknown scroll action type #{type}"
-      end
-      cmd = "new UiScrollable(#{scrollable_selector})#{orientation}#{direction_command};"
-      begin
-        puts "Scroll execute[uiautomator_#{type}]: #{cmd}"
-        @driver.find_element(uiautomator: cmd)
-      rescue
-        # Ignored
-      end
-    end
-
-
-  end
-
+module TestaAppiumDriver
+  #noinspection RubyInstanceMethodNamingConvention
+  class ScrollActions
+    private
+
+    def uiautomator_scroll_to_start_or_end(type)
+
+      scrollable_selector = @scrollable.ui_selector(false)
+      orientation = @scrollable.scroll_orientation == :vertical ? ".setAsVerticalList()" : ".setAsHorizontalList()"
+      scroll_command = type == :start ? ".scrollToBeginning(#{DEFAULT_UIAUTOMATOR_MAX_SWIPES})" : ".scrollToEnd(#{DEFAULT_UIAUTOMATOR_MAX_SWIPES})"
+      cmd = "new UiScrollable(#{scrollable_selector})#{orientation}#{scroll_command};"
+      begin
+        puts "Scroll execute[uiautomator_#{type}]: #{cmd}"
+        @driver.find_element(uiautomator: cmd)
+      rescue
+        # Ignored
+      end
+
+
+    end
+
+
+    def uiautomator_scroll_to
+      raise "UiAutomator scroll cannot work with specified direction" unless @direction.nil?
+
+      scrollable_selector = @scrollable.ui_selector(false)
+      element_selector = @locator.ui_selector(false)
+      orientation_command = @scrollable.scroll_orientation == :vertical ? ".setAsVerticalList()" : ".setAsHorizontalList()"
+      cmd = "new UiScrollable(#{scrollable_selector})#{orientation_command}.scrollIntoView(#{element_selector});"
+      begin
+        puts "Scroll execute[uiautomator_scroll_to]: #{cmd}"
+        @driver.find_element(uiautomator: cmd)
+      rescue
+        # Ignored
+      ensure
+      end
+    end
+
+
+    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
+        direction_command = direction == :down || direction == :right ? ".scrollForward()" : ".scrollBackward()"
+      elsif type == SCROLL_ACTION_TYPE_FLING
+        direction_command = direction == :down || direction == :right ? ".flingForward()" : ".flingBackward()"
+      else
+        raise "Unknown scroll action type #{type}"
+      end
+      cmd = "new UiScrollable(#{scrollable_selector})#{orientation}#{direction_command};"
+      begin
+        puts "Scroll execute[uiautomator_#{type}]: #{cmd}"
+        @driver.find_element(uiautomator: cmd)
+      rescue
+        # Ignored
+      end
+    end
+
+
+  end
+
 end

data/lib/testa_appium_driver/android/selenium_element.rb

@@ -1,8 +1,12 @@
-module Selenium
-  module WebDriver
-    class Element
-      include TestaAppiumDriver::ClassSelectors
-      include TestaAppiumDriver::Attributes
-    end
-  end
+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/bounds.rb

@@ -1,150 +1,150 @@
-# frozen_string_literal: true
-
-require 'json'
-module TestaAppiumDriver
-  class Bounds
-
-    attr_reader :width
-    attr_reader :height
-    attr_reader :offset
-
-
-    # @param top_left [Coordinates]
-    # @param bottom_right [Coordinates]
-    # @param window_width [Integer]
-    # @param window_height [Integer]
-    def initialize(top_left, bottom_right, window_width, window_height)
-      @top_left = top_left
-      @bottom_right = bottom_right
-      @width = bottom_right.x - top_left.x
-      @height = bottom_right.y - top_left.y
-      @offset = Offset.new(self, window_width, window_height)
-      @center = TestaAppiumDriver::Coordinates.new(@top_left.x + @width/2, @top_left.y + @height / 2)
-    end
-
-    def as_json
-      {
-        width: @width,
-        height: @height,
-        top_left: @top_left.as_json,
-        bottom_right: @bottom_right.as_json,
-        offset: @offset.as_json
-      }
-    end
-
-    # @return [TestaAppiumDriver::Offset]
-    def offset
-      @offset
-    end
-
-    # @return [TestaAppiumDriver::Coordinates]
-    def top_left
-      @top_left
-    end
-    # @return [TestaAppiumDriver::Coordinates]
-    def bottom_right
-      @bottom_right
-    end
-
-    # @return [TestaAppiumDriver::Coordinates]
-    def center
-      @center
-    end
-
-    def to_s
-      JSON.dump(as_json)
-    end
-
-    # @param bounds [String] bounds that driver.attribute("bounds") return
-    # @param driver [TestaAppiumDriver::Driver]
-    def self.from_android(bounds, driver)
-      matches = bounds.match(/\[(\d+),(\d+)\]\[(\d+),(\d+)\]/)
-      raise "Unexpected bounds: #{bounds}" unless matches
-
-      captures = matches.captures
-      top_left = Coordinates.new(captures[0], captures[1])
-      bottom_right = Coordinates.new(captures[2], captures[3])
-      ws = driver.window_size
-      window_width = ws.width.to_i
-      window_height = ws.height.to_i
-      Bounds.new(top_left, bottom_right, window_width, window_height)
-    end
-
-    def self.from_ios(rect, driver)
-      rect = JSON.parse(rect)
-      top_left = Coordinates.new(rect["x"], rect["y"])
-      bottom_right = Coordinates.new(top_left.x + rect["width"].to_i, top_left.y + rect["height"].to_i)
-      ws = driver.window_size
-      window_width = ws.width.to_i
-      window_height = ws.height.to_i
-      Bounds.new(top_left, bottom_right, window_width, window_height)
-    end
-  end
-
-  #noinspection ALL
-  class Coordinates
-    def initialize(x, y)
-      @x = x.to_i
-      @y = y.to_i
-    end
-
-    def as_json
-      {
-        x: @x,
-        y: @y
-      }
-    end
-
-
-    # @return [Integer]
-    def x
-      @x
-    end
-
-    # @return [Integer]
-    def y
-      @y
-    end
-  end
-
-
-  class Offset
-    def initialize(bounds, window_width, window_height)
-      @top = bounds.top_left.y
-      @right = window_width - bounds.bottom_right.x
-      @bottom = window_height - bounds.bottom_right.y
-      @left = bounds.top_left.x
-    end
-
-    def as_json
-      {
-        top: @top,
-        right: @right,
-        bottom: @bottom,
-        left: @left
-      }
-    end
-
-
-    # @return [Integer]
-    def top
-      @top
-    end
-
-    # @return [Integer]
-    def right
-      @right
-    end
-
-    # @return [Integer]
-    def bottom
-      @bottom
-    end
-
-    # @return [Integer]
-    def left
-      @left
-    end
-
-  end
+# frozen_string_literal: true
+
+require 'json'
+module TestaAppiumDriver
+  class Bounds
+
+    attr_reader :width
+    attr_reader :height
+    attr_reader :offset
+
+
+    # @param top_left [Coordinates]
+    # @param bottom_right [Coordinates]
+    # @param window_width [Integer]
+    # @param window_height [Integer]
+    def initialize(top_left, bottom_right, window_width, window_height)
+      @top_left = top_left
+      @bottom_right = bottom_right
+      @width = bottom_right.x - top_left.x
+      @height = bottom_right.y - top_left.y
+      @offset = Offset.new(self, window_width, window_height)
+      @center = TestaAppiumDriver::Coordinates.new(@top_left.x + @width/2, @top_left.y + @height / 2)
+    end
+
+    def as_json
+      {
+        width: @width,
+        height: @height,
+        top_left: @top_left.as_json,
+        bottom_right: @bottom_right.as_json,
+        offset: @offset.as_json
+      }
+    end
+
+    # @return [TestaAppiumDriver::Offset]
+    def offset
+      @offset
+    end
+
+    # @return [TestaAppiumDriver::Coordinates]
+    def top_left
+      @top_left
+    end
+    # @return [TestaAppiumDriver::Coordinates]
+    def bottom_right
+      @bottom_right
+    end
+
+    # @return [TestaAppiumDriver::Coordinates]
+    def center
+      @center
+    end
+
+    def to_s
+      JSON.dump(as_json)
+    end
+
+    # @param bounds [String] bounds that driver.attribute("bounds") return
+    # @param driver [TestaAppiumDriver::Driver]
+    def self.from_android(bounds, driver)
+      matches = bounds.match(/\[(\d+),(\d+)\]\[(\d+),(\d+)\]/)
+      raise "Unexpected bounds: #{bounds}" unless matches
+
+      captures = matches.captures
+      top_left = Coordinates.new(captures[0], captures[1])
+      bottom_right = Coordinates.new(captures[2], captures[3])
+      ws = driver.window_size
+      window_width = ws.width.to_i
+      window_height = ws.height.to_i
+      Bounds.new(top_left, bottom_right, window_width, window_height)
+    end
+
+    def self.from_ios(rect, driver)
+      rect = JSON.parse(rect)
+      top_left = Coordinates.new(rect["x"], rect["y"])
+      bottom_right = Coordinates.new(top_left.x + rect["width"].to_i, top_left.y + rect["height"].to_i)
+      ws = driver.window_size
+      window_width = ws.width.to_i
+      window_height = ws.height.to_i
+      Bounds.new(top_left, bottom_right, window_width, window_height)
+    end
+  end
+
+  #noinspection ALL
+  class Coordinates
+    def initialize(x, y)
+      @x = x.to_i
+      @y = y.to_i
+    end
+
+    def as_json
+      {
+        x: @x,
+        y: @y
+      }
+    end
+
+
+    # @return [Integer]
+    def x
+      @x
+    end
+
+    # @return [Integer]
+    def y
+      @y
+    end
+  end
+
+
+  class Offset
+    def initialize(bounds, window_width, window_height)
+      @top = bounds.top_left.y
+      @right = window_width - bounds.bottom_right.x
+      @bottom = window_height - bounds.bottom_right.y
+      @left = bounds.top_left.x
+    end
+
+    def as_json
+      {
+        top: @top,
+        right: @right,
+        bottom: @bottom,
+        left: @left
+      }
+    end
+
+
+    # @return [Integer]
+    def top
+      @top
+    end
+
+    # @return [Integer]
+    def right
+      @right
+    end
+
+    # @return [Integer]
+    def bottom
+      @bottom
+    end
+
+    # @return [Integer]
+    def left
+      @left
+    end
+
+  end
 end

data/lib/testa_appium_driver/common/constants.rb

@@ -1,37 +1,38 @@
-# frozen_string_literal: true
-
-#noinspection ALL
-module TestaAppiumDriver
-  FIND_STRATEGY_UIAUTOMATOR = :uiautomator
-  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
-
-
-  SCROLL_CORRECTION_W3C = 30
-  SCROLL_ALIGNMENT_THRESHOLD = 25
-
-  SCROLL_ACTION_TYPE_SCROLL = :scroll
-  SCROLL_ACTION_TYPE_FLING = :fling
-  SCROLL_ACTION_TYPE_DRAG = :drag
-
-
-  DEFAULT_UIAUTOMATOR_MAX_SWIPES = 20
-
-  DEFAULT_ANDROID_FIND_STRATEGY = FIND_STRATEGY_UIAUTOMATOR
-  DEFAULT_ANDROID_SCROLL_STRATEGY = SCROLL_STRATEGY_UIAUTOMATOR
-
-
-  DEFAULT_IOS_FIND_STRATEGY = FIND_STRATEGY_XPATH
-  DEFAULT_IOS_SCROLL_STRATEGY = SCROLL_STRATEGY_W3C
-
-  DEFAULT_W3C_MAX_SCROLLS = 7
-
-  EXISTS_WAIT = 0.5
-  LONG_TAP_DURATION = 1.5
+# frozen_string_literal: true
+
+#noinspection ALL
+module TestaAppiumDriver
+  FIND_STRATEGY_UIAUTOMATOR = :uiautomator
+  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
+
+
+  SCROLL_CORRECTION_W3C = 30
+  SCROLL_ALIGNMENT_THRESHOLD = 25
+
+  SCROLL_ACTION_TYPE_SCROLL = :scroll
+  SCROLL_ACTION_TYPE_FLING = :fling
+  SCROLL_ACTION_TYPE_DRAG = :drag
+
+
+  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_W3C
+
+
+  DEFAULT_IOS_FIND_STRATEGY = FIND_STRATEGY_XPATH
+  DEFAULT_IOS_SCROLL_STRATEGY = SCROLL_STRATEGY_W3C
+
+  DEFAULT_W3C_MAX_SCROLLS = 7
+
+  EXISTS_WAIT = 0.5
+  LONG_TAP_DURATION = 1.5
 end

data/lib/testa_appium_driver/common/exceptions/strategy_mix_exception.rb

@@ -1,12 +1,12 @@
-# frozen_string_literal: true
-
-module TestaAppiumDriver
-  class StrategyMixException < Exception
-    def initialize(strategy, strategy_reason, mixed_strategy, mixed_reason)
-
-      # example: parent is only available in xpath strategy and cannot be used with from_element which is only available in uiautomator strategy
-      msg = "strategy mix exception: '#{strategy_reason}' is only available in #{strategy} strategy and cannot be used with '#{mixed_reason}' which is only available in #{mixed_strategy} strategy"
-      super(msg)
-    end
-  end
+# frozen_string_literal: true
+
+module TestaAppiumDriver
+  class StrategyMixException < Exception
+    def initialize(strategy, strategy_reason, mixed_strategy, mixed_reason)
+
+      # example: parent is only available in xpath strategy and cannot be used with from_element which is only available in uiautomator strategy
+      msg = "strategy mix exception: '#{strategy_reason}' is only available in #{strategy} strategy and cannot be used with '#{mixed_reason}' which is only available in #{mixed_strategy} strategy"
+      super(msg)
+    end
+  end
 end