Fix iOS common/element/button

Author: bootstraponline

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

@@ -29,7 +29,7 @@ def gray
   end
 
   t 'buttons' do
-    exp = ['Back', 'Back', 'Gray', 'Right pointing arrow', 'Rounded', 'Custom Text', 'More info', 'More info', 'More info', 'Add contact']
+    exp = ['Back', 'UINavigationBarBackIndicatorDefault.png', 'Gray', 'Right pointing arrow', 'Rounded', 'Custom Text', 'More info', 'More info', 'More info', 'Add contact']
     buttons.must_equal exp
   end
 
@@ -54,8 +54,10 @@ def gray
   end
 
   t 'button_num' do
-    # select the second button containing 'in'
-    button_num('in', 2).name.must_equal 'More info'
+    # 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

lib/appium_lib/common/element/button.rb renamed to lib/appium_lib/android/element/button.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # UIAButton methods
 module Appium
-  module Common
+  module Android
     # 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 number [Integer] the occurrence of the button matching text. Defaults to the first button.

lib/appium_lib/driver.rb

@@ -11,13 +11,14 @@
 require_relative 'common/helper'
 require_relative 'common/patch'
 require_relative 'common/version'
-require_relative 'common/element/button'
 require_relative 'common/element/window'
 
 # ios
 require_relative 'ios/helper'
 require_relative 'ios/patch'
+
 require_relative 'ios/element/alert'
+require_relative 'ios/element/button'
 require_relative 'ios/element/generic'
 require_relative 'ios/element/textfield'
 require_relative 'ios/element/text'
@@ -28,6 +29,7 @@
 require_relative 'android/helper'
 require_relative 'android/patch'
 require_relative 'android/element/alert'
+require_relative 'android/element/button'
 require_relative 'android/element/generic'
 require_relative 'android/element/textfield'
 require_relative 'android/element/text'

lib/appium_lib/ios/element/button.rb

@@ -0,0 +1,85 @@
+# encoding: utf-8
+# UIAButton methods
+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 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
+      # 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)
+    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)
+    end
+
+    # Get the first button element.
+    # @return [Button]
+    def first_button
+      first_ele :button
+    end
+
+    # Get the last button element.
+    # @return [Button]
+    def last_button
+      last_ele :button
+    end
+
+    # Get the first button element that exactly matches text.
+    # @param text [String] the text to match exactly
+    # @return [Button]
+    def button_exact text
+      find_ele_by_name :button, text
+    end
+
+    # Get all button elements that exactly match text.
+    # @param text [String] the text to match exactly
+    # @return [Array<Button>]
+    def buttons_exact text
+      find_eles_by_name :button, text
+    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
+    end
+  end # module Common
+end # module Appium