Rename s_text to text. Remove e_* methods

Author: bootstraponline

lib/appium_lib/android/element/button.rb

@@ -29,7 +29,7 @@ def _button_contains_string value
       image_button = string_visible_contains ImageButton, value
       "#{button} | #{image_button}"
     end
-    
+
     public
 
     # Find the first button that contains value or by index.
@@ -49,11 +49,13 @@ def button value
       xpath _button_contains_string value
     end
 
-    # Find all buttons containing value
+    # Find all buttons containing value.
+    # If value is omitted, all buttons are returned.
     # @param value [String] the value to search for
     # @return [Array<Button>]
-    def buttons value
-     xpaths _button_contains_string value
+    def buttons value=false
+      return xpaths _button_visible_string unless value
+      xpaths _button_contains_string value
     end
 
     # Find the first button.
@@ -65,7 +67,7 @@ def first_button
     # Find the last button.
     # @return [Button]
     def last_button
-       xpath _button_visible_string index: 'last()'
+      xpath _button_visible_string index: 'last()'
     end
 
     # Find the first button that exactly matches value.
@@ -81,11 +83,5 @@ def button_exact value
     def buttons_exact value
       xpaths _button_exact_string value
     end
-
-    # Find all buttons.
-    # @return [Array<Button>]
-    def e_buttons
-      xpaths _button_visible_string
-    end
   end # module Android
 end # module Appium

lib/appium_lib/android/element/text.rb

@@ -7,48 +7,44 @@ module Android
     # @param value [String, Integer] the value to find.
     # If int then the TextView at that index is returned.
     # @return [TextView]
-    def s_text value
+    def text value
       return ele_index TextView, value if value.is_a? Numeric
       xpath_visible_contains TextView, value
     end
 
     # Find all TextViews containing value.
+    # If value is omitted, all texts are returned.
     # @param value [String] the value to search for
     # @return [Array<TextView>]
-    def s_texts value
+    def texts value=false
+      return tags TextView unless value
       xpaths_visible_contains TextView, value
     end
 
     # Find the first TextView.
     # @return [TextView]
-    def first_s_text
+    def first_text
       first_ele TextView
     end
 
     # Find the last TextView.
     # @return [TextView]
-    def last_s_text
+    def last_text
       last_ele TextView
     end
 
     # Find the first TextView that exactly matches value.
     # @param value [String] the value to match exactly
     # @return [TextView]
-    def s_text_exact value
+    def text_exact value
       xpath_visible_exact TextView, value
     end
 
     # Find all TextViews that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<TextView>]
-    def s_texts_exact value
+    def texts_exact value
       xpaths_visible_exact TextView, value
     end
-
-    # Find all TextViews.
-    # @return [Array<TextView>]
-    def e_s_texts
-      tags TextView
-    end
   end # module Android
 end # module Appium

lib/appium_lib/android/element/textfield.rb

@@ -12,9 +12,11 @@ def textfield value
     end
 
     # Find all EditTexts containing value.
+    # If value is omitted, all EditTexts are returned.
     # @param value [String] the value to search for
     # @return [Array<EditText>]
-    def textfields value
+    def textfields value=false
+      tags EditText unless value
       xpaths_visible_contains EditText, value
     end
 
@@ -43,11 +45,5 @@ def textfield_exact value
     def textfields_exact value
       xpaths_visible_exact EditText, value
     end
-
-    # Find all EditTexts.
-    # @return [Array<EditText>]
-    def e_textfields
-      tags EditText
-    end
   end # module Android
 end # module Appium

lib/appium_lib/ios/element/button.rb

@@ -13,10 +13,12 @@ def button value
       xpath_visible_contains UIAButton, value
     end
 
-    # Find all UIAButtons containing value
+    # Find all UIAButtons containing value.
+    # If value is omitted, all UIAButtons are returned.
     # @param value [String] the value to search for
     # @return [Array<UIAButton>]
-    def buttons value
+    def buttons value=false
+      return tags UIAButton unless value
       xpaths_visible_contains UIAButton, value
     end
 
@@ -45,11 +47,5 @@ def button_exact value
     def buttons_exact value
       xpaths_visible_exact UIAButton, value
     end
-
-    # Find all UIAButtons.
-    # @return [Array<UIAButton>]
-    def e_buttons
-      tags UIAButton
-    end
   end # module Ios
 end # module Appium

lib/appium_lib/ios/element/text.rb

@@ -7,48 +7,44 @@ module Ios
     # @param value [String, Integer] the value to find.
     # If int then the UIAStaticText at that index is returned.
     # @return [UIAStaticText]
-    def s_text value
+    def text value
       return ele_index UIAStaticText, value if value.is_a? Numeric
       xpath_visible_contains UIAStaticText, value
     end
 
     # Find all UIAStaticText containing value.
+    # If value is omitted, all UIAStaticTexts are returned
     # @param value [String] the value to search for
     # @return [Array<UIAStaticText>]
-    def s_texts value
+    def texts value=false
+      return tags UIAStaticText unless value
       xpaths_visible_contains UIAStaticText, value
     end
 
     # Find the first UIAStaticText.
     # @return [UIAStaticText]
-    def first_s_text
+    def first_text
       first_ele UIAStaticText
     end
 
     # Find the last UIAStaticText.
     # @return [UIAStaticText]
-    def last_s_text
+    def last_text
       last_ele UIAStaticText
     end
 
     # Find the first UIAStaticText that exactly matches value.
     # @param value [String] the value to match exactly
     # @return [UIAStaticText]
-    def s_text_exact value
+    def text_exact value
       xpath_visible_exact UIAStaticText, value
     end
 
     # Find all UIAStaticTexts that exactly match value.
     # @param value [String] the value to match exactly
     # @return [Array<UIAStaticText>]
-    def s_texts_exact value
+    def texts_exact value
       xpaths_visible_exact UIAStaticText, value
     end
-
-    # Find all UIAStaticTexts.
-    # @return [Array<UIAStaticText>]
-    def e_s_texts
-      tags UIAStaticText
-    end
   end # module Ios
 end # module Appium

lib/appium_lib/ios/element/textfield.rb

@@ -49,9 +49,11 @@ def textfield value
     end
 
     # Find all TextFields containing value.
+    # If value is omitted, all TextFields are returned.
     # @param value [String] the value to search for
     # @return [Array<TextField>]
-    def textfields value
+    def textfields value=false
+      return xpaths _textfield_visible_string unless value
       xpaths _textfield_contains_string value
     end
 
@@ -80,11 +82,5 @@ def textfield_exact value
     def textfields_exact value
       xpaths _textfield_exact_string value
     end
-
-    # Find all TextFields.
-    # @return [Array<TextField>]
-    def e_textfields
-      xpaths _textfield_visible_string
-    end
   end # module Ios
 end # module Appium