calabash 2.0.0.pre11 → 2.0.0.prelegacy

data/lib/calabash/ios/gestures.rb

@@ -3,8 +3,15 @@ module Calabash
 
     # @!visibility private
     module Gestures
+
       # @!visibility private
-      define_method (:_swipe_coordinates_for_screen) do
+      # Concrete implementation of pan_screen_up gesture.
+      def _pan_screen_up(options={})
+
+        gesture_options = options.dup
+        gesture_options[:duration] ||= 0.5
+        gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
+
         points_from_top = gesture_points_from_top
         points_from_bottom = gesture_points_from_bottom
 
@@ -17,49 +24,108 @@ module Calabash
         end_y = points_from_top
         x = width/2.0
 
-        {bottom: coordinate(x, start_y), top: coordinate(x, end_y)}
-      end
+        from_offset = coordinate(x, start_y)
+        to_offset = coordinate(x, end_y)
 
-      # @!visibility private
-      # Concrete implementation of pan_screen_up gesture.
-      define_method (:_pan_screen_up) do |options={}|
-        swipe = _swipe_coordinates_for_screen
-        gesture_options = options.merge({offset: {from: swipe[:bottom], to: swipe[:top]}})
-
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.pan_between(nil, nil, gesture_options)}
+        Device.default.pan_screen(top_view, from_offset, to_offset, gesture_options)
       end
 
       # @!visibility private
       # Concrete implementation of pan_screen_down gesture.
-      define_method (:_pan_screen_down) do |options={}|
-        swipe = _swipe_coordinates_for_screen
-        gesture_options = options.merge({offset: {from: swipe[:top], to: swipe[:bottom]}})
+      def _pan_screen_down(options={})
+
+        gesture_options = options.dup
+        gesture_options[:duration] ||= 0.5
+        gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
+
+        points_from_top = gesture_points_from_top
+        points_from_bottom = gesture_points_from_bottom
+
+        top_view = query('*').first
+
+        height = top_view['frame']['height'].to_f
+        width = top_view['frame']['width'].to_f
+
+        start_y = points_from_top
+        end_y = height - points_from_bottom
+        x = width/2.0
+
+        from_offset = coordinate(x, start_y)
+        to_offset = coordinate(x, end_y)
 
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.pan_between(nil, nil, gesture_options)}
+        Device.default.pan_screen(top_view, from_offset, to_offset, gesture_options)
       end
 
       # @!visibility private
       # Concrete implementation of flick_screen_up gesture.
-      define_method (:_flick_screen_up) do |options={}|
-        swipe = _swipe_coordinates_for_screen
-        gesture_options = options.merge({offset: {from: swipe[:bottom], to: swipe[:top]}})
+      def _flick_screen_up(options={})
+
+        gesture_options = options.dup
+        gesture_options[:duration] ||= 0.5
+        gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
+
+        points_from_top = gesture_points_from_top
+        points_from_bottom = gesture_points_from_bottom
+
+        top_view = query('*').first
 
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.flick_between(nil, nil, gesture_options)}
+        height = top_view['frame']['height'].to_f
+        width = top_view['frame']['width'].to_f
+
+        start_y = height - points_from_bottom
+        end_y = points_from_top
+        x = width/2.0
+
+        from_offset = coordinate(x, start_y)
+        to_offset = coordinate(x, end_y)
+
+        Device.default.flick_screen(top_view, from_offset, to_offset, gesture_options)
       end
 
       # @!visibility private
       # Concrete implementation of flick_screen_down gesture.
-      define_method (:_flick_screen_down) do |options={}|
-        swipe = _swipe_coordinates_for_screen
-        gesture_options = options.merge({offset: {from: swipe[:top], to: swipe[:bottom]}})
+      def _flick_screen_down(options={})
+
+        gesture_options = options.dup
+        gesture_options[:duration] ||= 0.5
+        gesture_options[:timeout] ||= Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT
+
+        points_from_top = gesture_points_from_top
+        points_from_bottom = gesture_points_from_bottom
+
+        top_view = query('*').first
+
+        height = top_view['frame']['height'].to_f
+        width = top_view['frame']['width'].to_f
+
+        start_y = points_from_top
+        end_y = height - points_from_bottom
+        x = width/2.0
+
+        from_offset = coordinate(x, start_y)
+        to_offset = coordinate(x, end_y)
 
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.flick_between(nil, nil, gesture_options)}
+        Device.default.flick_screen(top_view, from_offset, to_offset, gesture_options)
       end
 
       # @!visibility private
       # Concrete implementation of pinch_screen
-      define_method (:_pinch_screen) do |direction, options={}|
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.pinch(direction, '*', options)}
+      def _pinch_screen(direction, options={})
+        Device.default.pinch(direction, '*', options)
+      end
+
+      # @!visibility private
+      # Concrete implementation of pinch_to_zoom
+      def _pinch_to_zoom(direction, query, options={})
+        gesture_direction = direction == :in ? :out : :in
+        Device.default.pinch(gesture_direction, query, options)
+      end
+
+      # @!visibility private
+      # Concrete implementation of pinch_screen_to_zoom
+      def _pinch_screen_to_zoom(direction, options={})
+        gesture_direction = direction == :in ? :out : :in
+        Device.default.pinch(gesture_direction, '*', options)
       end
 
       private

data/lib/calabash/ios/interactions.rb

@@ -13,7 +13,7 @@ module Calabash
       #   in the background
       # @raise [ArgumentError] If number of seconds is less than 1 and more
       #   than 60 seconds.
-      define_method(:_send_current_app_to_background) do |seconds|
+      def _send_current_app_to_background(seconds)
         unless (1..60).member?(seconds)
           raise ArgumentError,
             "Number of seconds: '#{seconds}' must be between 1 and 60"
@@ -30,6 +30,11 @@ module Calabash
         )
         uia(javascript)
       end
+
+      # @!visibility private
+      def _evaluate_javascript_in(query, javascript)
+        query(query, calabashStringByEvaluatingJavaScript: javascript)
+      end
     end
   end
 end

data/lib/calabash/ios/lib/.irbrc

@@ -37,17 +37,10 @@ rescue LoadError => e
 end
 
 begin
-  require 'calabash/ios'
-
-  IRB.conf[:PROMPT][:CALABASH] = {
-    :PROMPT_I => "calabash #{Calabash::VERSION}> ",
-    :PROMPT_S => "%03n> ",
-    :PROMPT_C => "%03n> ",
-    :RETURN => "%s\n"
-  }
 
-  IRB.conf[:PROMPT_MODE] = :CALABASH
+  require 'calabash/ios'
 
+  extend Calabash::IOS
   extend Calabash::ConsoleHelpers
 
   Calabash::IOS.setup_defaults!

data/lib/calabash/ios/orientation.rb

@@ -13,7 +13,7 @@ module Calabash
       # @return [String] Returns the device orientation as one of
       #  `{'down' | 'up' | 'left' | 'right'}`.
       def status_bar_orientation
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.status_bar_orientation}
+        Device.default.status_bar_orientation
       end
 
       # Rotate the device left - clockwise relative to the home button.
@@ -26,7 +26,7 @@ module Calabash
       # @return [String] The position of the home button relative to the status
       #  bar after the rotation. Can be one of 'down', 'left', 'right', 'up'.
       def rotate_device_left
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.rotate(:left)}
+        Device.default.rotate(:left)
         status_bar_orientation
       end
 
@@ -40,7 +40,7 @@ module Calabash
       # @return [String] The position of the home button relative to the status
       #  bar after the rotation. Can be one of 'down', 'left', 'right', 'up'.
       def rotate_device_right
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.rotate(:right)}
+        Device.default.rotate(:right)
         status_bar_orientation
       end
 
@@ -83,11 +83,11 @@ module Calabash
         canonical_position = :down if position.to_sym == :bottom
         canonical_position = :up if position.to_sym == :top
 
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.rotate_home_button_to(canonical_position)}
+        Calabash::Device.default.rotate_home_button_to(canonical_position)
       end
 
       # @!visibility private
-      define_method(:_set_orientation_landscape) do
+      def _set_orientation_landscape
         orientation = status_bar_orientation
         return orientation if landscape?
 
@@ -95,7 +95,7 @@ module Calabash
       end
 
       # @!visibility private
-      define_method(:_set_orientation_portrait) do
+      def _set_orientation_portrait
         orientation = status_bar_orientation
         return orientation if portrait?
 
@@ -103,13 +103,13 @@ module Calabash
       end
 
       # @!visibility private
-      define_method(:_portrait?) do
+      def _portrait?
         orientation = status_bar_orientation
         orientation.eql?('up') || orientation.eql?('down')
       end
 
       # @!visibility private
-      define_method(:_landscape?) do
+      def _landscape?
         orientation = status_bar_orientation
         orientation.eql?('right') || orientation.eql?('left')
       end

data/lib/calabash/ios/runtime.rb

@@ -11,27 +11,27 @@ module Calabash
 
       # Is the device under test a simulator?
       def simulator?
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.simulator?}
+        Calabash::IOS::Device.default.simulator?
       end
 
       # Is the device under test a physical device?
       def physical_device?
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.physical_device?}
+        Calabash::IOS::Device.default.physical_device?
       end
 
       # Is the device under test an iPad?
       def ipad?
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.device_family == 'iPad'}
+        Calabash::IOS::Device.default.device_family == 'iPad'
       end
 
       # Is the device under test an iPhone?
       def iphone?
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.device_family == 'iPhone'}
+        Calabash::IOS::Device.default.device_family == 'iPhone'
       end
 
       # Is the device under test an iPod?
       def ipod?
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.device_family == 'iPod'}
+        Calabash::IOS::Device.default.device_family == 'iPod'
       end
 
       # Is the device under test an iPhone or iPod?
@@ -44,22 +44,22 @@ module Calabash
       # An iPhone only app running on an iPad will be displayed in an emulated
       # mode.  Starting in iOS 7, such apps will always be launched in 2x mode.
       def iphone_app_emulated_on_ipad?
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.iphone_app_emulated_on_ipad?}
+        Calabash::IOS::Device.default.iphone_app_emulated_on_ipad?
       end
 
       # Is the device under test have a 4 inch screen?
       def iphone_4in?
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.form_factor == 'iphone 4in'}
+        Calabash::IOS::Device.default.form_factor == 'iphone 4in'
       end
 
       # Is the device under test an iPhone 6.
       def iphone_6?
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.form_factor == 'iphone 6'}
+        Calabash::IOS::Device.default.form_factor == 'iphone 6'
       end
 
       # Is the device under test an iPhone 6+?
       def iphone_6_plus?
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.form_factor == 'iphone 6 +'}
+        Calabash::IOS::Device.default.form_factor == 'iphone 6 +'
       end
 
       # Is the device under test an iPhone 3.5in?
@@ -72,7 +72,7 @@ module Calabash
       # @see #iphone_app_emulated_on_ipad?
       # @see #ipad?
       def iphone_35in?
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.form_factor == 'iphone 3.5in'}
+        Calabash::IOS::Device.default.form_factor == 'iphone 3.5in'
       end
 
       # The screen dimensions and details about scale and sample rates.
@@ -88,7 +88,7 @@ module Calabash
       #
       # @return [Hash] See the example.
       def app_screen_details
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.screen_dimensions}
+        Calabash::IOS::Device.default.screen_dimensions
       end
 
       # The version of iOS running on the test device.
@@ -100,7 +100,7 @@ module Calabash
       #
       # @return [RunLoop::Version] A version object.
       def ios_version
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.ios_version}
+        Calabash::IOS::Device.default.ios_version
       end
 
       # Is the device under test running iOS 6?
@@ -132,7 +132,7 @@ module Calabash
       #
       # @return [RunLoop::Version] A version object.
       def server_version
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.server_version}
+        Calabash::IOS::Device.default.server_version
       end
 
       # Details about the version of the app under test.
@@ -161,7 +161,7 @@ module Calabash
       #  the methods in the {Calabash::IOS::Runtime} module instead.
       # @return[Hash] Key/value pairs that describe the runtime environment.
       def runtime_details
-        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.runtime_details}
+        Calabash::IOS::Device.default.runtime_details
       end
     end
   end

data/lib/calabash/ios/scroll.rb

@@ -71,7 +71,7 @@ module Calabash
           raise RuntimeError, e
         end
 
-        results = Calabash::Internal.with_default_device(required_os: :ios) {|device| device.map_route(query, :scroll, direction)}
+        results = Device.default.map_route(query, :scroll, direction)
 
         if results.first.nil?
           fail("Expected '#{query}' to match a UIScrollView or a subclass")
@@ -153,10 +153,8 @@ module Calabash
         position = merged_options[:scroll_position].to_sym
         animate = merged_options[:animate]
 
-        results = Calabash::Internal.with_default_device(required_os: :ios) do |device|
-          device.map_route(query, :scrollToRow, row.to_i,
-                           section.to_i, position, animate)
-        end
+        results = Device.default.map_route(query, :scrollToRow, row.to_i,
+                                          section.to_i, position, animate)
 
         if results.first.nil?
           message = [
@@ -242,10 +240,8 @@ module Calabash
         position = merged_options[:scroll_position].to_sym
         animate = merged_options[:animate]
 
-        results = Calabash::Internal.with_default_device(required_os: :ios) do |device|
-          device.map_route(query, :scrollToRowWithMark, mark,
-                           position, animate)
-        end
+        results = Device.default.map_route(query, :scrollToRowWithMark, mark,
+                                          position, animate)
 
         if results.first.nil?
           message = [
@@ -338,12 +334,9 @@ module Calabash
         position = merged_options[:scroll_position].to_sym
         animate = merged_options[:animate]
 
-        results = Calabash::Internal.with_default_device(required_os: :ios) do |device|
-          device.map_route(query, :collectionViewScroll,
-                           item.to_i, section.to_i,
-                           position, animate)
-        end
-
+        results = Device.default.map_route(query, :collectionViewScroll,
+                                           item.to_i, section.to_i,
+                                           position, animate)
         if results.first.nil?
           message = [
                 "Could not scroll collection to item '#{item}' and section '#{section}'.",
@@ -434,11 +427,9 @@ module Calabash
         position = merged_options[:scroll_position].to_sym
         animate = merged_options[:animate]
 
-        results = Calabash::Internal.with_default_device(required_os: :ios) do |device|
-          device.map_route(query,
-                           :collectionViewScrollToItemWithMark,
-                           mark, position, animate)
-        end
+        results = Device.default.map_route(query,
+                                           :collectionViewScrollToItemWithMark,
+                                           mark, position, animate)
 
         if results.first.nil?
           message = [
@@ -464,7 +455,8 @@ module Calabash
                                            :left, :center_horizontal, :right]
 
       # @!visibility private
-      define_method(:_wait_for_exactly_one_scroll_view) do |query|
+      def _wait_for_exactly_one_scroll_view(query)
+
         results = []
 
         found_none = "Expected '#{query}' to match exactly one view, but found no matches."
@@ -485,7 +477,7 @@ module Calabash
       end
 
       # @!visibility private
-      define_method(:_expect_valid_scroll_positions) do |valid_positions, position|
+      def _expect_valid_scroll_positions(valid_positions, position)
         unless valid_positions.include?(position.to_sym)
           raise ArgumentError,
                 "Expected '#{position}' to be one of #{valid_positions.join(', ')}"
@@ -493,7 +485,7 @@ module Calabash
       end
 
       # @!visibility private
-      define_method(:_expect_valid_scroll_animate) do |animate|
+      def _expect_valid_scroll_animate(animate)
         unless [true, false].include?(animate)
           raise ArgumentError,
                 "Expected '#{animate}' to be a Boolean true or false"
@@ -501,13 +493,13 @@ module Calabash
       end
 
       # @!visibility private
-      define_method(:_expect_valid_scroll_options) do |valid_positions, options|
+      def _expect_valid_scroll_options(valid_positions, options)
         _expect_valid_scroll_positions(valid_positions, options[:scroll_position])
         _expect_valid_scroll_animate(options[:animate])
       end
 
       # @!visibility private
-      define_method(:_expect_valid_scroll_mark) do |mark|
+      def _expect_valid_scroll_mark(mark)
         if mark.nil? || mark == ''
           raise ArgumentError,
                 if mark.nil?

data/lib/calabash/ios/slider.rb

@@ -16,25 +16,34 @@ module Calabash
       #  * Use the index language feature:  "UISlider index:0"
       #
       # @example
-      #  cal_ios.slider_set_value("UISlider marked:'office slider'", 2)
-      #  cal_ios.slider_set_value("slider marked:'weather slider'", -1)
-      #  cal_ios.slider_set_value("UISlider", 11)
+      #  slider_set_value("UISlider marked:'office slider'", 2)
+      #  slider_set_value("slider marked:'weather slider'", -1)
+      #  slider_set_value("UISlider", 11)
       #
       # @param [String, Hash, Calabash::Query] query A query to that indicates
       #   in which slider to set the value.
       # @param [Numeric] value The value to set the slider to.  value.to_s should
       #  produce a String representation of a Number.
-      # @param [Boolean] animate (default: true) Animate the change.
-      # @param [Boolean] notify_targets (default: true) simulate a UIEvent by
+      #
+      # @param [options] options Options to control the behavior of the gesture.
+      # @option options [Boolean] :animate (true) Animate the change.
+      # @option options [Boolean] :notify_targets (true) Simulate a UIEvent by
       #  calling every target/action pair defined on the UISlider matching
       #  `query`.
       #
       # @raise [RuntimeError] When `query` does not match exactly one slider.
       # @raise [RuntimeError] When setting the value of the slider matched by
       #  `query` is not successful.
-      def slider_set_value(query, value, animate: true, notify_targets: true)
+      def slider_set_value(query, value,  options={})
         Query.ensure_valid_query(query)
 
+        default_options = {
+              :animate => true,
+              :notify_targets => true
+        }
+
+        merged_options = default_options.merge(options)
+
         found_none = "Expected '#{query}' to match exactly one view, but found no matches."
         query_object = Query.new(query)
         wait_for(found_none) do
@@ -44,7 +53,7 @@ module Calabash
                   "Expected '#{query}' to match exactly one view, but found '#{results.length}'",
                   results.join("\n")
             ].join("\n")
-            raise message
+            fail(message)
           else
             results.length == 1
           end
@@ -52,11 +61,9 @@ module Calabash
 
         value_str = value.to_s
 
-        args = [animate, notify_targets]
+        args = [merged_options[:animate], merged_options[:notify_targets]]
 
-        Calabash::Internal.with_default_device(required_os: :ios) do |device|
-          device.map_route(query, :changeSlider, value_str, *args)
-        end
+        Device.default.map_route(query, :changeSlider, value_str, *args)
       end
     end
   end