appium_lib 8.0.2 → 8.1.0

data/ios_tests/appium.txt

@@ -1,6 +1,6 @@
 [caps]
 platformName = "ios"
-platformVersion = "9.2"
+platformVersion = "9.3"
 deviceName ="iPhone Simulator"
 app = "./UICatalog.app"
 

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

@@ -75,7 +75,7 @@ describe 'device/device' do
   end
 
   t 'swipe' do
-    swipe start_x: 75, start_y: 500, end_x: 75, end_y: 0, duration: 800
+    swipe start_x: 75, start_y: 500, delta_x: 75, delta_y: 0, duration: 800
   end
 
   t 'pinch & zoom' do

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

@@ -1,5 +1,19 @@
 describe 'device/touch_actions' do
-  t {} # place holder test
+  t 'swipe_default_duration' do
+    wait_true do
+      text('pickers').click
+      screen == 'Pickers'
+    end
+
+    ele_index('UIAStaticText', 2).text.must_equal 'John Appleseed - 0'
+    picker = ele_index('UIAPicker', 1)
+    loc = picker.location.to_h
+    size = picker.size.to_h
+    start_x = loc[:x] + size[:width] / 2
+    start_y = loc[:y] + size[:height] / 2
+    swipe start_x: start_x, start_y: start_y, delta_x: start_x, delta_y: - 50
+    ele_index('UIAStaticText', 2).text.must_equal 'Chris Armstrong - 0'
+  end
 end
 
 # TODO: write tests

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

@@ -36,7 +36,7 @@ describe 'driver' do
       actual              = driver_attributes
       actual[:caps][:app] = File.basename actual[:caps][:app]
       expected            = { caps:             { platformName: 'ios',
-                                                  platformVersion: '8.3',
+                                                  platformVersion: '9.3',
                                                   deviceName:   'iPhone Simulator',
                                                   app:          'UICatalog.app' },
                               custom_url:       false,
@@ -47,7 +47,8 @@ describe 'driver' do
                               sauce_access_key: nil,
                               port:             4723,
                               device:           :ios,
-                              debug:            true }
+                              debug:            true,
+                              listener:         nil }
 
       if actual != expected
         diff    = HashDiff.diff expected, actual

data/ios_tests/readme.md

@@ -12,7 +12,7 @@ ruby_lib's iOS tests. Requires `Ruby 1.9.3` or better.
 
 `UICatalog6.1` is from [appium/appium](https://github.com/appium/appium/blob/master/assets/UICatalog6.1.app.zip)
 
-The tests are now run against `iPhone 6 Simulator 8.3 (12F69)`
+The tests are now run against `iPhone 6 Simulator 9.3 (12F69)`
 
 #### Documentation
 

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 = '8.0.2' unless defined? ::Appium::VERSION
-  DATE    = '2016-01-29' unless defined? ::Appium::DATE
+  VERSION = '8.1.0' unless defined? ::Appium::VERSION
+  DATE    = '2016-11-18' unless defined? ::Appium::DATE
 end

data/lib/appium_lib/device/device.rb

@@ -93,6 +93,15 @@ module Appium
     #   pull_folder '/data/local/tmp' #=> Get the folder at that path
     #   ```
 
+    # @!method touch_id
+    #   iOS only;  Simulate Touch ID with either valid (match == true) or invalid (match == false) fingerprint.
+    #   @param match (Boolean) fingerprint validity
+    #     Defaults to true.
+    #   ```ruby
+    #   touch_id true #=> Simulate valid fingerprint
+    #   touch_id false #=> Simulate invalid fingerprint
+    #   ```
+
     # @!method end_coverage
     #   Android only;  Ends the test coverage and writes the results to the given path on device.
     #   @param path (String) Path on the device to write too.
@@ -252,6 +261,13 @@ module Appium
           end
         end
 
+        # TODO: TEST ME
+        add_endpoint_method(:touch_id, 'session/:session_id/appium/simulator/touch_id') do
+          def touch_id(match = true)
+            execute :touch_id, {}, match: match
+          end
+        end
+
         # TODO: TEST ME
         add_endpoint_method(:end_coverage, 'session/:session_id/appium/app/end_test_coverage') do
           def end_coverage(path, intent)
@@ -343,7 +359,9 @@ module Appium
         end
       end
 
-      # @!method accessiblity_id_find
+      # @!method find_element
+      # @!method find_elements
+      #
       #   find_element/s with their accessibility_id
       #
       #   ```ruby

data/lib/appium_lib/device/multi_touch.rb

@@ -32,10 +32,10 @@ module Appium
         i = 1 - p
 
         top = TouchAction.new
-        top.swipe start_x: 1.0, start_y: 0.0, end_x: i, end_y: i, duration: 1
+        top.swipe start_x: 1.0, start_y: 0.0, delta_x: i, delta_y: i, duration: 1
 
         bottom = TouchAction.new
-        bottom.swipe(start_x: 0.0, start_y: 1.0, end_x: p, end_y: p, duration: 1)
+        bottom.swipe(start_x: 0.0, start_y: 1.0, delta_x: p, delta_y: p, duration: 1)
 
         pinch = MultiTouch.new
         pinch.add top
@@ -60,10 +60,10 @@ module Appium
         i = 1 - p
 
         top = TouchAction.new
-        top.swipe start_x: i, start_y: i, end_x: 1, end_y: 1, duration: 1
+        top.swipe start_x: i, start_y: i, delta_x: 1, delta_y: 1, duration: 1
 
         bottom = TouchAction.new
-        bottom.swipe start_x: p, start_y: p, end_x: 1, end_y: 1, duration: 1
+        bottom.swipe start_x: p, start_y: p, delta_x: 1, delta_y: 1, duration: 1
 
         zoom = MultiTouch.new
         zoom.add top

data/lib/appium_lib/device/touch_actions.rb

@@ -8,7 +8,7 @@ module Appium
   # action = TouchAction.new.press(x: 45, y: 100).wait(5).release
   # action.perform
   class TouchAction
-    ACTIONS         = [:move_to, :long_press, :press, :release, :tap, :wait, :perform]
+    ACTIONS         = [:move_to, :long_press, :double_tap, :two_finger_tap, :press, :release, :tap, :wait, :perform]
     COMPLEX_ACTIONS = [:swipe]
 
     class << self
@@ -84,6 +84,29 @@ module Appium
       chain_method(:tap, args)
     end
 
+    # Double tap an element on the screen
+    #
+    # @option opts [WebDriver::Element] :element (Optional) Element to restrict scope too.
+    # @option opts [integer] :x x co-ordinate to tap
+    # @option opts [integer] :y y co-ordinate to tap
+
+    def double_tap(opts)
+      args = opts.select { |k, _v| [:element, :x, :y].include? k }
+      args = args_with_ele_ref(args)
+      chain_method(:doubleTap, args) # doubleTap is what the appium server expects
+    end
+
+    # Two finger tap an element on the screen
+    #
+    # @option opts [WebDriver::Element] :element (Optional) Element to restrict scope too.
+    # @option opts [integer] :x x co-ordinate to tap
+    # @option opts [integer] :y y co-ordinate to tap
+    def two_finger_tap(opts)
+      args = opts.select { |k, _v| [:element, :x, :y].include? k }
+      args = args_with_ele_ref(args)
+      chain_method(:twoFingerTap, args) # twoFingerTap is what the appium server expects
+    end
+
     # Pause for a number of milliseconds before the next action
     # @param milliseconds [integer] Number of milliseconds to pause for
     def wait(milliseconds)
@@ -97,19 +120,33 @@ module Appium
     #
     # @option opts [int] :start_x Where to start swiping, on the x axis.  Default 0.
     # @option opts [int] :start_y Where to start swiping, on the y axis.  Default 0.
-    # @option opts [int] :end_x Where to end swiping, on the x axis.  Default 0.
-    # @option opts [int] :end_y Where to end swiping, on the y axis.  Default 0.
-    # @option opts [int] :duration How long the actual swipe takes to complete in milliseconds.
+    # @option opts [int] :delta_x The distance from start to move, on the x axis.  Default 0.
+    # @option opts [int] :delta_y The distance from start to move, on the y axis.  Default 0.
+    # @option opts [int] :duration How long the actual swipe takes to complete in milliseconds. Default 200.
+    # @deprecated Please do not use end_x, end_y anymore
     def swipe(opts)
       start_x  = opts.fetch :start_x, 0
       start_y  = opts.fetch :start_y, 0
-      end_x    = opts.fetch :end_x, 0
-      end_y    = opts.fetch :end_y, 0
-      duration = opts[:duration]
+      delta_x  = opts.fetch :delta_x, nil
+      delta_y  = opts.fetch :delta_y, nil
+      end_x    = opts.fetch :end_x, nil
+      end_y    = opts.fetch :end_y, nil
+
+      if end_x || end_y
+        warn '[DEPRECATION] `end_x` and `end_y` are deprecated. Please use `delta_x` and `delta_y` instead.'
+      end
+
+      delta_x ||= end_x
+      delta_y ||= end_y
+
+      delta_x ||= 0
+      delta_y ||= 0
+
+      duration = opts.fetch :duration, 200
 
       press x: start_x, y: start_y
       wait(duration) if duration
-      move_to x: end_x, y: end_y
+      move_to x: delta_x, y: delta_y
       release
       self
     end

data/lib/appium_lib/driver.rb

@@ -263,6 +263,8 @@ module Appium
     attr_accessor :appium_device
     # Boolean debug mode for the Appium Ruby bindings
     attr_accessor :appium_debug
+    # instance of AbstractEventListener for logging support
+    attr_accessor :listener
 
     # Returns the driver
     # @return [Driver] the driver
@@ -309,6 +311,10 @@ module Appium
       @sauce_access_key = nil if !@sauce_access_key || (@sauce_access_key.is_a?(String) && @sauce_access_key.empty?)
       @appium_port      = appium_lib_opts.fetch :port, 4723
 
+      # to pass it in Selenium.new.
+      # `listener = opts.delete(:listener)` is called in Selenium::Driver.new
+      @listener = appium_lib_opts.fetch :listener, nil
+
       # Path to the .apk, .app or .app.zip.
       # The path can be local or remote for Sauce.
       if @caps && @caps[:app] && ! @caps[:app].empty?
@@ -361,7 +367,8 @@ module Appium
                      sauce_access_key: @sauce_access_key,
                      port:             @appium_port,
                      device:           @appium_device,
-                     debug:            @appium_debug
+                     debug:            @appium_debug,
+                     listener:         @listener
       }
 
       # Return duplicates so attributes are immutable
@@ -435,7 +442,7 @@ module Appium
     def server_url
       return @custom_url if @custom_url
       if !@sauce_username.nil? && !@sauce_access_key.nil?
-        "http://#{@sauce_username}:#{@sauce_access_key}@ondemand.saucelabs.com:80/wd/hub"
+        "https://#{@sauce_username}:#{@sauce_access_key}@ondemand.saucelabs.com:443/wd/hub"
       else
         "http://127.0.0.1:#{@appium_port}/wd/hub"
       end
@@ -476,7 +483,12 @@ module Appium
 
       begin
         driver_quit
-        @driver = Selenium::WebDriver.for :remote, http_client: @client, desired_capabilities: @caps, url: server_url
+        @driver =  Selenium::WebDriver.for(:remote,
+                                           http_client: @client,
+                                           desired_capabilities: @caps,
+                                           url: server_url,
+                                           listener: @listener)
+
         # Load touch methods.
         @driver.extend Selenium::WebDriver::DriverExtensions::HasTouchScreen
         @driver.extend Selenium::WebDriver::DriverExtensions::HasLocation
@@ -489,7 +501,7 @@ module Appium
           end rescue nil
         end
       rescue Errno::ECONNREFUSED
-        raise 'ERROR: Unable to connect to Appium. Is the server running?'
+        raise "ERROR: Unable to connect to Appium. Is the server running on #{server_url}?"
       end
 
       @driver.manage.timeouts.implicit_wait = @default_wait

data/release_notes.md

@@ -1,3 +1,21 @@
+#### v8.1.0 2016-11-18
+
+- [0b476e7](https://github.com/appium/ruby_lib/commit/0b476e7c78f8cb829a909de55a402c6585ac5159) Release 8.1.0
+- [6c38ca5](https://github.com/appium/ruby_lib/commit/6c38ca5276342ade6168eb9080424a03608a1b3e) replace end_ to delta_ because end_ is deprecated in #380 (#392)
+- [09654ab](https://github.com/appium/ruby_lib/commit/09654ab9dbc69a31eff7e7bd426db985da09e3b8) Add EventListener to Driver (#389)
+- [2d8fc5f](https://github.com/appium/ruby_lib/commit/2d8fc5ff7acce9417847e66772b59fc691c1dbaa) Added touch id endpoint (#384)
+- [11b80e3](https://github.com/appium/ruby_lib/commit/11b80e398e98fbc71e580f659764ba54f87da4f3) Added double_tap and two_finger_tap to Appium::TouchAction (#377)
+- [2a9f79c](https://github.com/appium/ruby_lib/commit/2a9f79caae337e8770aa56c47d0bd9c17cf1569f) swipe proffers use of delta_x, delta_y instead of end_x, end_y which … (#380)
+- [6705226](https://github.com/appium/ruby_lib/commit/67052266b601270d2432c18b47739c9681af5563) Use secure sauce endpoint (https://ondemand.saucelabs.com:443) (#378)
+- [acdcff0](https://github.com/appium/ruby_lib/commit/acdcff06ae10f1ff4461ed94486346b4514a6e3a) Merge pull request #376 from sergey-plevako-badoo/add_double_tap_and_two_finger_tap
+- [eea3a6f](https://github.com/appium/ruby_lib/commit/eea3a6feaccd317b8a8ac4e2f83cc867613cdd02) Added double_tap and two_finger_tap to Appium::TouchAction
+- [ac03116](https://github.com/appium/ruby_lib/commit/ac03116756a72fbd624fa32ea886123b955d7089) Include url in raised connection error (#374)
+- [924c28b](https://github.com/appium/ruby_lib/commit/924c28bfa675b23b2519565dbcb0ee3531f05cd9) Fix docs of find elements (#372)
+- [8b71cdc](https://github.com/appium/ruby_lib/commit/8b71cdc81be8f50f5f97f0131aee5f3dc67c3eb7) Add default value for duration in swipe (#368)
+- [f58c8aa](https://github.com/appium/ruby_lib/commit/f58c8aa5a9eb349a7224c5c460c5a866444ff5dd) Merge pull request #363 from SrinivasanTarget/master
+- [f8cff26](https://github.com/appium/ruby_lib/commit/f8cff2659992962b6ab5bf49fa075b02d2d110ef) updated webdriver dependency
+
+
 #### v8.0.2 2016-01-29
 
 - [d67cbba](https://github.com/appium/ruby_lib/commit/d67cbbac43f511515f6e6f53197cfae2bb7671e0) Release 8.0.2
@@ -1254,4 +1272,4 @@
 
 - [01f2d15](https://github.com/appium/ruby_lib/commit/01f2d150ae3d8e88970b361a8330c6ccc174097d) Release 0.0.19
 - [10eec2f](https://github.com/appium/ruby_lib/commit/10eec2f197899395978b73de049aed08ceda55cc) AppLib => AppiumLib
-- [c1e3b4f](https://github.com/appium/ruby_lib/commit/c1e3b4f0a08be3a0aef65218220f09f4198683bf) AppLib => AppiumLib
+- [c1e3b4f](https://github.com/appium/ruby_lib/commit/c1e3b4f0a08be3a0aef65218220f09f4198683bf) AppLib => AppiumLib

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 8.1.0
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.49'
+        version: '2.50'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.49'
+        version: '2.50'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,7 @@ files:
 - android_tests/lib/android/specs/common/patch.rb
 - android_tests/lib/android/specs/common/version.rb
 - android_tests/lib/android/specs/common/web_context.rb
+- android_tests/lib/android/specs/device/touch_actions.rb
 - android_tests/lib/android/specs/driver.rb
 - android_tests/lib/android/specs/install.rb
 - android_tests/lib/format.rb
@@ -349,9 +350,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Ruby library for Appium
 test_files: []
-has_rdoc: