appium_lib 4.1.0 → 5.0.0

data/ios_tests/appium.txt

@@ -1,8 +1,9 @@
 [caps]
 platformName = "ios"
+platformVersion = "8.1"
 deviceName ="iPhone Simulator"
 app = "./UICatalog.app"
 
 [appium_lib]
 sauce_username = ""
-sauce_access_key = ""
+sauce_access_key = ""

data/ios_tests/lib/ios/specs/common/helper.rb

@@ -1,5 +1,6 @@
 # rake ios[common/helper]
 describe 'common/helper.rb' do
+
   def before_first
     screen.must_equal catalog
   end
@@ -91,11 +92,11 @@ must_not_raise is a no-op.
   end
 
   t 'xpaths' do
-    xpaths('//UIAStaticText').length.must_equal 13
+    xpaths('//UIAStaticText').length.must_equal 25
   end
 
   def uibutton_text
-    'Buttons, Various uses of UIButton'
+    'Buttons'
   end
 
   t 'ele_index' do
@@ -126,7 +127,7 @@ must_not_raise is a no-op.
 
   t 'find_ele_by_attr_include' do
     el_text = find_ele_by_attr_include('UIAStaticText', :name, 'button').text
-    el_text.must_equal ''
+    el_text.must_equal uibutton_text
 
     el_name = find_ele_by_attr_include('UIAStaticText', :name, 'button').name
     el_name.must_equal uibutton_text
@@ -134,7 +135,7 @@ must_not_raise is a no-op.
 
   t 'find_eles_by_attr_include' do
     ele_count = find_eles_by_attr_include('UIAStaticText', :name, 'e').length
-    ele_count.must_equal 12
+    ele_count.must_equal 19
   end
 
   t 'first_ele' do
@@ -143,8 +144,8 @@ must_not_raise is a no-op.
 
   t 'last_ele' do
     el = last_ele('UIAStaticText')
-    el.text.must_equal ''
-    el.name.must_equal 'Transitions, Shows UIViewAnimationTransitions'
+    el.text.must_equal 'Transitions'
+    el.name.must_equal 'Transitions'
   end
 
   # t 'source' do # tested by get_source
@@ -158,24 +159,14 @@ must_not_raise is a no-op.
   end
 
   t 'invalid id should error' do
-    begin
-      id 'does not exist'
-    rescue Exception => e
-      message = e.message
-    end
-    message.must_equal 'Invalid id `does not exist`'
+    proc { id 'does not exist' }.must_raise Selenium::WebDriver::Error::NoSuchElementError
 
     # resource id should error on ios
-    begin
-      id 'android:id/text1'
-    rescue Exception => e
-      message = e.message
-    end
-    message.must_equal 'Invalid id `android:id/text1`'
+    proc { id 'android:id/text1' }.must_raise Selenium::WebDriver::Error::NoSuchElementError
   end
 
   t 'tag' do
-    tag('UIATableCell').name.must_equal 'Buttons, Various uses of UIButton'
+    tag('UIATableCell').name.must_equal uibutton_text
   end
 
   t 'tags' do
@@ -183,7 +174,7 @@ must_not_raise is a no-op.
   end
 
   t 'find_eles_by_attr_include' do
-    find_eles_by_attr_include('UIATableCell', 'name', 'Use').length.must_equal 7
+    find_eles_by_attr_include('UIAStaticText', 'name', 'Use').length.must_equal 7
   end
 
   t 'get_page_class' do
@@ -209,4 +200,4 @@ xpath_visible_exact
 xpaths_visible_exact
 raise_no_element_error
 =end
-end
+end

data/ios_tests/lib/ios/specs/common/web_context.rb

@@ -2,10 +2,15 @@
 describe 'the web context' do
 
   t 'get_android_inspect' do
-    text('Web, Use of UIWebView').click
+    text('Web').click
     set_context 'WEBVIEW'
     current_context.must_equal 'WEBVIEW_1'
     sleep 1  #Give a chance to load
     page.start_with?("\nhtml\n").must_equal true
   end
-end
+
+  t 'after_last' do
+    set_context 'NATIVE_APP'
+    back_click
+  end
+end

data/ios_tests/lib/ios/specs/device/device.rb

@@ -3,6 +3,12 @@ describe 'device/device' do
     screen.must_equal catalog
   end
 
+  # go back to the main page
+  def go_back
+    back
+    wait { ! exists { id 'ArrowButton'  } } # successfully transitioned back
+  end
+
   t 'before_first' do
     before_first
   end
@@ -13,7 +19,7 @@ describe 'device/device' do
 
     # It appears that lockForDuration doesn't.
     close_app
-    launch
+    launch_app
   end
 
   t 'background_app' do
@@ -32,7 +38,7 @@ describe 'device/device' do
 
   t 'close and launch' do
     close_app
-    launch
+    launch_app
     tag('UIANavigationBar').name.must_equal 'UICatalog'
   end
 
@@ -45,12 +51,12 @@ describe 'device/device' do
   end
 
   t 'current_context' do
-    current_context.must_equal nil
+    current_context.must_equal 'NATIVE_APP'
   end
 
   t 'switch_to_default_context' do
     switch_to_default_context
-    current_context.must_equal nil
+    current_context.must_equal 'NATIVE_APP'
   end
 
   t 'app_strings' do
@@ -59,11 +65,9 @@ describe 'device/device' do
   end
 
   t 'action_chain' do
-    ac = Appium::TouchAction.new
-    e  = find_element(:name, 'Buttons, Various uses of UIButton')
-    ac.press element: e, x: 10, y: 10
-    ac.perform
-    back
+    Appium::TouchAction.new.press(element: id('ButtonsExplain')).perform
+    wait { id 'ArrowButton' } # successfully transitioned to buttons page
+    go_back
   end
 
   t 'swipe' do
@@ -71,9 +75,11 @@ describe 'device/device' do
   end
 
   t 'pinch & zoom' do
-    text('Images, Use of UIImageView').click
+    wait { id('ImagesExplain').click }
+    # both of these appear to do nothing on iOS 8
     zoom 200
     pinch 75
+    go_back
   end
 
   t 'pull_file' do

data/ios_tests/lib/ios/specs/driver.rb

@@ -36,6 +36,7 @@ describe 'driver' do
       actual              = driver_attributes
       actual[:caps][:app] = File.basename actual[:caps][:app]
       expected            = { caps:             { platformName: 'ios',
+                                                  platformVersion: '8.1',
                                                   deviceName:   'iPhone Simulator',
                                                   app:          'UICatalog.app' },
                               custom_url:       false,
@@ -195,7 +196,7 @@ describe 'driver' do
 
     # any elements
     t 'find_elements' do
-      find_elements(:class, 'UIAStaticText').length.must_equal 13
+      find_elements(:class, 'UIATableCell').length.must_equal 12
     end
 
     # any element
@@ -203,6 +204,16 @@ describe 'driver' do
       find_element(:class, 'UIAStaticText').class.must_equal Selenium::WebDriver::Element
     end
 
+    # settings
+    t 'get settings' do
+      get_settings.wont_be_nil
+    end
+
+    t 'update settings' do
+      update_settings cyberdelia: 'open'
+      get_settings['cyberdelia'].must_equal 'open'
+    end
+
     # Skip: x # x is only used in Pry
   end
-end
+end

data/ios_tests/lib/ios/specs/ios/element/button.rb

@@ -21,16 +21,17 @@ describe 'ios/element/button' do
 
   t 'button' do
     # by index
-    button(2).name.must_equal gray
+    button(3).name.must_equal gray
 
     # by name contains
     button('ray').name.must_equal gray
   end
 
   t 'buttons' do
-    exp = ['Back', 'Gray', 'Right pointing arrow']
-    buttons('a').map { |e| e.name }.must_equal exp
-    buttons.length.must_equal 4
+    exp = ['Back', 'Back', 'Gray', 'Right pointing arrow']
+    target_buttons = buttons('a')
+    target_buttons.map { |e| e.name }.must_equal exp
+    target_buttons.length.must_equal exp.length
   end
 
   t 'first_button' do

data/ios_tests/lib/ios/specs/ios/element/generic.rb

@@ -5,7 +5,7 @@ describe 'ios/element/generic' do
   end
 
   def uibutton_text
-    'Buttons, Various uses of UIButton'
+    'Buttons'
   end
 
   def verify element
@@ -32,4 +32,4 @@ describe 'ios/element/generic' do
   t 'finds_exact' do
     verify finds_exact uibutton_text
   end
-end
+end

data/ios_tests/lib/ios/specs/ios/element/text.rb

@@ -4,6 +4,10 @@ describe 'ios/element/text' do
     'UICatalog'
   end
 
+  def uiview_transitions
+    'Transitions'
+  end
+
   def before_first
     screen.must_equal catalog
   end
@@ -17,19 +21,19 @@ describe 'ios/element/text' do
   end
 
   t 'last_text' do
-    last_text.text.must_equal ''
-    last_text.name.must_equal 'Transitions, Shows UIViewAnimationTransitions'
+    last_text.text.must_equal uiview_transitions
+    last_text.name.must_equal uiview_transitions
   end
 
   t 'text' do
-    text('mat').text.must_equal ''
+    text('siti').text.must_equal uiview_transitions
     text(1).text.must_equal ui_catalog
-    text('mat').name.must_equal 'Transitions, Shows UIViewAnimationTransitions'
+    text('siti').name.must_equal uiview_transitions
   end
 
   t 'texts' do
-    exp = ['Controls, Various uses of UIControl', 'Segments, Various uses of UISegmentedControl']
-    texts.length.must_equal 13
+    exp = ['Controls', 'Various uses of UIControl', 'Various uses of UISegmentedControl']
+    texts.length.must_equal 24
     texts('trol').map { |e| e.name }.must_equal exp
     texts('uses').length.must_equal 7
   end
@@ -51,4 +55,4 @@ describe 'ios/element/text' do
   t 'texts_exact' do
     texts_exact('UICatalog').length.must_equal 1
   end
-end
+end

data/ios_tests/lib/ios/specs/ios/element/textfield.rb

@@ -23,7 +23,7 @@ describe 'ios/element/textfield' do
   t 'textfield' do
     textfield(1).text.must_equal(enter_text)
     textfield(enter_text).text.must_equal(enter_text)
-    textfield('word').text.must_equal enter_password
+    textfield('word').value.must_equal enter_password
   end
 
   t 'textfields' do
@@ -43,15 +43,15 @@ describe 'ios/element/textfield' do
   end
 
   t 'last_textfield' do
-    last_textfield.text.must_equal enter_password
+    last_textfield.text.must_equal enter_text
   end
 
   t 'textfield_exact' do
-    textfield_exact(enter_password).text.must_equal enter_password
+    textfield_exact(enter_password).value.must_equal enter_password
   end
 
   t 'textfields_exact' do
-    textfields_exact(enter_password).first.text.must_equal enter_password
+    textfields_exact(enter_password).first.value.must_equal enter_password
   end
 
   def keyboard_exists?
@@ -83,6 +83,11 @@ describe 'ios/element/textfield' do
     proc { block.call }.must_raise Selenium::WebDriver::Error::NoSuchElementError
   end
 
+  t 'hide_keyboard' do
+    first_textfield.click
+    hide_keyboard
+  end
+
   # test textfield methods with no textfields
 
   t 'leave textfields' do
@@ -115,11 +120,6 @@ describe 'ios/element/textfield' do
     textfields_exact('does not exist').length.must_equal 0
   end
 
-  t 'hide_keyboard' do
-    first_textfield.click
-    hide_keyboard
-  end
-
   t 'after_last' do
     after_last
   end

data/lib/appium_lib.rb

@@ -5,24 +5,8 @@ Encoding.default_internal = Encoding::UTF_8
 require 'forwardable' unless defined? Forwardable
 require_relative 'appium_lib/rails/duplicable'
 
+# Init global driver
 $driver = nil
 
-# @private
-# Invoke top level methods on last created Appium driver.
-def self.method_missing method, *args, &block
-  raise "driver is nil. called #{method}" if $driver == nil
-
-  if $driver.respond_to?(method)
-    # puts "[method_missing] Calling driver.send for #{method}"
-    $driver.send(method, *args, &block)
-  elsif self.respond_to?(method)
-    # puts "[method_missing] Calling super with args for #{method}"
-    super(*args, &block)
-  else
-    # puts "[method_missing] Calling super (no args) for #{method}"
-    super
-  end
-end
-
 require_relative 'appium_lib/logger'
 require_relative 'appium_lib/driver'

data/lib/appium_lib/android/helper.rb

@@ -18,13 +18,13 @@ module Appium
 
       def initialize
         reset
-        @filter = false
+        @filter   = false
         @instance = Hash.new -1
       end
 
       def reset
-        @result = ''
-        @keys   = %w[text resource-id content-desc]
+        @result   = ''
+        @keys     = %w[text resource-id content-desc]
         @instance = Hash.new -1
       end
 
@@ -83,6 +83,41 @@ module Appium
       end
     end # class AndroidElements
 
+    # Fix uiautomator's xml dump.
+    # https://github.com/appium/appium/issues/2822
+    # https://code.google.com/p/android/issues/detail?id=74143
+    def _fix_android_native_source source
+      # <android.app.ActionBar$Tab
+      # <android.app.ActionBar  $  Tab
+
+      # find each closing tag that contains a dollar sign.
+      source.scan(/<\/([^>]*\$[^>]*)>/).flatten.uniq.each do |problem_tag|
+        # "android.app.ActionBar$Tab"
+        before, after = problem_tag.split('$')
+        before.strip!
+        after.strip!
+
+        fixed = "#{before}.#{after}"
+
+        # now escape . in before/after because they're used in regex
+        before.gsub!('.', '\.')
+        after.gsub!('.', '\.')
+
+        #  <android.app.ActionBar$Tab   => <android.app.ActionBar.Tab
+        # </android.app.ActionBar$Tab> => </android.app.ActionBar.Tab>
+        source = source.gsub(/<#{before}\s*\$\s*#{after}/, "<#{fixed}").
+          gsub(/<\/#{before}\s*\$\s*#{after}>/, "</#{fixed}>")
+      end
+
+      source
+    end
+
+    # Prints xml of the current page
+    # @return [void]
+    def source
+      _print_source get_source
+    end
+
     # Android only.
     # Returns a string containing interesting elements.
     # The text, content description, and id are returned.
@@ -91,10 +126,15 @@ module Appium
     # @return [String]
     def get_android_inspect class_name=false
       source = get_source
-      if source.start_with? '<html>'
+
+      doctype_string = '<!doctyp'
+      source_header  = source[0..doctype_string.length].downcase
+      source_is_html = source_header.start_with?(doctype_string, '<html')
+
+      if source_is_html # parse html from webview
         parser = @android_html_parser ||= Nokogiri::HTML::SAX::Parser.new(Common::HTMLElements.new)
       else
-        parser = @android_webview_parser ||= Nokogiri::XML::SAX::Parser.new(AndroidElements.new)
+        parser = @android_native_parser ||= Nokogiri::XML::SAX::Parser.new(AndroidElements.new)
       end
       parser.document.reset # ensure document is reset before parsing
       parser.document.filter = class_name
@@ -283,5 +323,15 @@ module Appium
     def complex_finds_exact class_name, value
       find_elements :uiautomator, string_visible_exact(class_name, value)
     end
+
+    # Returns XML string for the current page
+    # Fixes uiautomator's $ in node names.
+    # `android.app.ActionBar$Tab` becomes `android.app.ActionBar.Tab`
+    # @return [String]
+    def get_source
+      src = @driver.page_source
+      src = _fix_android_native_source src unless src && src.start_with?('<html>')
+      src
+    end
   end # module Android
 end # module Appium