Start updating for new XPath

Author: bootstraponline

ios_tests/lib/ios/specs/common/element/text.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-
+# rake ios['common/element/text']
 describe 'common/element/text' do
   def before_first
     screen.must_equal catalog

lib/appium_lib/common/element/text.rb lib/appium_lib/android/element/text.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # UIAStaticText methods
 module Appium
-  module Common
+  module Android
     # s_ prefix for static_text to avoid conflict with generic text methods.
 
     # Get an array of text texts if text is nil else

lib/appium_lib/common/helper.rb

@@ -77,6 +77,15 @@ def wait_true max_wait=30, interval=0.5, &block
       result
     end
 
+    def tag_to_class tag_name
+      case tag_name
+        when 'text', :text
+          device_is_android? ? 'android.widget.TextView' : 'UIAStaticText'
+        else
+          tag_name
+      end
+    end
+
     # Navigate back.
     # @return [void]
     def back
@@ -109,83 +118,111 @@ def xpaths xpath_str
     # @param index [Integer] the index
     # @return [Element] the found element of type tag_name
     def ele_index tag_name, index
+      class_name = tag_to_class tag_name
       # XPath index starts at 1.
       raise "#{index} is not a valid xpath index. Must be >= 1" if index <= 0
-      find_element :xpath, "//#{tag_name}[#{index}]"
+      find_element :xpath, "//#{class_name}[#{index}]"
     end
 
     # Get all elements exactly matching tag name
     # @param tag_name [String] the tag name to find
     # @return [Array<Element>] the found elements of type tag_name
     def find_eles tag_name
-      @driver.find_elements :tag_name, tag_name
+      class_name = tag_to_class tag_name
+      @driver.find_elements :class, class_name
     end
 
     # Get the first tag that exactly matches tag and text.
-    # @param tag [String] the tag name to match
+    # @param tag_name [String] the tag name to match
     # @param text [String] the text to exactly match
     # @return [Element] the element of type tag exactly matching text
-    def find_ele_by_text tag, text
-      @driver.find_element :xpath, %Q(#{tag}[@text='#{text}'])
+    def find_ele_by_text tag_name, text
+      class_name = tag_to_class tag_name
+      @driver.find_element :xpath, %Q(//#{class_name}[@text='#{text}'])
     end
 
     # Get all tags that exactly match tag and text.
-    # @param tag [String] the tag name to match
+    # @param tag_name [String] the tag name to match
     # @param text [String] the text to exactly match
     # @return [Array<Element>] the elements of type tag exactly matching text
-    def find_eles_by_text tag, text
-      @driver.find_elements :xpath, %Q(#{tag}[@text='#{text}'])
+    def find_eles_by_text tag_name, text
+      class_name = tag_to_class tag_name
+      @driver.find_elements :xpath, %Q(//#{class_name}[@text='#{text}'])
+    end
+
+    def find_ele_by_name tag_name, name
+      class_name = tag_to_class tag_name
+      @driver.find_element :xpath, %Q(//#{class_name}[@name='#{name}'])
+    end
+
+    def find_eles_by_name tag_name, name
+      class_name = tag_to_class tag_name
+      @driver.find_elements :xpath, %Q(//#{class_name}[@name='#{name}'])
     end
 
     # Get the first tag by attribute that exactly matches value.
-    # @param tag [String] the tag name to match
+    # @param tag_name [String] the tag name to match
     # @param attr [String] the attribute to compare
     # @param value [String] the value of the attribute that the element must include
     # @return [Element] the element of type tag who's attribute includes value
-    def find_ele_by_attr_include tag, attr, value
-      @driver.find_element :xpath, %Q(#{tag}[contains(@#{attr}, '#{value}')])
+    def find_ele_by_attr_include tag_name, attr, value
+      class_name = tag_to_class tag_name
+      value.downcase!
+      @driver.find_element :xpath, %Q(//#{class_name}[contains(translate(@#{attr},'#{value.upcase}', '#{value}'), '#{value}')])
     end
 
     # Get tags by attribute that include value.
-    # @param tag [String] the tag name to match
+    # @param tag_name [String] the tag name to match
     # @param attr [String] the attribute to compare
     # @param value [String] the value of the attribute that the element must include
     # @return [Array<Element>] the elements of type tag who's attribute includes value
-    def find_eles_by_attr_include tag, attr, value
-      @driver.find_elements :xpath, %Q(#{tag}[contains(@#{attr}, '#{value}')])
+    def find_eles_by_attr_include tag_name, attr, value
+      class_name = tag_to_class tag_name
+      value.downcase!
+      @driver.find_elements :xpath, %Q(//#{class_name}[contains(translate(@#{attr},'#{value.upcase}', '#{value}'), '#{value}')])
     end
 
     # Get the first tag that includes text.
-    # @param tag [String] the tag name to match
+    # @param tag_name [String] the tag name to match
     # @param text [String] the text the element must include
     # @return [Element] the element of type tag that includes text
     # element.attribute(:text).include? text
-    def find_ele_by_text_include tag, text
-      find_ele_by_attr_include tag, :text, text
+    def find_ele_by_text_include tag_name, text
+      find_ele_by_attr_include tag_name, :text, text
     end
 
     # Get the tags that include text.
-    # @param tag [String] the tag name to match
+    # @param tag_name [String] the tag name to match
     # @param text [String] the text the element must include
     # @return [Array<Element>] the elements of type tag that includes text
     # element.attribute(:text).include? text
-    def find_eles_by_text_include tag, text
-      find_eles_by_attr_include tag, :text, text
+    def find_eles_by_text_include tag_name, text
+      find_eles_by_attr_include tag_name, :text, text
+    end
+
+    def find_ele_by_name_include tag_name, text
+      find_ele_by_attr_include tag_name, :name, text
+    end
+    
+    def find_eles_by_name_include tag_name, text
+      find_eles_by_attr_include tag_name, :name, text
     end
 
     # Get the first tag that matches tag_name
     # @param tag_name [String] the tag to match
     # @return [Element]
     def first_ele tag_name
       # XPath index starts at 1
-      find_element :xpath, "//#{tag_name}[1]"
+      class_name = tag_to_class tag_name
+      find_element :xpath, "//#{class_name}[1]"
     end
 
     # Get the last tag that matches tag_name
     # @param tag_name [String] the tag to match
     # @return [Element]
     def last_ele tag_name
-      xpath "//#{tag_name}[last()]"
+      class_name = tag_to_class tag_name
+      xpath "//#{class_name}[last()]"
     end
 
     # Prints xml of the current page
@@ -270,15 +307,17 @@ def find_names name
     # @param tag_name [String] the tag_name to search for
     # @return [Element]
     def tag tag_name
-      find_element :tag_name, tag_name
+      class_name = tag_to_class tag_name
+      find_element :class, class_name
     end
 
     # Returns all elements matching tag_name
     #
     # @param tag_name [String] the tag_name to search for
     # @return [Element]
     def tags tag_name
-      find_elements :tag_name, tag_name
+      class_name = tag_to_class tag_name
+      find_elements :class, class_name
     end
 
     # Converts pixel values to window relative values
@@ -288,7 +327,6 @@ def tags tag_name
     # ```
 
     def px_to_window_rel opts={}
-
       w = $driver.window_size
       x = opts.fetch :x, 0
       y = opts.fetch :y, 0

lib/appium_lib/driver.rb

@@ -260,7 +260,7 @@ def initialize opts={}
 
       # load common methods
       extend Appium::Common
-      if @device == :android
+      if device_is_android?
         # load Android specific methods
         extend Appium::Android
       else
@@ -320,6 +320,10 @@ def driver_attributes
       attributes
     end
 
+    def device_is_android?
+      @device == :android
+    end
+
     # Returns the server's version info
     #
     # ```ruby

lib/appium_lib/ios/element/text.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+# UIAStaticText methods
+module Appium
+  module Ios
+    # s_ prefix for static_text to avoid conflict with generic text methods.
+
+    # Get an array of text texts if text is nil else
+    # Get all static textfields that include text.
+    # @param text [String] the text to find.
+    # @return [Array]
+    def s_texts text=nil
+      if text
+        find_eles_by_name_include :text, text
+      else
+        find_eles_attr :text, :name
+      end
+    end
+
+    def s_texts_names
+      find_eles_attr :text, :name
+    end
+
+    # Get an array of text elements.
+    # @return [Array<Text>]
+    def e_s_texts
+      find_eles :text
+    end
+
+    # Get the first text element.
+    # @return [Text]
+    def first_s_text
+      first_ele :text
+    end
+
+    # Get the last text element
+    # @return [Text]
+    def last_s_text
+      last_ele :text
+    end
+
+    # Get the first element that includes text.
+    # @param text [String, Integer] the text to find. If int then the text at that index is returned.
+    # @return [Text]
+    def s_text text
+      return ele_index :text, text if text.is_a? Numeric
+      find_ele_by_name_include :text, text
+    end
+
+    # Get the first textfield that matches text.
+    # @param text [String] the text that the tag must match
+    # @return [Text]
+    def s_text_exact text
+      find_ele_by_name :text, text
+    end
+
+    # Get all static textfields that matches text.
+    # @param text [String] the text that the tag must match
+    # @return [Array<Text>]
+    def s_texts_exact text
+      find_eles_by_name :text, text
+    end
+  end # module Common
+end # module Appium