appium_lib 9.11.1 → 9.12.0

data/lib/appium_lib/common/multi_touch.rb

@@ -54,9 +54,7 @@ module Appium
         rate = Float(percentage) / 100
         pinch = MultiTouch.new(driver)
 
-        if driver.automation_name_is_xcuitest?
-          top, bottom = pinch_for_xcuitest(rate, pinch.driver)
-        elsif driver.device_is_android?
+        if driver.device_is_android?
           top, bottom = pinch_android(rate, pinch.driver)
         else
           top, bottom = pinch_ios(rate, pinch.driver)
@@ -98,9 +96,7 @@ module Appium
         rate = 100 / Float(percentage)
         zoom = MultiTouch.new(driver)
 
-        if driver.automation_name_is_xcuitest?
-          top, bottom = zoom_for_xcuitest(rate, zoom.driver)
-        elsif driver.device_is_android?
+        if driver.device_is_android?
           top, bottom = zoom_android(rate, zoom.driver)
         else
           top, bottom = zoom_ios(rate, zoom.driver)
@@ -121,28 +117,11 @@ module Appium
 
         top = ::Appium::Core::TouchAction.new(driver)
         top.swipe start_x: offset, start_y: 1.0 * height + offset,
-                  offset_x: 0.0, offset_y: (rate - 1) * height, duration: 1_000
+                  end_x: 0.0, end_y: (rate - 1) * height, duration: 1_000
 
         bottom = ::Appium::Core::TouchAction.new(driver)
         bottom.swipe start_x: offset, start_y: 0.0 + offset,
-                     offset_x: 0.0, offset_y: (1 - rate) * height, duration: 1_000
-
-        [top, bottom]
-      end
-
-      # @private
-      def pinch_for_xcuitest(rate, driver)
-        height = 100
-        offset = 100
-
-        ele = driver.find_element :class, 'XCUIElementTypeApplication'
-        top = ::Appium::Core::TouchAction.new(driver)
-        top.swipe({ start_x: 0.5, start_y: 0.0 + offset,
-                    offset_x: 0.0, offset_y: (1 - rate) * height }, ele)
-
-        bottom = ::Appium::Core::TouchAction.new(driver)
-        bottom.swipe({ start_x: 0.5, start_y: 1.0 + offset,
-                       offset_x: 0.0, offset_y: rate * height }, ele)
+                     end_x: 0.0, end_y: (1 - rate) * height, duration: 1_000
 
         [top, bottom]
       end
@@ -154,11 +133,11 @@ module Appium
 
         top = ::Appium::Core::TouchAction.new(driver)
         top.swipe start_x: 0.5, start_y: 0.0 + offset,
-                  offset_x: 0.0, offset_y: (1 - rate) * height, duration: 1_000
+                  end_x: 0.0, end_y: (1 - rate) * height, duration: 1_000
 
         bottom = ::Appium::Core::TouchAction.new(driver)
         bottom.swipe start_x: 0.5, start_y: 1.0 + offset,
-                     offset_x: 0.0, offset_y: rate * height, duration: 1_000
+                     end_x: 0.0, end_y: rate * height, duration: 1_000
 
         [top, bottom]
       end
@@ -170,28 +149,11 @@ module Appium
 
         top = ::Appium::Core::TouchAction.new(driver)
         top.swipe start_x: offset, start_y: (1.0 - rate) * height + offset,
-                  offset_x: 0.0, offset_y: (rate - 1.0) * height, duration: 1_000
+                  end_x: 0.0, end_y: (rate - 1.0) * height, duration: 1_000
 
         bottom = ::Appium::Core::TouchAction.new(driver)
         bottom.swipe start_x: offset, start_y: rate * height + offset,
-                     offset_x: 0.0, offset_y: (1.0 - rate) * height, duration: 1_000
-
-        [top, bottom]
-      end
-
-      # @private
-      def zoom_for_xcuitest(rate, driver)
-        height = 100
-        offset = 100
-
-        ele = driver.find_element :class, 'XCUIElementTypeApplication'
-        top = ::Appium::Core::TouchAction.new(driver)
-        top.swipe({ start_x: 0.5, start_y: (1 - rate) * height + offset,
-                    offset_x: 0.0, offset_y: - (1 - rate) * height }, ele)
-
-        bottom = ::Appium::Core::TouchAction.new(driver)
-        bottom.swipe({ start_x: 0.5, start_y: rate * height + offset,
-                       offset_x: 0.0, offset_y: (1 - rate) * height }, ele)
+                     end_x: 0.0, end_y: (1.0 - rate) * height, duration: 1_000
 
         [top, bottom]
       end
@@ -203,11 +165,11 @@ module Appium
 
         top = ::Appium::Core::TouchAction.new(driver)
         top.swipe start_x: 0.5, start_y: (1 - rate) * height + offset,
-                  offset_x: 0.0, offset_y: - (1 - rate) * height, duration: 1_000
+                  end_x: 0.0, end_y: - (1 - rate) * height, duration: 1_000
 
         bottom = ::Appium::Core::TouchAction.new(driver)
         bottom.swipe start_x: 0.5, start_y: rate * height + offset,
-                     offset_x: 0.0, offset_y: (1 - rate) * height, duration: 1_000
+                     end_x: 0.0, end_y: (1 - rate) * height, duration: 1_000
 
         [top, bottom]
       end

data/lib/appium_lib/common/touch_actions.rb

@@ -17,7 +17,7 @@ module Appium
   # @example
   #
   #   # called `swipe(...).perform` in this method.
-  #   swipe(start_x: 75, start_y: 500, offset_x: 75, offset_y: 20, duration: 500)
+  #   swipe(start_x: 75, start_y: 500, end_x: 75, end_y: 20, duration: 500)
   #
   # If you'd like to perform the chain with an arbitrary driver:
   #
@@ -48,25 +48,23 @@ module Appium
       super driver
     end
 
-    def swipe(opts, ele = nil)
+    def swipe(opts)
       start_x  = opts.fetch :start_x, 0
       start_y  = opts.fetch :start_y, 0
-      offset_x = opts.fetch :offset_x, nil
-      offset_y = opts.fetch :offset_y, nil
-      end_x    = opts.fetch :end_x, nil
-      end_y    = opts.fetch :end_y, nil
+      end_x    = opts.fetch :end_x, 0
+      end_y    = opts.fetch :end_y, 0
       duration = opts.fetch :duration, 200
 
-      if end_x || end_y
-        warn '[DEPRECATION] end_x and end_y will be removed. Please use offset_x and offset_y for all platform.'
-        end_x ||= 0
-        end_y ||= 0
-
-        offset_x = end_x - start_x
-        offset_y = end_y - start_y
+      if opts[:offset_x]
+        ::Appium::Logger.warn('[DEPRECATED] :offset_x was renamed to :end_x to indicate as an absolute point.')
+        end_x = opts.fetch :offset_x, 0
+      end
+      if opts[:offset_y]
+        ::Appium::Logger.warn('[DEPRECATED] :offset_y was renamed to :end_y to indicate as an absolute point.')
+        end_y = opts.fetch :offset_y, 0
       end
 
-      super(start_x: start_x, start_y: start_y, offset_x: offset_x, offset_y: offset_y, duration: duration, ele: ele)
+      super(start_x: start_x, start_y: start_y, end_x: end_x, end_y: end_y, duration: duration)
     end
   end # class TouchAction
 end # module Appium

data/lib/appium_lib/version.rb

@@ -1,5 +1,5 @@
 module Appium
   # Version and Date are defined on the 'Appium' module, not 'Appium::Common'
-  VERSION = '9.11.1'.freeze unless defined? ::Appium::VERSION
-  DATE    = '2018-04-23'.freeze unless defined? ::Appium::DATE
+  VERSION = '9.12.0'.freeze unless defined? ::Appium::VERSION
+  DATE    = '2018-04-25'.freeze unless defined? ::Appium::DATE
 end

data/release_notes.md

@@ -1,3 +1,9 @@
+#### v9.11.1 2018-04-22
+
+- [778aaf4](https://github.com/appium/ruby_lib/commit/778aaf4dfd5879759fd296f770aef59a6eca685e) [Release 9 11 1 (#772)](https://github.com/appium/ruby_lib/issues/772)
+- [c89f526](https://github.com/appium/ruby_lib/commit/c89f526e97be008b4320c89d7a02267dcb23aa1d) [fix some tests and fix compatibility for wait (#771)](https://github.com/appium/ruby_lib/issues/771)
+
+
 #### v9.11.0 2018-04-19
 
 - [91f4db4](https://github.com/appium/ruby_lib/commit/91f4db40f0b1e29bc77231f3ce850bee193d4968) [Release 9 11 0 (#770)](https://github.com/appium/ruby_lib/issues/770)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appium_lib
 version: !ruby/object:Gem::Version
-  version: 9.11.1
+  version: 9.12.0
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: tomlrb
   requirement: !ruby/object:Gem::Requirement