remove hot fix actions (#773)

* remove hot fix actions

* update core

Author: KazuCocoa

CHANGELOG.md

@@ -9,6 +9,8 @@ Release tags are https://github.com/appium/ruby_lib/releases .
 ### 2. Bug fixes
 
 ### 3. Deprecations
+- Changed the name of arguments
+    - `swipe(start_x:, start_y:, end_x:, end_y:)` instead of `swipe(start_x:, start_y:, offset_x:, offset_y:)`
 
 ## v9.11.1
 ### 1. Enhancements

android_tests/lib/android/specs/common/device_touchaction.rb

@@ -35,7 +35,7 @@ def before_first
   t 'swipe' do
     wait { text('Animation').click }
     wait { text_exact('Bouncing Balls').click }
-    wait { Appium::TouchAction.new.swipe(start_x: 0.75, start_y: 0.25, offset_x: 0.0, offset_y: 49.75).perform }
+    wait { Appium::TouchAction.new.swipe(start_x: 0.75, start_y: 0.25, end_x: 0.0, end_y: 49.75).perform }
     2.times { back }
     wait { text_exact 'NFC' }
   end

android_tests/lib/android/specs/device/touch_actions.rb

@@ -18,7 +18,7 @@ def swipe_till_text_visible(seen_text)
       # [AndroidBootstrap] [BOOTSTRAP LOG] [debug] Swiping from [x=600.0, y=919.0] to [x=600.0, y=819.0] with steps: 6
       # [debug] [AndroidBootstrap] Received command result from bootstrap
       # rubocop:enable Metrics/LineLength
-      swipe start_x: start_x, start_y: start_y, offset_x: 0.0, offset_y: - 100
+      swipe start_x: start_x, start_y: start_y, end_x: 0.0, end_y: - 100
       text(seen_text).displayed?
     end
   end

appium_lib.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.homepage      = 'https://github.com/appium/ruby_lib' # published as appium_lib
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'appium_lib_core', '~> 1.4.2'
+  s.add_runtime_dependency 'appium_lib_core', '~> 1.5.0'
   s.add_runtime_dependency 'tomlrb', '~> 1.1'
   s.add_runtime_dependency 'nokogiri', '~> 1.8', '>= 1.8.1'
 

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

@@ -49,10 +49,10 @@ def go_back
 
   t 'swipe' do
     touch_action = Appium::TouchAction.new.swipe(start_x: 75, start_y: 500,
-                                                 offset_x: 75, offset_y: 20, duration: 500).perform
+                                                 end_x: 75, end_y: 20, duration: 500).perform
     touch_action.actions.must_equal []
 
-    touch_action = Appium::TouchAction.new.swipe(start_x: 75, start_y: 500, offset_x: 75, offset_y: 20, duration: 500)
+    touch_action = Appium::TouchAction.new.swipe(start_x: 75, start_y: 500, end_x: 75, end_y: 20, duration: 500)
 
     touch_action.actions[0][:action].must_equal :press
     touch_action.actions[0][:options].must_equal(x: 75, y: 500)

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

@@ -44,7 +44,7 @@ def after_last
     # [debug] [MJSONWP] Responding to client with driver.performTouch() result: ""
     # [HTTP] <-- POST /wd/hub/session/8b651f03-0fbc-43f0-aaf2-243d0650f6aa/touch/perform 200 1895 ms - 74
     # rubocop:enable Metrics/LineLength
-    Appium::TouchAction.new.swipe(start_x: start_x, start_y: start_y, offset_x: 0, offset_y: - 50).perform
+    Appium::TouchAction.new.swipe(start_x: start_x, start_y: start_y, end_x: 0, end_y: - 50).perform
     ele_index(ui_ios.static_text, 2).text.must_equal 'Chris Armstrong - 0' # depends on iOS
   end
 

lib/appium_lib/common/multi_touch.rb

@@ -54,9 +54,7 @@ def pinch(percentage = 25, auto_perform = true, driver = $driver)
         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 @@ def zoom(percentage = 200, auto_perform = true, driver = $driver)
         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 @@ def pinch_android(rate, driver)
 
         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 @@ def pinch_ios(rate, driver)
 
         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 @@ def zoom_android(rate, driver)
 
         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 @@ def zoom_ios(rate, driver)
 
         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

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 @@ def initialize(driver = $driver)
       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