appium_lib 9.1.3 → 9.2.0

data/docs/ios_xcuitest.md

@@ -8,6 +8,7 @@
 ## find elements
 - supported elements by find_element are:
     - [appium-xcuitest-driver](https://github.com/appium/appium-xcuitest-driver/blob/master/lib/commands/find.js#L17)
+        - [locatorStrategies](https://github.com/appium/appium-xcuitest-driver/blob/95886f1118d71fe950768f8262179d3608b40fc7/lib/driver.js#L81)
     - [WebDriverAgent](https://github.com/facebook/WebDriverAgent/blob/8346199212bffceab24192e81bc0118d65132466/WebDriverAgentLib/Commands/FBFindElementCommands.m#L111)
 - Mapping
     - https://github.com/facebook/WebDriverAgent/blob/master/WebDriverAgentLib/Utilities/FBElementTypeTransformer.m#L19

data/ios_tests/appium.txt

@@ -8,3 +8,4 @@ app = "./UICatalog.app"
 [appium_lib]
 sauce_username = ""
 sauce_access_key = ""
+wait = 30

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

@@ -32,21 +32,19 @@ describe 'driver' do
 
   describe 'Appium::Driver attributes' do
     t 'verify all attributes' do
-      2.times { set_wait 30 } # must set twice to validate last_waits
       actual                = driver_attributes
       caps_app_for_teardown = actual[:caps][:app]
-      actual[:caps][:app]   = File.basename actual[:caps][:app]
-
+      expected_app = File.absolute_path('UICatalog.app')
       expected_caps       = ::Appium::Driver::Capabilities.init_caps_for_appium(platformName:    'ios',
                                                                                 platformVersion: '10.1',
                                                                                 automationName:  'XCUITest',
                                                                                 deviceName:      'iPhone Simulator',
-                                                                                app:             'UICatalog.app')
+                                                                                app:             expected_app)
       expected            = { caps:             expected_caps,
+                              automation_name:  'XCUITest',
                               custom_url:       false,
                               export_session:   false,
                               default_wait:     30,
-                              last_waits:       [30, 30],
                               sauce_username:   nil,
                               sauce_access_key: nil,
                               port:             4723,
@@ -90,14 +88,12 @@ describe 'driver' do
 
     t 'no_wait' do
       no_wait
-      default_wait.must_equal 0
-      set_wait 30
+      proc { find_element(:accessibility_id, 'zz') }.must_raise Selenium::WebDriver::Error::NoSuchElementError
+      set_wait
     end
 
     t 'default_wait attr' do
-      set_wait 31 # set wait and no_wait update default_wait
-      default_wait.must_equal 31
-      set_wait 30
+      default_wait.must_equal 30
     end
 
     t 'app_path attr' do
@@ -219,11 +215,11 @@ describe 'driver' do
       set_wait(2).must_equal(2)
       set_wait.must_equal(30)
       set_wait(3).must_equal(3)
-      set_wait.must_equal(2)
+      set_wait.must_equal(30)
 
       set_wait(2).must_equal(2)
       set_wait(3).must_equal(3)
-      set_wait.must_equal(2)
+      set_wait.must_equal(30)
     end
 
     t 'default_wait' do

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.1.3'.freeze unless defined? ::Appium::VERSION
-  DATE    = '2017-01-04'.freeze unless defined? ::Appium::DATE
+  VERSION = '9.2.0'.freeze unless defined? ::Appium::VERSION
+  DATE    = '2017-01-09'.freeze unless defined? ::Appium::DATE
 end

data/lib/appium_lib/device/multi_touch.rb

@@ -8,7 +8,7 @@ module Appium
   #
   # ```ruby
   # action_1 = TouchAction.new.press(x: 45, y: 100).wait(5).release
-  # action_2 = TouchAction.new.tap(element: el, x: 50, y:5, count: 3).release
+  # action_2 = TouchAction.new.tap(element: el, x: 50, y:5, count: 3)
   #
   # multi_touch_action = MultiTouch.new
   # multi_touch_action.add action_1

data/lib/appium_lib/device/touch_actions.rb

@@ -75,7 +75,8 @@ module Appium
       chain_method(:release, args)
     end
 
-    # Touch a point on the screen
+    # Touch a point on the screen.
+    # Alternatively, you can use `press(...).release.perform` instead of `tap(...).perform`.
     #
     # @option opts [WebDriver::Element] :element (Optional) Element to restrict scope too.
     # @option opts [integer] :x x co-ordinate to tap

data/lib/appium_lib/driver.rb

@@ -280,9 +280,7 @@ module Appium
     # Returns the default client side wait.
     # This value is independent of what the server is using
     # @return [Integer]
-    attr_accessor :default_wait
-    # Array of previous wait time values
-    attr_accessor :last_waits
+    attr_reader :default_wait
     # Username for use on Sauce Labs
     attr_accessor :sauce_username
     # Access Key for use on Sauce Labs
@@ -291,7 +289,8 @@ module Appium
     attr_accessor :appium_port
     # Device type to request from the appium server
     attr_accessor :appium_device
-    # Automation name sent to appium server
+    # Automation name sent to appium server or received from server
+    # If automation_name is nil, it is not set both client side and server side.
     attr_reader :automation_name
     # Appium's server version
     attr_reader :appium_server_version
@@ -340,7 +339,6 @@ module Appium
       @custom_url       = appium_lib_opts.fetch :server_url, false
       @export_session   = appium_lib_opts.fetch :export_session, false
       @default_wait     = appium_lib_opts.fetch :wait, 0
-      @last_waits       = [@default_wait]
       @sauce_username   = appium_lib_opts.fetch :sauce_username, ENV['SAUCE_USERNAME']
       @sauce_username   = nil if !@sauce_username || (@sauce_username.is_a?(String) && @sauce_username.empty?)
       @sauce_access_key = appium_lib_opts.fetch :sauce_access_key, ENV['SAUCE_ACCESS_KEY']
@@ -401,10 +399,10 @@ module Appium
     def driver_attributes
       attributes = {
           caps:             @caps,
+          automation_name:  @automation_name,
           custom_url:       @custom_url,
           export_session:   @export_session,
           default_wait:     @default_wait,
-          last_waits:       @last_waits,
           sauce_username:   @sauce_username,
           sauce_access_key: @sauce_access_key,
           port:             @appium_port,
@@ -550,6 +548,7 @@ module Appium
     #
     # @return [Selenium::WebDriver] the new global driver
     def start_driver
+      # open_timeout and read_timeout are explicit wait.
       @http_client ||= Selenium::WebDriver::Remote::Http::Default.new(open_timeout: 999_999, read_timeout: 999_999)
 
       begin
@@ -578,44 +577,30 @@ module Appium
       @appium_server_version = appium_server_version
 
       check_server_version_xcuitest
+      set_automation_name_if_nil
 
       @driver.manage.timeouts.implicit_wait = @default_wait
 
       @driver
     end
 
-    # Set implicit wait and default_wait to zero.
+    # Set implicit wait to zero.
     def no_wait
-      @last_waits                           = [@default_wait, 0]
-      @default_wait                         = 0
       @driver.manage.timeouts.implicit_wait = 0
     end
 
-    # Set implicit wait and default_wait to timeout, defaults to 30.
-    # if set_wait is called without a param then the second to last
-    # wait will be used.
+    # Set implicit wait. Default to @default_wait.
     #
     # ```ruby`
     # set_wait 2
-    # set_wait 3
-    # set_wait # 2
+    # set_wait # @default_wait
     #
     # ````
     #
     # @param timeout [Integer] the timeout in seconds
     # @return [void]
     def set_wait(timeout = nil)
-      if timeout.nil?
-        # Appium::Logger.info "timeout = @default_wait = @last_wait"
-        # Appium::Logger.info "timeout = @default_wait = #{@last_waits}"
-        timeout = @default_wait = @last_waits.first
-      else
-        @default_wait = timeout
-        # Appium::Logger.info "last waits before: #{@last_waits}"
-        @last_waits   = [@last_waits.last, @default_wait]
-        # Appium::Logger.info "last waits after: #{@last_waits}"
-      end
-
+      timeout = @default_wait if timeout.nil?
       @driver.manage.timeouts.implicit_wait = timeout
     end
 
@@ -698,6 +683,15 @@ module Appium
       driver_quit
       exit # exit pry
     end
+
+    private
+
+    # If "automationName" is set only server side, this method set "automationName" attribute into @automation_name.
+    # Since @automation_name is set only client side before start_driver is called.
+    def set_automation_name_if_nil
+      return unless @automation_name.nil?
+      @automation_name = @driver.capabilities['automationName']
+    end
   end # class Driver
 end # module Appium
 

data/lib/appium_lib/ios/mobile_methods.rb

@@ -7,6 +7,15 @@ module Appium
       #   ```ruby
       #    find_elements :uiautomation, 'elements()
       #   ```
+      #
+      # @!method ios_predicate_string_find
+      #   find_element/s can be used with a [Predicates](https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/Predicates/AdditionalChapters/Introduction.html)
+      #
+      #   ```ruby
+      #    find_elements :predicate, "isWDVisible == 1"
+      #    find_elements :predicate, 'wdName == "Buttons"'
+      #    find_elements :predicate, 'wdValue == "SearchBar" AND isWDDivisible == 1'
+      #   ```
       def extended(_mod)
         ::Appium::Driver::SearchContext::FINDERS[:uiautomation] = '-ios uiautomation'
         ::Appium::Driver::SearchContext::FINDERS[:predicate] = '-ios predicate string'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 9.1.3
+  version: 9.2.0
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -206,6 +206,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE-2.0.txt
 - Rakefile