testa_appium_driver 0.1.11 → 0.1.14

data/lib/testa_appium_driver/ios/driver.rb

@@ -1,49 +1,49 @@
-require_relative 'type_selectors'
-require_relative 'locator'
-require_relative 'selenium_element'
-
-module TestaAppiumDriver
-  class Driver
-    include TypeSelectors
-
-
-
-    # @param params [Hash]
-    # @return [TestaAppiumDriver::Locator] first scrollable element
-    def scrollable(params = {})
-      scroll_view(params)
-    end
-
-    # @param params [Hash]
-    # @return [TestaAppiumDriver::Locator] first scrollable element
-    def scrollables(params = {})
-      scroll_views(params)
-    end
-
-    private
-    def handle_testa_opts
-      if @testa_opts[:default_find_strategy].nil?
-        @default_find_strategy = DEFAULT_IOS_FIND_STRATEGY
-      else
-        case @testa_opts[:default_find_strategy].to_sym
-        when FIND_STRATEGY_XPATH
-          @default_find_strategy = @testa_opts[:default_find_strategy].to_sym
-        else
-          raise "Default find strategy #{@testa_opts[:default_find_strategy]} not supported for iOS"
-        end
-      end
-
-
-      if @testa_opts[:default_scroll_strategy].nil?
-        @default_scroll_strategy = DEFAULT_IOS_SCROLL_STRATEGY
-      else
-        case @testa_opts[:default_scroll_strategy].to_sym
-        when SCROLL_STRATEGY_W3C
-          @default_scroll_strategy = @testa_opts[:default_scroll_strategy].to_sym
-        else
-          raise "Default scroll strategy #{@testa_opts[:default_scroll_strategy]} not supported for iOS"
-        end
-      end
-    end
-  end
+require_relative 'type_selectors'
+require_relative 'locator'
+require_relative 'selenium_element'
+
+module TestaAppiumDriver
+  class Driver
+    include TypeSelectors
+
+
+
+    # @param params [Hash]
+    # @return [TestaAppiumDriver::Locator] first scrollable element
+    def scrollable(params = {})
+      scroll_view(params)
+    end
+
+    # @param params [Hash]
+    # @return [TestaAppiumDriver::Locator] first scrollable element
+    def scrollables(params = {})
+      scroll_views(params)
+    end
+
+    private
+    def handle_testa_opts
+      if @testa_opts[:default_find_strategy].nil?
+        @default_find_strategy = DEFAULT_IOS_FIND_STRATEGY
+      else
+        case @testa_opts[:default_find_strategy].to_sym
+        when FIND_STRATEGY_XPATH
+          @default_find_strategy = @testa_opts[:default_find_strategy].to_sym
+        else
+          raise "Default find strategy #{@testa_opts[:default_find_strategy]} not supported for iOS"
+        end
+      end
+
+
+      if @testa_opts[:default_scroll_strategy].nil?
+        @default_scroll_strategy = DEFAULT_IOS_SCROLL_STRATEGY
+      else
+        case @testa_opts[:default_scroll_strategy].to_sym
+        when SCROLL_STRATEGY_W3C
+          @default_scroll_strategy = @testa_opts[:default_scroll_strategy].to_sym
+        else
+          raise "Default scroll strategy #{@testa_opts[:default_scroll_strategy]} not supported for iOS"
+        end
+      end
+    end
+  end
 end

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

@@ -1,81 +1,85 @@
-module TestaAppiumDriver
-  module Attributes
-
-    #noinspection RubyNilAnalysis
-    def attribute(name, *args)
-      elements = execute(*args)
-
-      if elements.instance_of?(Selenium::WebDriver::Element)
-        r = elements.send(:attribute, name.to_s)
-        r = TestaAppiumDriver::Bounds.from_ios(r, @driver) if name.to_s == "rect"
-      else
-        r = elements.map { |e| e.send(:attribute, name.to_s) }
-        r.map! { |b| TestaAppiumDriver::Bounds.from_ios(b, @driver) } if name.to_s == "rect"
-      end
-      r
-    end
-
-
-    def accessibility_container(*args)
-      attribute("accessibilityContainer", *args)
-    end
-
-    def accessible?(*args)
-      attribute("accessible", *args).to_s == "true"
-    end
-
-
-    def class_name(*args)
-      attribute("class", *args)
-    end
-
-    def enabled?(*args)
-      attribute("enabled", *args).to_s == "true"
-    end
-
-    def frame(*args)
-      attribute("frame", *args)
-    end
-
-    def index(*args)
-      attribute("index", *args)
-    end
-
-    def label(*args)
-      attribute("label", *args)
-    end
-
-    def name(*args)
-      attribute("name", *args)
-    end
-
-
-    def rect(*args)
-      attribute("rect", *args)
-    end
-
-    def selected?(*args)
-      attribute("selected", *args).to_s == "true"
-    end
-
-    def type(*args)
-      attribute("type", *args)
-    end
-
-    def value(*args)
-      attribute("value", *args)
-    end
-
-    def visible?(*args)
-      attribute("visible", *args).to_s == "true"
-    end
-
-
-    alias_method :bounds, :rect
-    alias_method :text, :label
-  end
-  #noinspection RubyYardReturnMatch
-  class Locator
-    include TestaAppiumDriver::Attributes
-  end
+module TestaAppiumDriver
+  module Attributes
+
+    #noinspection RubyNilAnalysis
+    def testa_attribute(name, *args)
+
+      if self.instance_of?(::Selenium::WebDriver::Element) || self.instance_of?(::Appium::Core::Element)
+        @driver = get_driver
+        elements = self
+      else
+        elements = execute(*args)
+      end
+
+
+      if elements.instance_of?(::Selenium::WebDriver::Element) || elements.instance_of?(::Appium::Core::Element)
+        r = elements.send(:attribute, name.to_s)
+        r = TestaAppiumDriver::Bounds.from_ios(r, @driver) if name.to_s == "rect"
+      else
+        r = elements.map { |e| e.send(:attribute, name.to_s) }
+        r.map! { |b| TestaAppiumDriver::Bounds.from_ios(b, @driver) } if name.to_s == "rect"
+      end
+      r
+    end
+
+
+    def accessibility_container(*args)
+      testa_attribute("accessibilityContainer", *args)
+    end
+
+    def accessible?(*args)
+      testa_attribute("accessible", *args).to_s == "true"
+    end
+
+
+    def class_name(*args)
+      testa_attribute("class", *args)
+    end
+
+    def enabled?(*args)
+      testa_attribute("enabled", *args).to_s == "true"
+    end
+
+    def frame(*args)
+      testa_attribute("frame", *args)
+    end
+
+    def index(*args)
+      testa_attribute("index", *args)
+    end
+
+    def label(*args)
+      testa_attribute("label", *args)
+    end
+
+    def name(*args)
+      testa_attribute("name", *args)
+    end
+
+
+    def rect(*args)
+      testa_attribute("rect", *args)
+    end
+
+    def selected?(*args)
+      testa_attribute("selected", *args).to_s == "true"
+    end
+
+    def type(*args)
+      testa_attribute("type", *args)
+    end
+
+    def value(*args)
+      testa_attribute("value", *args)
+    end
+
+    def visible?(*args)
+      testa_attribute("visible", *args).to_s == "true"
+    end
+
+
+    alias_method :bounds, :rect
+    alias_method :text, :label
+  end
+
 end

data/lib/testa_appium_driver/ios/locator.rb

@@ -1,71 +1,72 @@
-require_relative 'locator/attributes'
-
-module TestaAppiumDriver
-  class Locator
-    include TypeSelectors
-    attr_accessor :class_chain_selector
-
-    def init(params, selectors, single)
-      if is_scrollable_selector?(selectors, single)
-        @scroll_orientation = :vertical
-
-        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
-
-      @class_chain_selector = hash_to_class_chain(selectors, single)
-
-
-      @scrollable_locator = params[:scrollable_locator] if params[:scrollable_locator]
-    end
-
-
-    # @return [Array] returns 2 elements. The first is the resolved find element strategy and the second is the resolved selector
-    def strategies_and_selectors
-      ss = []
-      if @can_use_id_strategy
-        ss.push({"#{FIND_STRATEGY_NAME}": @can_use_id_strategy})
-      end
-      ss.push({"#{FIND_STRATEGY_CLASS_CHAIN}": @class_chain_selector}) if @strategy.nil? || @strategy == FIND_STRATEGY_CLASS_CHAIN
-      ss.push({"#{FIND_STRATEGY_XPATH}": @xpath_selector}) if @strategy.nil? || @strategy == FIND_STRATEGY_XPATH
-      ss.push({"#{FIND_STRATEGY_IMAGE}": @image_selector}) if @strategy == FIND_STRATEGY_IMAGE
-      ss
-    end
-
-
-
-    # @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
-      add_xpath_child_selectors(locator, selectors, single)
-      if @strategy.nil? || @strategy == FIND_STRATEGY_CLASS_CHAIN
-        add_class_chain_child_selectors(locator, selectors, single)
-      end
-
-      if is_scrollable_selector?(selectors, single)
-        locator.scrollable_locator.scroll_orientation = :vertical
-        locator.scrollable_locator = locator
-      end
-
-      locator.last_selector_adjacent = false
-      locator
-    end
-
-
-    def add_class_chain_child_selectors(locator, selectors, single)
-      locator.single = false unless single # switching from single result to multiple
-      locator.class_chain_selector += "/" + hash_to_class_chain(selectors, single)
-    end
-  end
+require_relative 'locator/attributes'
+
+module TestaAppiumDriver
+  class Locator
+    include TypeSelectors
+    include Attributes
+    attr_accessor :class_chain_selector
+
+    def init(params, selectors, single)
+      if is_scrollable_selector?(selectors, single)
+        @scroll_orientation = :vertical
+
+        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
+
+      @class_chain_selector = hash_to_class_chain(selectors, single)
+
+
+      @scrollable_locator = params[:scrollable_locator] if params[:scrollable_locator]
+    end
+
+
+    # @return [Array] returns 2 elements. The first is the resolved find element strategy and the second is the resolved selector
+    def strategies_and_selectors
+      ss = []
+      if @can_use_id_strategy
+        ss.push({"#{FIND_STRATEGY_NAME}": @can_use_id_strategy})
+      end
+      ss.push({"#{FIND_STRATEGY_CLASS_CHAIN}": @class_chain_selector}) if @strategy.nil? || @strategy == FIND_STRATEGY_CLASS_CHAIN
+      ss.push({"#{FIND_STRATEGY_XPATH}": @xpath_selector}) if @strategy.nil? || @strategy == FIND_STRATEGY_XPATH
+      ss.push({"#{FIND_STRATEGY_IMAGE}": @image_selector}) if @strategy == FIND_STRATEGY_IMAGE
+      ss
+    end
+
+
+
+    # @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
+      add_xpath_child_selectors(locator, selectors, single)
+      if @strategy.nil? || @strategy == FIND_STRATEGY_CLASS_CHAIN
+        add_class_chain_child_selectors(locator, selectors, single)
+      end
+
+      if is_scrollable_selector?(selectors, single)
+        locator.scrollable_locator.scroll_orientation = :vertical
+        locator.scrollable_locator = locator
+      end
+
+      locator.last_selector_adjacent = false
+      locator
+    end
+
+
+    def add_class_chain_child_selectors(locator, selectors, single)
+      locator.single = false unless single # switching from single result to multiple
+      locator.class_chain_selector += "/" + hash_to_class_chain(selectors, single)
+    end
+  end
 end

data/lib/testa_appium_driver/ios/selenium_element.rb

@@ -1,7 +1,7 @@
-module Selenium
-  module WebDriver
-    class Element
-      include TestaAppiumDriver::TypeSelectors
-    end
-  end
+module ::Appium
+  module Core
+    class Element
+      include TestaAppiumDriver::TypeSelectors
+    end
+  end
 end