lib/calabash-cucumber/actions/instruments_actions.rb in calabash-cucumber-0.10.0.pre1 vs lib/calabash-cucumber/actions/instruments_actions.rb in calabash-cucumber-0.10.0.pre2
- old
+ new
@@ -1,74 +1,84 @@
require 'calabash-cucumber/uia'
require 'calabash-cucumber/connection_helpers'
require 'calabash-cucumber/query_helpers'
require 'calabash-cucumber/map'
+# @!visibility private
class Calabash::Cucumber::InstrumentsActions
include Calabash::Cucumber::UIA
include Calabash::Cucumber::ConnectionHelpers
include Calabash::Cucumber::QueryHelpers
include Calabash::Cucumber::Map
+ # @!visibility private
def touch(options)
query_action(options, :uia_tap_offset)
end
+ # @!visibility private
def wait_tap(options)
uia_wait_tap(options[:query], options)
end
+ # @!visibility private
def double_tap(options)
query_action(options, :uia_double_tap_offset)
end
+ # @!visibility private
def two_finger_tap(options)
query_action(options, :uia_two_finger_tap_offset)
end
+ # @!visibility private
def flick(options)
query_action(options) do |offset|
delta = {:offset => options[:delta] || {}}
uia_flick_offset(offset, point_from(offset, delta))
end
end
-
+ # @!visibility private
def touch_hold(options)
query_action(options) do |offset|
- duration = options[:duration] || 4
+ duration = options[:duration] || 3
uia_touch_hold_offset(duration, offset)
end
end
+ # @!visibility private
def swipe(dir, options={})
options = options.merge(:direction => dir)
query_action(options, :uia_swipe_offset, options)
end
+ # @!visibility private
def pan(from, to, options={})
query_action(:query => from) do |from_offset|
query_action(:query => to) do |to_offset|
uia_pan_offset(from_offset, to_offset, options)
end
end
-
end
+ # @!visibility private
def pinch(in_out, options)
query_action(options) do |offset|
options[:duration] = options[:duration] || 0.5
uia_pinch_offset(in_out, offset, options)
end
end
+ # @!visibility private
def send_app_to_background(secs)
uia_send_app_to_background(secs)
end
private
+ # @!visibility private
# Data interface
# options[:query] or options[:offset]
def query_action(options, action=nil, *args, &block)
ui_query = options[:query]
offset = options[:offset]
@@ -91,10 +101,11 @@
self.send(action, offset, *args)
end
end
end
+ # @!visibility private
def find_and_normalize(ui_query)
raw_result = raw_map(ui_query, :query)
orientation = raw_result['status_bar_orientation']
res = raw_result['results']
@@ -104,10 +115,11 @@
normalize_rect_for_orientation!(orientation, first_res['rect']) if first_res['rect']
res
end
+ # @!visibility private
def normalize_rect_for_orientation!(orientation, rect)
orientation = orientation.to_sym
launcher = Calabash::Cucumber::Launcher.launcher
screen_size = launcher.device.screen_size
case orientation
@@ -126,8 +138,7 @@
rect['center_x'] = screen_size[:width] - cx
else
# no-op by design.
end
end
-
end
\ No newline at end of file