appium_lib 9.4.3 → 9.4.4

data/docs/travis.sample.yml

@@ -0,0 +1,24 @@
+language: objective-c
+sudo: false
+osx_image: xcode8.3
+
+cache: bundler
+
+rvm:
+  - 2.4
+
+install:
+  - bundle install
+  - npm install -g appium@1.6.4
+
+before_script:
+  - appium --log-level warn &
+
+script:
+  - bundle exec rake rubocop
+  - cd ios_tests; rake ios
+
+notifications:
+  email:
+    on_success: never
+    on_failure: never

data/docs_gen/make_docs.rb

@@ -34,7 +34,7 @@ def mobj_to_md obj
 
   indent = space 5
   params = obj.tags.select { |tag| tag.tag_name == 'param' }
-  if !params.empty?
+  unless params.empty?
     out += "__Parameters:__\n\n"
     params.each do |param|
       param_types = param.types ? "[#{param.types.join ', '}] " : ''
@@ -44,7 +44,7 @@ def mobj_to_md obj
   end
 
   ret = obj.tag 'return'
-  if ret
+  if ret&.types
     out += "__Returns:__\n\n"
     out += indent + "[#{ret.types.join ', '}] #{ret.text}\n\n"
   end

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

@@ -8,6 +8,20 @@ describe 'ios/xcuitest_gestures' do
     screen.must_equal catalog
   end
 
+  def open_alert_ok_cancel
+    wait_true do
+      find_element(:name, 'Show OK-Cancel').click
+      find_element(:name, 'UIActionSheet <title>').displayed?
+    end
+  end
+
+  def open_alert_custom
+    wait_true do
+      find_element(:name, 'Show Customized').click
+      find_element(:name, 'UIActionSheet <title>').displayed?
+    end
+  end
+
   t 'before_first' do
     before_first
   end
@@ -58,8 +72,31 @@ describe 'ios/xcuitest_gestures' do
     find_element(:name, 'Serena Auroux').displayed?.must_equal true
   end
 
-  t 'after_last' do
+  t 'back to top' do
+    back_click
+  end
+
+  t 'alert' do
+    wait_true do
+      UI::Inventory.xcuitest? ? find_element(:name, 'Alerts').click : text('alerts').click
+      tag(UI::Inventory.navbar).name == 'Alerts' # wait for true
+    end
+
+    open_alert_ok_cancel
+    alert action: 'accept'
+
+    open_alert_ok_cancel
+    alert action: 'dismiss'
+
+    open_alert_custom
+    alert action: 'accept', button_label: 'Button1'
+  end
+
+  t 'back to top' do
     back_click
+  end
+
+  t 'after_last' do
     after_last
   end
 end

data/lib/appium_lib/android/helper.rb

@@ -3,7 +3,7 @@ module Appium
     # @private
     # http://nokogiri.org/Nokogiri/XML/SAX.html
     class AndroidElements < Nokogiri::XML::SAX::Document
-      attr_reader :result, :keys, :instance, :filter
+      attr_reader :result, :keys, :filter
 
       # convert to string to support symbols
       def filter=(value)
@@ -15,22 +15,17 @@ module Appium
       def initialize
         reset
         @filter   = false
-        @instance = Hash.new(-1)
       end
 
       def reset
         @result   = ''
         @keys     = %w(text resource-id content-desc)
-        @instance = Hash.new(-1)
       end
 
       # http://nokogiri.org/Nokogiri/XML/SAX/Document.html
       def start_element(name, attrs = [])
         return if filter && !name.downcase.include?(filter)
 
-        # instance numbers start at 0.
-        number = instance[name] += 1
-
         attributes = {}
 
         attrs.each do |key, value|
@@ -78,39 +73,10 @@ module Appium
         string += "  id: #{id}\n" unless id.nil?
         string += "  strings.xml: #{string_ids}" unless string_ids.nil?
 
-        @result += "\n#{name} (#{number})\n#{string}" unless attributes.empty?
+        @result += "\n#{name}\n#{string}" unless attributes.empty?
       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
@@ -400,14 +366,10 @@ module Appium
       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`
+    # Returns XML string for the current page via `page_source`
     # @return [String]
     def get_source
-      src = @driver.page_source
-      src = _fix_android_native_source src unless src && src.start_with?('<html>')
-      src
+      @driver.page_source
     end
   end # module Android
 end # module Appium

data/lib/appium_lib/common/version.rb

@@ -1,5 +1,5 @@
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '9.4.3'.freeze unless defined? ::Appium::VERSION
-  DATE    = '2017-05-03'.freeze unless defined? ::Appium::DATE
+  VERSION = '9.4.4'.freeze unless defined? ::Appium::VERSION
+  DATE    = '2017-05-13'.freeze unless defined? ::Appium::DATE
 end

data/lib/appium_lib/device/device.rb

@@ -64,10 +64,14 @@ module Appium
     # @!method hide_keyboard
     #   Hide the onscreen keyboard
     #   @param [String] close_key The name of the key which closes the keyboard.
-    #     Defaults to 'Done'.
+    #     Defaults to 'Done' for iOS(except for XCUITest).
+    #   @param [Symbol] strategy The symbol of the strategy which closes the keyboard.
+    #     XCUITest ignore this argument.
+    #     Default for iOS is `:pressKey`. Default for Android is `:tapOutside`.
     #  ```ruby
     #  hide_keyboard # Close a keyboard with the 'Done' button
     #  hide_keyboard('Finished') # Close a keyboard with the 'Finished' button
+    #  hide_keyboard(nil, :tapOutside) # Close a keyboard with tapping out side of keyboard
     #  ```
 
     # @!method press_keycode
@@ -273,20 +277,20 @@ module Appium
         end
 
         add_endpoint_method(:hide_keyboard) do
-          def hide_keyboard(close_key = nil)
-            # Android can only tapOutside.
-            if $driver.device_is_android?
-              return execute :hide_keyboard, {}, strategy: :tapOutside
-            end
-
-            close_key ||= 'Done' # default to Done key.
-            if $driver.automation_name_is_xcuitest?
-              # strategy is not implemented in the following
-              # https://github.com/appium/appium-xcuitest-driver/blob/v2.2.0/lib/commands/general.js#L51
-              execute :hide_keyboard, {}, strategy: :grouped, key: close_key
+          def hide_keyboard(close_key = nil, strategy = nil)
+            option = {}
+
+            if $driver.device_is_android? # Android can only tapOutside.
+              option[:key] = close_key if close_key
+              option[:strategy] = strategy || :tapOutside # default to pressKey
+            elsif $driver.automation_name_is_xcuitest?
+              option[:key] = close_key if close_key
+              option[:strategy] = strategy if strategy
             else
-              $driver.hide_ios_keyboard close_key
+              option[:key] = close_key || 'Done'        # default to Done key.
+              option[:strategy] = strategy || :pressKey # default to pressKey
             end
+            execute :hide_keyboard, {}, option
           end
         end
 

data/lib/appium_lib/driver.rb

@@ -406,11 +406,10 @@ module Appium
       # load common methods
       extend Appium::Common
       extend Appium::Device
+
       if device_is_android?
-        # load Android specific methods
         extend Appium::Android
       else
-        # load iOS specific methods
         extend Appium::Ios
         extend Appium::Ios::XcuitestGesture if automation_name_is_xcuitest? # Override touch actions
       end

data/lib/appium_lib/ios/helper.rb

@@ -527,62 +527,6 @@ module Appium
       eles_by_json string_visible_exact element, value
     end
 
-    # @private
-    # For Appium(automation name), not XCUITest
-    # If there's no keyboard, then do nothing.
-    # If there's no close key, fallback to window tap.
-    # If close key is present then tap it.
-    # @param close_key [String] close key to tap. Default value is 'Done'
-    # @return [void]
-    def hide_ios_keyboard(close_key = 'Done')
-      #
-      # TODO: there are many various ways to hide the keyboard that work in different
-      # app specific circumstances. webview keyboard will require a window.tap for example.
-      #
-      # Find the top left corner of the keyboard and move up 10 pixels (origin.y - 10)
-      # now swipe down until the end of the window - 10 pixels.
-      # -10 to ensure we're not going outside the window bounds.
-      #
-      # Swiping inside the keyboard will not dismiss it.
-      #
-      # If the 'Done' key exists then that should be pressed to dismiss the keyboard
-      # because swiping to dismiss works only if such key doesn't exist.
-      #
-      # Don't use window.tap. See https://github.com/appium/appium-uiauto/issues/28
-      #
-      dismiss_keyboard = <<-JS.strip
-      if (!au.mainApp().keyboard().isNil()) {
-        var key = au.mainApp().keyboard().buttons()['#{close_key}']
-        if (key.isNil()) {
-          var startY = au.mainApp().keyboard().rect().origin.y - 10;
-          var endY = au.mainWindow().rect().size.height - 10;
-          au.flickApp(0, startY, 0, endY);
-        } else {
-          key.tap();
-        }
-        au.delay(1000);
-      }
-      JS
-
-      ignore do
-        # wait 5 seconds for a wild keyboard to appear. if the textfield is disabled
-        # then setValue will work, however the keyboard will never display
-        # because users are normally not allowed to type into it.
-        wait_true(5) do
-          execute_script '!au.mainApp().keyboard().isNil()'
-        end
-
-        # dismiss keyboard
-        execute_script dismiss_keyboard
-      end
-
-      # wait 5 seconds for keyboard to go away.
-      # if the keyboard isn't dismissed then wait_true will error.
-      wait_true(5) do
-        execute_script 'au.mainApp().keyboard().isNil()'
-      end
-    end
-
     #
     # predicate - the predicate to evaluate on the main app
     #

data/lib/appium_lib/ios/xcuitest_gestures.rb

@@ -142,6 +142,23 @@ module Appium
         args[:offset] = offset if offset
         execute_script 'mobile: selectPickerWheelValue', args
       end
+
+      # @param action [String] The following actions are supported: accept, dismiss and getButtons. Mandatory parameter
+      # @param button_label [String] The label text of an existing alert button to click on.
+      #   This is an optional parameter and is only valid in combination with accept and dismiss actions.
+      # @return nil or Selenium::WebDriver::Error::NoSuchAlertError if no action sheet or alert
+      #
+      #   ```ruby
+      #   alert action: "accept"
+      #   alert action: "dismiss"
+      #   ```
+      def alert(action:, button_label: nil)
+        return 'Set "accept", "dismiss" or "getButtons" for :action' unless %w(accept dismiss getButtons).include?(action)
+
+        args = { action: action }
+        args[:button_label] if button_label
+        execute_script 'mobile: alert', args
+      end
     end # module XcuitestGesture
   end # module Ios
 end # module Appium

data/release_notes.md

@@ -1,3 +1,15 @@
+#### v9.4.3 2017-05-03
+
+- [c413bd7](https://github.com/appium/ruby_lib/commit/c413bd77d0fec58e1c2cce6821694bcf659b9e1b) [Release 9 4 3 (#566)](https://github.com/appium/ruby_lib/issues/566)
+- [8e600af](https://github.com/appium/ruby_lib/commit/8e600af469f0e00f1fb6cce331c72b13d11598c8) [fix tests for uiautomator2 (#565)](https://github.com/appium/ruby_lib/issues/565)
+- [ab8ecf8](https://github.com/appium/ruby_lib/commit/ab8ecf860088f690777e7c8086c31753463577c8) [Update android_uiautomator.md (#564)](https://github.com/appium/ruby_lib/issues/564)
+- [4f035d3](https://github.com/appium/ruby_lib/commit/4f035d39a0b3a3c39a9ef6a5cd0d2cb19d39f7d4) [Use uiautomator for uiautomator2 (#561)](https://github.com/appium/ruby_lib/issues/561)
+- [71d8eb6](https://github.com/appium/ruby_lib/commit/71d8eb676bf5ac6d83c5da112d068865d76ebab4) [Add link to issue in generating release notes (#562)](https://github.com/appium/ruby_lib/issues/562)
+- [915e75d](https://github.com/appium/ruby_lib/commit/915e75d08e89b4248ca104124f7430463c13ab22) [don't use selenium-webdriver 3.5+ (#559)](https://github.com/appium/ruby_lib/issues/559)
+- [7e9c8ef](https://github.com/appium/ruby_lib/commit/7e9c8ef7fbed4e076fa6aec49f20d786fa6cbdf6) [update workaround (#557)](https://github.com/appium/ruby_lib/issues/557)
+- [801a5a0](https://github.com/appium/ruby_lib/commit/801a5a07e5c1c062f5d108a844721c7a569765a3) [add workaround (#556)](https://github.com/appium/ruby_lib/issues/556)
+
+
 #### v9.4.2 2017-04-21
 
 - [0cd41ef](https://github.com/appium/ruby_lib/commit/0cd41ef58b6abf8444fcb95db59aebb2c6c2a890) [Release 9 4 2 (#554)](https://github.com/appium/ruby_lib/issues/554)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 9.4.3
+  version: 9.4.4
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -261,6 +261,7 @@ files:
 - docs/ios_docs.md
 - docs/ios_xcuitest.md
 - docs/migration.md
+- docs/travis.sample.yml
 - docs_gen/docs_from_js.md
 - docs_gen/make_docs.rb
 - ios_tests/Gemfile