Add alert for Android

Make text and name cross platform
Button and text now defaults to fuzzy match
Add button and text exact match methods
Prefix static text element commands with s_ to avoid text conflict
Fix page output
Rename set_value to type
Use tag_name to get the old value of type

Fix #8
Fix #9
Fix #10

Author: bootstraponline

lib/appium_lib/element/android/alert.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+if $os == :android
+
+# Tap the alert button identified by value.
+# @param value [Integer, String] either an integer index of the button or the button's name
+# @return [void]
+def alert_click value
+  button(value).click
+end
+
+# Get the alert message text.
+# @return [String]
+def alert_text
+  get_page
+end
+
+# Accept the alert.
+# The last button is considered "accept."
+# @return [void]
+def alert_accept
+  last_button.click
+end
+
+# Get the text of the alert's accept button.
+# The last button is considered "accept."
+# @return [String]
+def alert_accept_text
+  last_button.text
+end
+
+# Dismiss the alert.
+# The first button is considered "dismiss."
+# @return [void]
+def alert_dismiss
+  first_button.click
+end
+
+# Get the text of the alert's dismiss button.
+# The first button is considered "dismiss."
+# @return [String]
+def alert_dismiss_text
+  first_button.text
+end
+
+end # if $os == :android

lib/appium_lib/element/android/generic.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+if $os == :android
+=begin
+name, names, text, text should match substring and case insensitive.
+
+In Android //* is used to find partial case insensitive text matches.
+//* is not currently implemented in iOS.
+
+find_element :name by default uses a partial case insensitive match.
+On iOS the default is an exact name match.
+=end
+
+# Return the first element matching text.
+# @param text [String] the text to search for
+# @return [Element] the first matching element
+def text text
+  # TODO: Use XPath index once it's implemented
+  # https://github.com/appium/appium/issues/295
+  texts(text).first
+end
+
+# Return all elements matching text.
+# @param text [String] the text to search for
+# @return [Array<Element>] all matching elements
+def texts text
+  $driver.find_elements :xpath, "//*[contains(@text, '#{text}')]"
+end
+
+# Return the first element matching name.
+# on Android name is content description
+# on iOS name is the accessibility label or the text.
+# @param name [String] the name to search for
+# @return [Element] the first matching element
+def name name
+  $driver.find_element :name, name
+end
+
+# Return all elements matching name.
+# on Android name is content description
+# on iOS name is the accessibility label or the text.
+# @param name [String] the name to search for
+# @return [Array<Element>] all matching elements
+def names name
+  $driver.find_elements :name, name
+end
+
+end # if $os == :android

lib/appium_lib/element/android/textfield.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
-# UIATextField methods
-
 if $os == :android
+# UIATextField methods
 
 # Get an array of textfield texts.
 # @return [Array<String>]
@@ -42,4 +41,4 @@ def textfield_include text
   find_ele_by_text_include :textfield, text
 end
 
-end # if $os
+end # if $os == :android

lib/appium_lib/element/button.rb

@@ -1,62 +1,24 @@
 # encoding: utf-8
 # UIAButton methods
 
-=begin
- Method Signatures:
-
-   button( text, number = -1 )
-   buttons( text = nil )
-   button_include( text )
-   buttons_include( text )
-   first_button
-   last_button
-
- Examples:
-
-   button 'text'    # 1st button exactly matching text
-   button 'text', 2 # 2nd button exactly matching text
-
-   buttons          # text of all buttons.
-   buttons 'text'   # all buttons exactly matching text
-
-   button_include  'text' # the first button that includes text
-   buttons_include 'text' # all buttons that include text
-
-   first_button     # the first button
-   last_button      # the last button
-=end
-
 # 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 occurance 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_text_num( text, number ) :
-  button_text( text )
+  number >= 1 ? button_num( text, number ) :
+                find_ele_by_text_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, :text) :
-                find_ele_by_text(:button, text)
-end
-
-# Get the first button that includes text.
-# @param text [String] the text that the element must include
-# @return [Button]
-def button_include text
-  find_ele_by_text_include :button, text
-end
-
-# Get all buttons that include text.
-# @param text [String] the text that the element must include
-# @return [Array<Button>]
-def buttons_include text
-  find_eles_by_text_include :button, text
+  text == nil ? find_eles_attr( :button, :text ) :
+                find_eles_by_text_include( :button, text )
 end
 
 # Get the first button element.
@@ -71,16 +33,28 @@ def last_button
   last_ele :button
 end
 
-# -- prefer above methods before using these.
-private
-
 # Get the first button element that exactly matches text.
 # @param text [String] the text to match exactly
 # @return [Button]
-def button_text text
+def button_exact text
   find_ele_by_text :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_text :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.
 #
@@ -92,24 +66,18 @@ def button_text text
 # so if there's no button found at number then
 # return the first button.
 #
-# @param text [String] the text to match exactly
+# @param text [String] the text to match
 # @param number [Integer] the button occurance to return. 1 = first button
-# @return [Button] the button that exactly matches text and number
-def button_text_num text, number=1
+# @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 = find_eles_by_text :button, text
+  elements = buttons text
   elements.size > number ? result = elements[number]
                          : result = elements.first
 
   result
-end
-
-# Get an array of button elements.
-# @return [Array<Button>]
-def e_buttons
-  find_eles :button
-end
+end

lib/appium_lib/element/alert.rb lib/appium_lib/element/ios/alert.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-
+if $os == :ios
 # iOS only
 # Tap the alert button identified by value.
 # @param value [Integer, String] either an integer index of the button or the button's name
@@ -44,4 +44,6 @@ def alert_dismiss_text
   return if a.nil?
   b = a.find_elements(:tag_name, :button)
   b.first.text if b && b.size >= 1
-end
+end
+
+end # if $os == :ios

lib/appium_lib/element/ios/generic.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+if $os == :ios
+=begin
+name, names, text, text should match substring and case insensitive.
+
+iOS .name() is the accessibility attribute. If not defined, then .label() is used instead.
+This differs from Android where name (the content description) is empty when not set.
+=end
+
+# Return the first element matching text.
+# @param text [String] the text to search for
+# @return [Element] the first matching element
+def text text
+  # returnElems requires a wrapped $(element).
+  js = %Q(
+    var element = $(au.mainWindow.elements().firstWithPredicate("name contains[c] '#{text}'"));
+    au._returnElems(element);
+  )
+
+  execute_script(js).first
+end
+
+# Return all elements matching text.
+# @param text [String] the text to search for
+# @return [Array<Element>] all matching elements
+def texts text
+  # returnElems requires a wrapped $(element).
+  # must call toArray when using withPredicate instead of firstWithPredicate.
+  js = %Q(
+    var a = au.mainWindow.elements().withPredicate("name contains[c] '#{text}'").toArray();
+    au._returnElems($(a));
+  )
+
+  execute_script js
+end
+
+# Return the first element matching name.
+# on Android name is content description
+# on iOS name is the accessibility label or the text.
+# @param name [String] the name to search for
+# @return [Element] the first matching element
+def name name
+  text name
+end
+
+# Return all elements matching name.
+# on Android name is content description
+# on iOS name is the accessibility label or the text.
+# @param name [String] the name to search for
+# @return [Array<Element>] all matching elements
+def names name
+  texts name
+end
+
+end # if ios

lib/appium_lib/element/ios/textfield.rb

@@ -1,11 +1,10 @@
 # encoding: utf-8
+if $os == :ios
 # UIATextField & UIASecureTextField methods
 #
 # Find textfield and then secure elements in one server call
 # to match Android.
 
-if $os == :ios
-
 # Get an array of textfield texts.
 # @return [Array<String>]
 def textfields

lib/appium_lib/element/text.rb

@@ -1,41 +1,43 @@
 # encoding: utf-8
 # UIAStaticText methods
 
+# s_ prefix for static_text to avoid conflict with generic text methods.
+
 # Get an array of text texts.
 # @return [Array<String>]
-def texts
+def s_texts
   find_eles_attr :text, :text
 end
 
 # Get an array of text elements.
 # @return [Array<Text>]
-def e_texts
+def s_e_texts
   find_eles :text
 end
 
 # Get the first text element.
 # @return [Text]
-def first_text
+def s_first_text
   first_ele :text
 end
 
 # Get the last text element
 # @return [Text]
-def last_text
+def s_last_text
   last_ele :text
 end
 
-# Get the first element that matches text.
-# @param text [String, Integer] the text to find exactly. If int then the text at that index is returned.
+# 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 text text
+def s_text text
   return ele_index :text, text if text.is_a? Numeric
-  find_ele_by_text :text, text
+  find_ele_by_text_include :text, text
 end
 
-# Get the first textfield that includes text.
-# @param text [String] the text that the tag must include
+# Get the first textfield that matches text.
+# @param text [String] the text that the tag must match
 # @return [Text]
-def text_include text
-  find_ele_by_text_include :text, text
+def s_text_exact text
+  find_ele_by_text :text, text
 end