lib/calabash/device.rb in calabash-1.9.9.pre3 vs lib/calabash/device.rb in calabash-2.0.0.pre1

- old
+ new

@@ -136,13 +136,10 @@ gesture_options = options.dup gesture_options[:at] ||= {} gesture_options[:at][:x] ||= 50 gesture_options[:at][:y] ||= 50 - gesture_options[:offset] ||= {} - gesture_options[:offset][:x] ||= 0 - gesture_options[:offset][:y] ||= 0 gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT _tap(query, gesture_options) end @@ -154,13 +151,10 @@ gesture_options = options.dup gesture_options[:at] ||= {} gesture_options[:at][:x] ||= 50 gesture_options[:at][:y] ||= 50 - gesture_options[:offset] ||= {} - gesture_options[:offset][:x] ||= 0 - gesture_options[:offset][:y] ||= 0 gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT _double_tap(query, gesture_options) end @@ -172,13 +166,10 @@ gesture_options = options.dup gesture_options[:at] ||= {} gesture_options[:at][:x] ||= 50 gesture_options[:at][:y] ||= 50 - gesture_options[:offset] ||= {} - gesture_options[:offset][:x] ||= 0 - gesture_options[:offset][:y] ||= 0 gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT gesture_options[:duration] ||= 1 _long_press(query, gesture_options) end @@ -235,9 +226,10 @@ unless direction == :out || direction == :in raise ArgumentError, "Invalid direction '#{direction}'" end gesture_options = options.dup + gesture_options[:duration] ||= 0.5 gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT _pinch(direction, query, gesture_options) end