appium_lib 0.7.1 → 0.8.0

data/lib/appium_lib/android/helper.rb

@@ -424,4 +424,14 @@ module Appium::Android
                    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

data/lib/appium_lib/common/helper.rb

@@ -63,13 +63,6 @@ module Appium::Common
     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 @@ module Appium::Common
     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

data/lib/appium_lib/common/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '0.7.1' unless defined? ::Appium::VERSION
-  DATE = '2013-09-09' unless defined? ::Appium::DATE
+  VERSION = '0.8.0' unless defined? ::Appium::VERSION
+  DATE = '2013-09-19' unless defined? ::Appium::DATE
 end

data/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 @@ module Appium::Ios
   # @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 @@ module Appium::Ios
     # 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 @@ module Appium::Ios
       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 @@ module Appium::Ios
       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));

data/lib/appium_lib/ios/helper.rb

@@ -176,4 +176,13 @@ module Appium::Ios
   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

data/release_notes.md

@@ -1,3 +1,12 @@
+#### v0.7.1 2013-09-09
+
+- [1e0f36e](https://github.com/appium/ruby_lib/commit/1e0f36e22833246873b6ecb8cc4d2bf3544de2c8) Release 0.7.1
+- [b611ac6](https://github.com/appium/ruby_lib/commit/b611ac6c361b7044d07d2501ae032784aa891c66) Fix typing on disabled textfield
+- [d887050](https://github.com/appium/ruby_lib/commit/d887050006dd4e18e8b558b542eb0a090fecf985) xml_keys, xml_values, resolve_id work on iOS
+- [e148f2a](https://github.com/appium/ruby_lib/commit/e148f2ad746795b7dcf3960ed8f837fad2b78f24) Allow custom URL. Fix #84
+- [8d6ae78](https://github.com/appium/ruby_lib/commit/8d6ae788006fd9430cc34fc0dc3e390876758a1a) Use our docs not rubydoc.info
+
+
 #### v0.7.0 2013-09-05
 
 - [c8f3041](https://github.com/appium/ruby_lib/commit/c8f3041049c2feb9ac85f67e85523118a6ce5a84) Release 0.7.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver