appium_lib 0.11.1 → 0.12.0

data/lib/appium_lib/android/helper.rb

@@ -329,6 +329,10 @@ module Appium::Android
 
         keys = node.keys
         return if keys.empty?
+        if keys == %w(hierarchy)
+          run_internal.call node['hierarchy']
+          return
+        end
 
         n_content = '@content-desc'
         n_text = '@text'
@@ -336,11 +340,13 @@ module Appium::Android
         n_resource = '@resource-id'
         n_node = 'node'
 
+        # Store the object if it has a content description, text, or resource id.
+        # If it only has a class, then don't save it.
         obj = {}
         obj.merge!( { desc: node[n_content] } ) if keys.include?(n_content) && !node[n_content].empty?
         obj.merge!( { text: node[n_text] } ) if keys.include?(n_text) && !node[n_text].empty?
+        obj.merge!( { resource_id: node[n_resource] } ) if keys.include?(n_resource) && !node[n_resource].empty?
         obj.merge!( { class: node[n_class] } ) if keys.include?(n_class) && !obj.empty?
-        obj.merge!( { resource_id: node[n_resource] } ) if keys.include?(n_resource) && !obj.empty?
 
         r.push obj if !obj.empty?
         run_internal.call node[n_node] if keys.include?(n_node)
@@ -371,7 +377,7 @@ module Appium::Android
         out += "  name: #{e_desc}\n" unless e_desc.nil?
       end
 
-      out += "  resource_id: #{e_resource_id}\n" unless e_resource_id.nil?
+      out += "  resource_id: #{e_resource_id}\n" unless e_resource_id.nil? || e_resource_id.empty?
 
       # there may be many ids with the same value.
       # output all exact matches.

data/lib/appium_lib/common/element/text.rb

@@ -15,6 +15,10 @@ module Appium::Common
     end
   end
 
+  def s_texts_names
+    find_eles_attr :text, :name
+  end
+
   # Get an array of text elements.
   # @return [Array<Text>]
   def e_s_texts

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.11.1' unless defined? ::Appium::VERSION
-  DATE = '2013-09-24' unless defined? ::Appium::DATE
+  VERSION = '0.12.0' unless defined? ::Appium::VERSION
+  DATE = '2013-11-07' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/driver.rb

@@ -495,15 +495,17 @@ module Appium
       @driver
     end
 
-    # Set implicit wait to zero.
+    # Set implicit wait and default_wait to zero.
     def no_wait
+      @default_wait = 0
       @driver.manage.timeouts.implicit_wait = 0
     end
 
-    # Set implicit wait to timeout, defaults to 30.
+    # Set implicit wait and default_wait to timeout, defaults to 30.
     # @param timeout [Integer] the timeout in seconds
     # @return [void]
     def set_wait timeout=@default_wait
+      @default_wait = timeout
       @driver.manage.timeouts.implicit_wait = timeout
     end
 

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

@@ -34,13 +34,29 @@ module Appium::Ios
   end
 
   # Get the text of the alert's accept button.
-  # The last button is considered "accept."
+  # The last button is considered "accept." on iOS 6
+  # The first button is considered "accept." on iOS 7
   # @return [String]
   def alert_accept_text
-    a = @driver.find_element(:tag_name, :alert)
-    return if a.nil?
-    b = a.find_elements(:tag_name, :button)
-    b.last.text if b && b.size >= 1
+    old_wait = default_wait
+    set_wait 0
+    target_text = ''
+
+    a = ignore { @driver.find_element(:tag_name, :alert) }
+
+    begin
+      if a.nil? # either no alert or on iOS 7
+        b = xpaths 'actionsheet/button'
+        target_text = b.first.text if b && b.size >= 1
+      else # iOS 6 alert found
+        b = a.find_elements(:tag_name, :button)
+        target_text = b.last.text if b && b.size >= 1
+      end
+    rescue
+    ensure
+      set_wait old_wait
+      return target_text
+    end
   end
 
   # Dismiss the alert.
@@ -52,12 +68,28 @@ module Appium::Ios
   end
 
   # Get the text of the alert's dismiss button.
-  # The first button is considered "dismiss."
+  # The first button is considered "dismiss." on iOS 6
+  # The last button is considered "dismiss." on iOS 7
   # @return [String]
   def alert_dismiss_text
-    a = @driver.find_element(:tag_name, :alert)
-    return if a.nil?
-    b = a.find_elements(:tag_name, :button)
-    b.first.text if b && b.size >= 1
+    old_wait = default_wait
+    set_wait 0
+    target_text = ''
+
+    a = ignore { @driver.find_element(:tag_name, :alert) }
+
+    begin
+      if a.nil? # either no alert or on iOS 7
+        b = xpaths 'actionsheet/button'
+        target_text = b.last.text if b && b.size >= 1
+      else # iOS 6 alert found
+        b = a.find_elements(:tag_name, :button)
+        target_text = b.first.text if b && b.size >= 1
+      end
+    rescue
+    ensure
+      set_wait old_wait
+      return target_text
+    end
   end
 end # module Appium::Ios

data/lib/appium_lib/ios/helper.rb

@@ -74,7 +74,7 @@ module Appium::Ios
     r.uniq.each do |ele|
       res.push "#{r.count(ele)}x #{ele}\n"
     end
-    count_sort  = ->(one,two) { two.match(/(\d+)x/)[1].to_i <=> one.match(/(\d+)x/)[1].to_i }
+    count_sort = ->(one, two) { two.match(/(\d+)x/)[1].to_i <=> one.match(/(\d+)x/)[1].to_i }
     res.sort(&count_sort).join ''
   end
 
@@ -151,8 +151,15 @@ module Appium::Ios
 
   # Prints a string of interesting elements to the console.
   # @return [void]
-  def page window_number = 0
-    get_page source_window window_number || 0
+  def page window_number = -1
+    if window_number == -1
+      # if the 0th window has no children, find the next window that does.
+      target_window = source_window 0
+      target_window = source_window 1 if target_window['children'].empty?
+      get_page target_window
+    else
+      get_page source_window window_number || 0
+    end
     nil
   end
 

data/readme.md

@@ -52,6 +52,19 @@ Appium::Driver.new(apk).start_driver
 Appium.promote_appium_methods Object
 ```
 
+```ruby
+# Example of automating Settings preinstalled app on Android
+# Find these values using arc then type current_app
+apk = { 
+        device: :android
+        app_path: '',
+        app_package: 'com.android.settings',
+        app_activity: '.Settings',
+        app_wait_activity: '.Settings'
+      }
+Appium::Driver.new(apk).start_driver
+```
+
 #### iOS env vars
 
 - `APP_PATH` Path to the .app folder

data/release_notes.md

@@ -1,3 +1,9 @@
+#### v0.11.1 2013-09-24
+
+- [0551d9a](https://github.com/appium/ruby_lib/commit/0551d9a4de2cb3d62efe63a87b01c15526202336) Release 0.11.1
+- [283040e](https://github.com/appium/ruby_lib/commit/283040e7227b7838124e835578d549fadc101cdc) Fix s_texts method overloading
+
+
 #### v0.11.0 2013-09-24
 
 - [948074c](https://github.com/appium/ruby_lib/commit/948074c44917029fb27b08ed582c90d7f73a7cde) Release 0.11.0

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.35.1
+        version: 2.37.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.35.1
+        version: 2.37.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: toml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.4
 description: Ruby library for Appium.
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE-2.0.txt
 - Rakefile
@@ -128,17 +128,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Ruby library for Appium