appium_lib 0.4.0 → 0.4.1

data/lib/appium_lib/common/patch.rb

@@ -1,4 +1,24 @@
 # encoding: utf-8
+
+# Add status to WebDriver
+# https://code.google.com/p/selenium/issues/detail?id=5669
+class Selenium::WebDriver::Driver
+  def status
+    bridge.status
+  end
+end
+
+class Selenium::WebDriver::Remote::Bridge
+  def status
+    raw_execute :status
+  end
+end
+
+class Selenium::WebDriver::Remote::Bridge
+  command :status, :get, 'status'
+end
+# end Add status to WebDriver
+
 module Appium::Common
   # Implement useful features for element.
   class Selenium::WebDriver::Element

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.4.0' unless defined? ::Appium::VERSION
-  DATE = '2013-05-16' unless defined? ::Appium::DATE
+  VERSION = '0.4.1' unless defined? ::Appium::VERSION
+  DATE = '2013-05-20' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/driver.rb

@@ -149,6 +149,17 @@ module Appium
       self # return newly created driver
     end # def initialize
 
+    # Returns the status payload
+    def status
+      driver.status.payload
+    end
+
+    # Returns the server's version string
+    # @return [String]
+    def server_version
+      status['value']['build']['version']
+    end
+
     # @private
     # WebDriver capabilities. Must be valid for Sauce to work.
     # https://github.com/jlipps/appium/blob/master/app/android.js

data/lib/appium_lib/ios/element/generic.rb

@@ -41,52 +41,8 @@ module Appium::Ios
   # @param predicate [String] the predicate
   # @return [String] the completed JavaScript program
   def first_ele_js predicate
-    <<-JS
-    function isNil( a ) {
-      return a.type() === 'UIAElementNil';
-    }
-
-    function search( w ) {
-      var search = "#{predicate}";
-      var a = w.secureTextFields().firstWithPredicate(search);
-      if ( isNil(a) ) {
-        a = w.textFields().firstWithPredicate(search);
-        if ( isNil(a) ) {
-          a = w.buttons().firstWithPredicate(search);
-          if ( isNil(a) ) {
-            a = w.elements().firstWithPredicate(search);
-          }
-        }
-      }
-
-      return a;
-    }
-
-    function search_web( windowIndex ) {
-      var a = undefined;
-
-      try {
-        a = UIATarget.localTarget().frontMostApp().windows()[windowIndex].scrollViews()[0].webViews()[0].elements().firstWithPredicate("#{predicate}");
-      } catch(e) {}
-
-      return a;
-    }
-
-    function run() {
-      var windows = au.mainApp.windows();
-      for (var i = 0, len = windows.length; i < len; i++) {
-        var result = search_web( i );
-        if ( isNil( result ) ) {
-          result = search( windows[ i ] );
-        }
-        if ( ! isNil( result ) ) {
-          return au._returnElems( $( [ result ] ) );
-        }
-      }
-      return au._returnElems( $( [] ) );
-    }
-
-    run();
+    (<<-JS).strip # remove trailing newline
+       au.mainApp.getFirstWithPredicateWeighted("#{predicate}");
     JS
   end
 
@@ -94,16 +50,8 @@ module Appium::Ios
   # @param predicate [String] the predicate
   # @return [String] the completed JavaScript program
   def all_ele_js predicate
-    <<-JS
-      var w = au.mainWindow;
-      var search = "#{predicate}";
-      var a = w.elements().withPredicate(search).toArray();
-
-      if ( a.length === 0 ) {
-        a = [];
-      }
-
-      au._returnElems($(a));
+    (<<-JS).strip # remove trailing newline
+      au.mainApp.getAllWithPredicate("#{predicate}");
     JS
   end
 
@@ -112,10 +60,7 @@ module Appium::Ios
   # @return [Element] the first matching element
   def find text
     js = first_ele_js "name contains[c] '#{text}' || label contains[c] '#{text}' || value contains[c] '#{text}'"
-
-    ele = execute_script(js).first
-    raise Selenium::WebDriver::Error::NoSuchElementError, '' if ele.nil?
-    ele
+    execute_script js
   end
 
   # Return all elements matching text.
@@ -125,7 +70,6 @@ module Appium::Ios
     # returnElems requires a wrapped $(element).
     # must call toArray when using withPredicate instead of firstWithPredicate.
     js = all_ele_js "name contains[c] '#{text}' || label contains[c] '#{text}' || value contains[c] '#{text}'"
-
     execute_script js
   end
 
@@ -134,8 +78,7 @@ module Appium::Ios
   # @return [Element] the first matching element
   def text text
     js = first_ele_js "value contains[c] '#{text}'"
-
-    execute_script(js).first
+    execute_script js
   end
 
   # Return all elements matching text.
@@ -144,8 +87,7 @@ module Appium::Ios
   def texts text
     # XPath //* is not implemented on iOS
     # https://github.com/appium/appium/issues/430
-      js = all_ele_js "value contains[c] '#{text}'"
-
+    js = all_ele_js "value contains[c] '#{text}'"
     execute_script js
   end
 
@@ -164,11 +106,9 @@ module Appium::Ios
   # @param name [String] the name to search for
   # @return [Array<Element>] all matching elements
   def names name
-    # find_elements :name is not the same as on Android.
-    # it's case sensitive and exact on iOS and not on Android.
+    # :name is not consistent across iOS and Android so use custom JavaScript
     # https://github.com/appium/appium/issues/379
-    js = all_ele_js "name contains[c] '#{name}' || label contains[c] '#{name}''"
-
+    js = all_ele_js "name contains[c] '#{name}' || label contains[c] '#{name}'"
     execute_script js
   end
 end # module Appium::Ios

data/release_notes.md

@@ -1,3 +1,19 @@
+#### v0.4.0 2013-05-16
+
+- [70a59fe](https://github.com/appium/ruby_lib/commit/70a59fefcaa4f16ba0e7629f16feaae3e5f8c424) Release 0.4.0
+- [b30548e](https://github.com/appium/ruby_lib/commit/b30548e58783bc6b20bd5c0f11e2ae9ddb5faa30) Translate mobile find on Android
+- [1ea8b85](https://github.com/appium/ruby_lib/commit/1ea8b85ebb7c7531c2791f3c41d0280d947edad0) Screenshot should work on iOS
+- [3797644](https://github.com/appium/ruby_lib/commit/3797644874ff1e56a8c35f9825e42c8486902984) Update docs
+- [0e2c119](https://github.com/appium/ruby_lib/commit/0e2c119199535a2e9a8e708453fa068c6445e6ca) Fix release notes
+- [5c28a2d](https://github.com/appium/ruby_lib/commit/5c28a2debcd8386aab62b48d0b087ed7dac84d8d) Next release will be 0.4.0
+- [b9e5044](https://github.com/appium/ruby_lib/commit/b9e5044ddf6f998c09f006d8a6d95a5560f2fdd3) Remove comment
+- [30c2ada](https://github.com/appium/ruby_lib/commit/30c2adaecb0bca734664192a805968a83f4b7a8b) Update doc links
+- [d08cd59](https://github.com/appium/ruby_lib/commit/d08cd5944aeda9fa3f3842fd5a259e0385b88166) Add JS doc gen
+- [61530fb](https://github.com/appium/ruby_lib/commit/61530fb908822cd32be6cb25d94ffb00f68ec87b) Update docs
+- [ebe6a2f](https://github.com/appium/ruby_lib/commit/ebe6a2fa91a748c0c823dbb969afa51ab3710acd) Update docs.md
+- [637fef7](https://github.com/appium/ruby_lib/commit/637fef7f7547e6e2b2fd8f70e19ef3f3870cc136) Use element.displayed? not visible
+
+
 #### v0.3.16 2013-05-14
 
 - [fb34a03](https://github.com/appium/ruby_lib/commit/fb34a03ceec0be552f218323bf266fda7f7e060b) Release 0.3.16

metadata

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