Rewrite iOS support for appium 1.0

Author: bootstraponline

ios_tests/lib/ios/specs/common/element/button.rb renamed to ios_tests/lib/ios/specs/ios/element/button.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
-# rake ios['common/element/button']
-describe 'common/element/button' do
+# rake ios['ios/element/button']
+describe 'ios/element/button' do
   def before_first
     screen.must_equal catalog
     # nav to buttons activity
-    wait { name('buttons').click }
+    wait { s_text('buttons').click }
   end
 
   def after_last
@@ -29,8 +29,8 @@ def gray
   end
 
   t 'buttons' do
-    exp = ['Back', 'UINavigationBarBackIndicatorDefault.png', 'Gray', 'Right pointing arrow', 'Rounded', 'Custom Text', 'More info', 'More info', 'More info', 'Add contact']
-    buttons.must_equal exp
+    exp = ['Back', 'Gray', 'Right pointing arrow']
+    buttons('a').map { |e| e.name }.must_equal exp
   end
 
   t 'first_button' do
@@ -53,13 +53,6 @@ def gray
     e_buttons.length.must_equal 10
   end
 
-  t 'button_num' do
-    # select x button containing 'in'
-    button_num('in', 1).name.must_equal 'UINavigationBarBackIndicatorDefault.png'
-    button_num('in', 2).name.must_equal 'Right pointing arrow'
-    button_num('in', 3).name.must_equal 'More info'
-  end
-
   t 'after_last' do
     after_last
   end

ios_tests/lib/ios/specs/ios/element/generic.rb

@@ -5,58 +5,32 @@ def before_first
     screen.must_equal catalog
   end
 
-  def exp_text
-    'TextFields, Uses of UITextField'
+  def uibutton_text
+    'Buttons, Various uses of UIButton'
   end
 
-  def search_text
-    'TextFields'
+  def verify element
+    element = element.first if element.is_a? Array
+    element.name.must_equal uibutton_text
   end
 
   t 'before_first' do
     before_first
   end
 
   t 'find' do
-    el = find search_text
-    el_text = el.text
-    el = el_text.empty? ? el.name : el_text
-    el.must_equal exp_text
+    verify find 'tons'
   end
 
   t 'finds' do
-    el = finds(search_text).first
-    el_text = el.text
-    el = el_text.empty? ? el.name : el_text
-
-    el.must_equal exp_text
-  end
-
-  t 'text' do
-    el = text 'rows'
-    el_text = el.text
-    el = el_text.empty? ? el.name : el_text
-
-    el.include?('rows').must_equal true
-  end
-
-  t 'texts' do
-    el = texts('rows').first
-    el_text = el.text
-    el = el_text.empty? ? el.name : el_text
-
-    el.include?('rows').must_equal true
-  end
-
-  t 'name' do
-    name(search_text).name.must_equal exp_text
+    verify finds 'tons'
   end
 
-  t 'names' do
-    names(search_text).first.name.must_equal exp_text
+  t 'find_exact' do
+    verify find_exact uibutton_text
   end
 
-  t 'name_exact' do
-    name_exact(exp_text).name.must_equal exp_text
+  t 'finds_exact' do
+    verify finds_exact uibutton_text
   end
 end

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

@@ -10,8 +10,8 @@ def before_first
   end
 
   t 's_texts' do
-    exp = ['UICatalog', 'Buttons, Various uses of UIButton', 'Controls, Various uses of UIControl', 'TextFields, Uses of UITextField', 'SearchBar, Use of UISearchBar', 'TextView, Use of UITextField', 'Pickers, Uses of UIDatePicker, UIPickerView', 'Images, Use of UIImageView', 'Web, Use of UIWebView', 'Segments, Various uses of UISegmentedControl', 'Toolbar, Uses of UIToolbar', 'Alerts, Various uses of UIAlertView, UIActionSheet', 'Transitions, Shows UIViewAnimationTransitions']
-    s_texts_names.must_equal exp
+    exp = ['Controls, Various uses of UIControl', 'Segments, Various uses of UISegmentedControl']
+    s_texts('trol').map { |e| e.name }.must_equal exp
   end
 
   t 'e_s_texts' do

ios_tests/lib/ios/specs/ios/element/textfield.rb

@@ -14,8 +14,9 @@ def after_last
   end
 
   t 'textfields' do
-    textfields.include?('<enter text>').must_equal true
-    textfields.include?('<enter password>').must_equal true
+    values = textfields('enter').map { |e| e.value }
+    values.include?('<enter text>').must_equal true
+    values.include?('<enter password>').must_equal true
   end
 
   t 'e_textfields' do
@@ -85,7 +86,7 @@ def must_raise_no_element &block
     set_wait 1
     # must leave textfield screen for the rest of the tests
     leave_textfields
-    textfields.must_equal []
+    e_textfields.must_equal []
   end
 
   t 'no e_textfields' do

ios_tests/lib/run.rb

@@ -19,32 +19,14 @@
 a = OpenStruct.new x: 'ok'
 raise 'x issue' unless a.x == 'ok'
 
-## common methods
-
-# ios 7 makes clicking the back button fun.
-def back_button
-  result = nil
-  names('back').each do |b|
-    if b.displayed?
-      result = b
-      break
-    end
-  end
-  result
-end
-
-def back_displayed
-  b = back_button
-  b ? b.displayed? : false
-end
-
+# common methods
 def back_click(opts={})
   opts        ||= {}
   search_wait = opts.fetch(:wait, 60 * 1.7)
   # iOS may have multiple 'back' buttons
   # select the first displayed? back button.
   wait(search_wait) do
-    back_button.click
+    button_exact('Back').click
   end
 end
 

lib/appium_lib/common/helper.rb

@@ -365,6 +365,37 @@ def resolve_id id
       @strings_xml[id]
     end
 
+    # xpath fragment helper
+    # example: xpath_visible_contains 'UIATextField', text
+    def xpath_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
+
+      result = result.join(' or ')
+      result = %Q(@visible="true" and (#{result}))
+      "//#{element}[#{result}]"
+    end
+
+    def xpath_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}))
+      "//#{element}[#{result}]"
+    end
+
     # Used to error when finding a single element fails.
     def raise_no_element_error
       raise Selenium::WebDriver::Error::NoSuchElementError, 'An element could not be located on the page using the given search parameters.'

lib/appium_lib/ios/element/button.rb

@@ -3,23 +3,17 @@
 module Appium
   module Ios
     # Find a button by text and optionally number.
-    # @param text [String, Integer] the text to exactly match. If int then the button at that index is returned.
+    # @param value [String, Integer] the value to exactly match. If int then the button at that index is returned.
     # @param number [Integer] the occurrence of the button matching text. Defaults to the first button.
     # @return [Button] the button found with text and matching number
-    def button text, number=0
+    def button value, number=0
       # return button at index.
-      return ele_index :button, text if text.is_a? Numeric
-
-      number >= 1 ? button_num(text, number) :
-          find_ele_by_name_include(:button, text)
+      return ele_index :button, value if value.is_a? Numeric
+      xpath(xpath_visible_contains('UIAButton', value))
     end
 
-    # Get an array of button texts or button elements if text is provided.
-    # @param text [String] the text to exactly match
-    # @return [Array<String>, Array<Buttons>] either an array of button texts or an array of button elements if text is provided.
-    def buttons text=nil
-      text == nil ? find_eles_attr(:button, :name) :
-          find_eles_by_name_include(:button, text)
+    def buttons value
+      xpaths(xpath_visible_contains('UIAButton', value))
     end
 
     # Get the first button element.
@@ -35,51 +29,23 @@ def last_button
     end
 
     # Get the first button element that exactly matches text.
-    # @param text [String] the text to match exactly
+    # @param value [String] the value to match exactly
     # @return [Button]
-    def button_exact text
-      find_ele_by_name :button, text
+    def button_exact value
+      xpath xpath_visible_exact 'UIAButton', value
     end
 
     # Get all button elements that exactly match text.
-    # @param text [String] the text to match exactly
+    # @param value [String] the value to match exactly
     # @return [Array<Button>]
-    def buttons_exact text
-      find_eles_by_name :button, text
+    def buttons_exact value
+      xpaths xpath_visible_exact 'UIAButton', value
     end
 
     # Get an array of button elements.
     # @return [Array<Button>]
     def e_buttons
-      find_eles :button
-    end
-
-    # Expected to be called via button method.
-    #
-    # Get the button element exactly matching text and
-    # occurrence. number=2 means the 2nd occurrence.
-    #
-    # find the second Sign In button
-    #
-    # b = e_button 'Sign In', 2
-    #
-    # Button order will change in iOS vs Android
-    # so if there's no button found at number then
-    # return the first button.
-    #
-    # @param text [String] the text to match
-    # @param number [Integer] the button occurance to return. 1 = first button
-    # @return [Button] the button that matches text and number
-    def button_num text, number=1
-      raise 'Number must be >= 1' if number <= 0
-      number = number - 1 # zero indexed
-      result = nil
-
-      elements = buttons text
-      elements.size > number ? result = elements[number]
-      : result = elements.first
-
-      result
+      find_elements :class, 'UIAButton'
     end
   end # module Common
 end # module Appium