Fix textfield methods on iOS

Fix id method

Fix #89

Author: bootstraponline

lib/appium_lib/android/helper.rb

@@ -424,4 +424,14 @@ def current_app
                    activity: act,
                    am_start: pkg + '/' + act
   end
+
+  # Find by id. Useful for selendroid
+  # @param id [String] the id to search for
+  # @return [Element]
+  def id id
+    lazy_load_strings
+    # resource ids must include ':' and they're not contained in strings_xml
+    raise "Invalid id `#{id}`" unless @strings_xml[id] || id.include?(':')
+    find_element :id, id
+  end
 end # module Appium::Android

lib/appium_lib/common/helper.rb

@@ -63,13 +63,6 @@ def wait_true max_wait=30, interval=0.5, &block
     result
   end
 
-  # Find by id. Useful for selendroid
-  # @param id [String] the id to search for
-  # @return [Element]
-  def id id
-    find_element :id, id
-  end
-
   # Navigate back.
   # @return [void]
   def back
@@ -260,4 +253,10 @@ def resolve_id id
     lazy_load_strings
     @strings_xml[id]
   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.'
+  end
+
 end # module Appium::Common

lib/appium_lib/ios/element/textfield.rb

@@ -5,6 +5,13 @@ module Appium::Ios
   # Find textfield and then secure elements in one server call
   # to match Android.
 
+  def locate_single_textfield js
+    ele = execute_script(js)
+    ele = ele.first if ele.kind_of? Array
+    raise_no_element_error unless ele.kind_of? Selenium::WebDriver::Element
+    ele
+  end
+
   # Get an array of textfield texts.
   # @return [Array<String>]
   def textfields
@@ -21,14 +28,14 @@ def e_textfields
   # @return [Textfield]
   def first_textfield
     js = textfield_js 'r = r.length > 0 ? $(r[0]) : r;'
-    execute_script(js).first
+    locate_single_textfield js
   end
 
   # Get the last textfield element.
   # @return [Textfield]
   def last_textfield
     js = textfield_js 'r = r.length > 0 ? $(r[r.length - 1]) : r;'
-    execute_script(js).first
+    locate_single_textfield js
   end
 
   # Get the first textfield that matches text.
@@ -39,7 +46,7 @@ def textfield text
     # iOS needs to combine textfield and secure to match Android.
     if text.is_a? Numeric
       js = textfield_js "r = r.length > 0 ? $(r[#{text}]) : r;"
-      return execute_script(js).first
+      return locate_single_textfield js
     end
 
     textfield_include text
@@ -54,8 +61,7 @@ def textfield_include text
       var s = au.getElementsByXpath('secure[contains(@text, "#{text}")]').value;
       t.concat(s)[0];
     )
-
-    execute_script js
+    locate_single_textfield js
   end
 
   # Get the first textfield that exactly matches text.
@@ -68,15 +74,14 @@ def textfield_exact text
       var s = au.getElementsByXpath('secure[@text="#{text}"]').value;
       t.concat(s)[0];
     )
-
-    execute_script js
+    locate_single_textfield js
   end
 
   # @private
   # Return combined lookup of textfield and secure
   # with an optional filter. $() wrap is required for .each
   def textfield_js filter=''
-  %Q(
+    %Q(
     var t = au.lookup('textfield');
     var s = au.lookup('secure');
     var r = $(t.concat(s));

lib/appium_lib/ios/helper.rb

@@ -176,4 +176,13 @@ def page_window window_number=0
   def fast_duration
     0.5
   end
+
+  # Find by id. Useful for selendroid
+  # @param id [String] the id to search for
+  # @return [Element]
+  def id id
+    lazy_load_strings
+    raise "Invalid id `#{id}`" unless @strings_xml[id]
+    find_element :id, id
+  end
 end # module Appium::Ios