Rewrite iOS helpers

Author: bootstraponline

ios_tests/lib/ios/specs/common/helper.rb

@@ -1,5 +1,6 @@
 # rake ios[common/helper]
 describe 'common/helper.rb' do
+
   def before_first
     screen.must_equal catalog
   end
@@ -158,20 +159,10 @@ def uibutton_text
   end
 
   t 'invalid id should error' do
-    begin
-      id 'does not exist'
-    rescue Exception => e
-      message = e.message
-    end
-    message.must_equal 'Invalid id `does not exist`'
+    proc { id 'does not exist' }.must_raise Selenium::WebDriver::Error::NoSuchElementError
 
     # resource id should error on ios
-    begin
-      id 'android:id/text1'
-    rescue Exception => e
-      message = e.message
-    end
-    message.must_equal 'Invalid id `android:id/text1`'
+    proc { id 'android:id/text1' }.must_raise Selenium::WebDriver::Error::NoSuchElementError
   end
 
   t 'tag' do

lib/appium_lib/ios/element/button.rb

@@ -10,7 +10,7 @@ module Ios
     def button value
       # return button at index.
       return ele_index UIAButton, value if value.is_a? Numeric
-      xpath_visible_contains UIAButton, value
+      ele_by_json_visible_contains UIAButton, value
     end
 
     # Find all UIAButtons containing value.
@@ -19,7 +19,7 @@ def button value
     # @return [Array<UIAButton>]
     def buttons value=false
       return tags UIAButton unless value
-      xpaths_visible_contains UIAButton, value
+      eles_by_json_visible_contains UIAButton, value
     end
 
     # Find the first UIAButton.
@@ -38,14 +38,14 @@ def last_button
     # @param value [String] the value to match exactly
     # @return [UIAButton]
     def button_exact value
-      xpath_visible_exact UIAButton, value
+      ele_by_json_visible_exact UIAButton, value
     end
 
     # Find all UIAButtons that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<UIAButton>]
     def buttons_exact value
-      xpaths_visible_exact UIAButton, value
+      eles_by_json_visible_exact UIAButton, value
     end
   end # module Ios
 end # module Appium

lib/appium_lib/ios/element/generic.rb

@@ -5,28 +5,28 @@ module Ios
     # @param value [String] the value to search for
     # @return [Element]
     def find value
-      xpath_visible_contains '*', value
+      ele_by_json_visible_contains '*', value
     end
 
     # Find all elements containing value
     # @param value [String] the value to search for
     # @return [Array<Element>]
     def finds value
-      xpaths_visible_contains '*', value
+      eles_by_json_visible_contains '*', value
     end
 
     # Find the first element exactly matching value
     # @param value [String] the value to search for
     # @return [Element]
     def find_exact value
-      xpath_visible_exact '*', value
+      ele_by_json_visible_exact '*', value
     end
 
     # Find all elements exactly matching value
     # @param value [String] the value to search for
     # @return [Array<Element>]
     def finds_exact value
-      xpaths_visible_exact '*', value
+      eles_by_json_visible_exact '*', value
     end
   end # module Ios
 end # module Appium

lib/appium_lib/ios/element/text.rb

@@ -9,7 +9,7 @@ module Ios
     # @return [UIAStaticText]
     def text value
       return ele_index UIAStaticText, value if value.is_a? Numeric
-      xpath_visible_contains UIAStaticText, value
+      ele_by_json_visible_contains UIAStaticText, value
     end
 
     # Find all UIAStaticText containing value.
@@ -18,7 +18,7 @@ def text value
     # @return [Array<UIAStaticText>]
     def texts value=false
       return tags UIAStaticText unless value
-      xpaths_visible_contains UIAStaticText, value
+      eles_by_json_visible_contains UIAStaticText, value
     end
 
     # Find the first UIAStaticText.
@@ -37,14 +37,14 @@ def last_text
     # @param value [String] the value to match exactly
     # @return [UIAStaticText]
     def text_exact value
-      xpath_visible_exact UIAStaticText, value
+      ele_by_json_visible_exact UIAStaticText, value
     end
 
     # Find all UIAStaticTexts that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<UIAStaticText>]
     def texts_exact value
-      xpaths_visible_exact UIAStaticText, value
+      eles_by_json_visible_exact UIAStaticText, value
     end
   end # module Ios
 end # module Appium

lib/appium_lib/ios/helper.rb

@@ -177,11 +177,7 @@ def page_window window_number=0
     # @param id [String] the id to search for
     # @return [Element]
     def id id
-      value = resolve_id id
-      raise "Invalid id `#{id}`" unless value
-      exact    = string_visible_exact '*', value
-      contains = string_visible_contains '*', value
-      xpath "#{exact} | #{contains}"
+      find_element :id, id
     end
 
     # Return the iOS version as an array of integers
@@ -283,41 +279,41 @@ def tags class_name
     # @private
     # Returns a string xpath that matches the first element that contains value
     #
-    # example: xpath_visible_contains 'UIATextField', 'sign in'
+    # example: ele_by_json_visible_contains 'UIATextField', 'sign in'
     #
     # @param element [String] the class name for the element
     # @param value [String] the value to search for
     # @return [String]
     def string_visible_contains element, value
-      result     = []
-      attributes = %w[name hint label value]
-
-      value_up   = value.upcase
-      value_down = value.downcase
-
-      attributes.each do |attribute|
-        result << %Q(contains(translate(@#{attribute},"#{value_up}","#{value_down}"), "#{value_down}"))
-      end
+      contains = {
+        target:      value,
+        substring:   true,
+        insensitive: true,
+      }
 
-      result = result.join(' or ')
-      result = %Q(@visible="true" and (#{result}))
-      "//#{element}[#{result}]"
+      {
+        typeArray:   [element],
+        onlyVisible: true,
+        name:        contains,
+        label:       contains,
+        value:       contains,
+      }
     end
 
     # Find the first element that contains value
     # @param element [String] the class name for the element
     # @param value [String] the value to search for
     # @return [Element]
-    def xpath_visible_contains element, value
-      xpath string_visible_contains element, value
+    def ele_by_json_visible_contains element, value
+      ele_by_json string_visible_contains element, value
     end
 
     # Find all elements containing value
     # @param element [String] the class name for the element
     # @param value [String] the value to search for
     # @return [Array<Element>]
-    def xpaths_visible_contains element, value
-      xpaths string_visible_contains element, value
+    def eles_by_json_visible_contains element, value
+      eles_by_json string_visible_contains element, value
     end
 
     # @private
@@ -326,33 +322,35 @@ def xpaths_visible_contains element, value
     # @param value [String] the value to search for
     # @return [String]
     def string_visible_exact element, value
-      result     = []
-      attributes = %w[name hint label value]
-
-      attributes.each do |attribute|
-        result << %Q(@#{attribute}="#{value}")
-      end
-
-      result = result.join(' or ')
-      result = %Q(@visible="true" and (#{result}))
+      exact = {
+        target:      value,
+        substring:   false,
+        insensitive: false,
+      }
 
-      "//#{element}[#{result}]"
+      {
+        typeArray:   [element],
+        onlyVisible: true,
+        name:        exact,
+        label:       exact,
+        value:       exact,
+      }
     end
 
     # Find the first element exactly matching value
     # @param element [String] the class name for the element
     # @param value [String] the value to search for
     # @return [Element]
-    def xpath_visible_exact element, value
-      xpath string_visible_exact element, value
+    def ele_by_json_visible_exact element, value
+      ele_by_json string_visible_exact element, value
     end
 
     # Find all elements exactly matching value
     # @param element [String] the class name for the element
     # @param value [String] the value to search for
     # @return [Element]
-    def xpaths_visible_exact element, value
-      xpaths string_visible_exact element, value
+    def eles_by_json_visible_exact element, value
+      eles_by_json string_visible_exact element, value
     end
 
     # @private
@@ -448,7 +446,7 @@ def _validate_object *objects
       objects.each do |obj|
         next unless obj # obj may be nil. if so, ignore.
 
-        valid_keys = [:target, :substring, :insensitive]
+        valid_keys   = [:target, :substring, :insensitive]
         unknown_keys = obj.keys - valid_keys
         raise "Unknown keys: #{unknown_keys}" unless unknown_keys.empty?
 
@@ -492,7 +490,7 @@ def _validate_object *objects
     # }
     #
     def _by_json opts
-      valid_keys = [:typeArray, :onlyFirst, :onlyVisible, :name, :label, :value]
+      valid_keys   = [:typeArray, :onlyFirst, :onlyVisible, :name, :label, :value]
       unknown_keys = opts.keys - valid_keys
       raise "Unknown keys: #{unknown_keys}" unless unknown_keys.empty?
 
@@ -539,7 +537,7 @@ def eles_by_json opts
     # see eles_by_json
     def ele_by_json opts
       opts[:onlyFirst] = true
-      result = _by_json(opts).first
+      result           = _by_json(opts).first
       raise _no_such_element if result.nil?
       result
     end