calabash 2.0.0.pre10 → 2.0.0.pre11

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.
-      def _send_current_app_to_background(seconds)
+      define_method(:_send_current_app_to_background) do |seconds|
         unless (1..60).member?(seconds)
           raise ArgumentError,
             "Number of seconds: '#{seconds}' must be between 1 and 60"
@@ -30,11 +30,6 @@ 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,10 +37,17 @@ rescue LoadError => e
 end
 
 begin
-
   require 'calabash/ios'
 
-  extend 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
+
   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
-        Device.default.status_bar_orientation
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.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
-        Device.default.rotate(:left)
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.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
-        Device.default.rotate(:right)
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.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::Device.default.rotate_home_button_to(canonical_position)
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.rotate_home_button_to(canonical_position)}
       end
 
       # @!visibility private
-      def _set_orientation_landscape
+      define_method(:_set_orientation_landscape) do
         orientation = status_bar_orientation
         return orientation if landscape?
 
@@ -95,7 +95,7 @@ module Calabash
       end
 
       # @!visibility private
-      def _set_orientation_portrait
+      define_method(:_set_orientation_portrait) do
         orientation = status_bar_orientation
         return orientation if portrait?
 
@@ -103,13 +103,13 @@ module Calabash
       end
 
       # @!visibility private
-      def _portrait?
+      define_method(:_portrait?) do
         orientation = status_bar_orientation
         orientation.eql?('up') || orientation.eql?('down')
       end
 
       # @!visibility private
-      def _landscape?
+      define_method(:_landscape?) do
         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::IOS::Device.default.simulator?
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.simulator?}
       end
 
       # Is the device under test a physical device?
       def physical_device?
-        Calabash::IOS::Device.default.physical_device?
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.physical_device?}
       end
 
       # Is the device under test an iPad?
       def ipad?
-        Calabash::IOS::Device.default.device_family == 'iPad'
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.device_family == 'iPad'}
       end
 
       # Is the device under test an iPhone?
       def iphone?
-        Calabash::IOS::Device.default.device_family == 'iPhone'
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.device_family == 'iPhone'}
       end
 
       # Is the device under test an iPod?
       def ipod?
-        Calabash::IOS::Device.default.device_family == 'iPod'
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.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::IOS::Device.default.iphone_app_emulated_on_ipad?
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.iphone_app_emulated_on_ipad?}
       end
 
       # Is the device under test have a 4 inch screen?
       def iphone_4in?
-        Calabash::IOS::Device.default.form_factor == 'iphone 4in'
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.form_factor == 'iphone 4in'}
       end
 
       # Is the device under test an iPhone 6.
       def iphone_6?
-        Calabash::IOS::Device.default.form_factor == 'iphone 6'
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.form_factor == 'iphone 6'}
       end
 
       # Is the device under test an iPhone 6+?
       def iphone_6_plus?
-        Calabash::IOS::Device.default.form_factor == 'iphone 6 +'
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.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::IOS::Device.default.form_factor == 'iphone 3.5in'
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.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::IOS::Device.default.screen_dimensions
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.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::IOS::Device.default.ios_version
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.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::IOS::Device.default.server_version
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.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::IOS::Device.default.runtime_details
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.runtime_details}
       end
     end
   end

data/lib/calabash/ios/scroll.rb

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

data/lib/calabash/ios/slider.rb

@@ -16,34 +16,25 @@ module Calabash
       #  * Use the index language feature:  "UISlider index:0"
       #
       # @example
-      #  slider_set_value("UISlider marked:'office slider'", 2)
-      #  slider_set_value("slider marked:'weather slider'", -1)
-      #  slider_set_value("UISlider", 11)
+      #  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)
       #
       # @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 [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
+      # @param [Boolean] animate (default: true) Animate the change.
+      # @param [Boolean] notify_targets (default: 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,  options={})
+      def slider_set_value(query, value, animate: true, notify_targets: true)
         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
@@ -53,7 +44,7 @@ module Calabash
                   "Expected '#{query}' to match exactly one view, but found '#{results.length}'",
                   results.join("\n")
             ].join("\n")
-            fail(message)
+            raise message
           else
             results.length == 1
           end
@@ -61,9 +52,11 @@ module Calabash
 
         value_str = value.to_s
 
-        args = [merged_options[:animate], merged_options[:notify_targets]]
+        args = [animate, notify_targets]
 
-        Device.default.map_route(query, :changeSlider, value_str, *args)
+        Calabash::Internal.with_default_device(required_os: :ios) do |device|
+          device.map_route(query, :changeSlider, value_str, *args)
+        end
       end
     end
   end

data/lib/calabash/ios/text.rb

@@ -3,21 +3,21 @@ module Calabash
     # Methods for entering text and interacting with iOS keyboards.
     module Text
       # @!visibility private
-      def _enter_text(text)
+      define_method(:_enter_text) do |text|
         wait_for_keyboard
         existing_text = text_from_keyboard_first_responder
         options = { existing_text: existing_text }
-        Device.default.uia_type_string(text, options)
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.enter_text(text, options)}
       end
 
       # @!visibility private
-      def _enter_text_in(view, text)
+      define_method(:_enter_text_in) do |view, text|
         tap(view)
         enter_text(text)
       end
 
       # @!visibility private
-      def _clear_text
+      define_method(:_clear_text) do
         unless view_exists?("* isFirstResponder:1")
           raise 'Cannot clear text. No view has focus'
         end
@@ -26,7 +26,7 @@ module Calabash
       end
 
       # @!visibility private
-      def _clear_text_in(view)
+      define_method(:_clear_text_in) do |view|
         unless keyboard_visible?
           tap(view)
           wait_for_keyboard
@@ -35,6 +35,7 @@ module Calabash
         unless wait_for_view(view)['text'].empty?
           tap(view)
           tap("UICalloutBarButton marked:'Select All'")
+          sleep 0.5
           tap_keyboard_delete_key
         end
 
@@ -49,7 +50,7 @@ module Calabash
       #
       # @return [Boolean] Returns true if a keyboard is visible and docked.
       def docked_keyboard_visible?
-        Device.default.docked_keyboard_visible?
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.docked_keyboard_visible?}
       end
 
       # Returns true if an undocked keyboard is visible.
@@ -59,7 +60,7 @@ module Calabash
       # @return [Boolean] Returns false if the device is not an iPad; all
       # keyboards on the iPhone and iPod are docked.
       def undocked_keyboard_visible?
-        Device.default.undocked_keyboard_visible?
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.undocked_keyboard_visible?}
       end
 
       # Returns true if a split keyboard is visible.
@@ -70,7 +71,7 @@ module Calabash
       # @return [Boolean] Returns false if the device is not an iPad; all
       # keyboards on the Phone and iPod are docked and not split.
       def split_keyboard_visible?
-        Device.default.split_keyboard_visible?
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.split_keyboard_visible?}
       end
 
       # Touches the keyboard action key.
@@ -90,86 +91,29 @@ module Calabash
       # @todo Refactor uia_route to a public API call
       # @todo Move this documentation to the public method
       # @!visibility private
-      def _tap_keyboard_action_key(action_key)
+      define_method(:_tap_keyboard_action_key) do |action_key|
         unless action_key.nil?
           raise ArgumentError,
                 "An iOS keyboard does not have multiple action keys"
         end
 
-        char_sequence = ESCAPED_KEYBOARD_CHARACTERS[:action]
-        Device.default.uia_route("uia.keyboard().typeString('#{char_sequence}')")
+        wait_for_keyboard
+        Calabash::Internal.with_default_device(required_os: :ios) {|device| device.tap_keyboard_action_key}
       end
 
       # @!visibility private
-      def _keyboard_visible?
+      define_method(:_keyboard_visible?) do
         docked_keyboard_visible? || undocked_keyboard_visible? || split_keyboard_visible?
       end
 
       # Touches the keyboard delete key.
-      #
-      # The 'delete' key difficult to find and touch because its behavior
-      # changes depending on the iOS version and keyboard type.  Consider the
-      # following:
-      #
-      # On iOS 6, the 'delete' char code is _not_ \b.
-      # On iOS 7: The Delete char code is \b on non-numeric keyboards.
-      #           On numeric keyboards, the delete key is a button on the
-      #           the keyboard.
-      #
-      # By default, Calabash uses a raw UIAutomaton JavaScript call to tap the
-      # element named 'Delete'.  This works well in English localizations for
-      # most keyboards.  If you find that it does not work, use the options
-      # pass either an translation of 'Delete' for your localization or use the
-      # default the escaped keyboard character.
-      #
       # @example
-      #   # Uses UIAutomation to tap the 'Delete' key or button.
-      #   tap_keyboard_delete_key
-      #
-      #   # Types the \b key.
-      #   tap_keyboard_delete_key({:use_escaped_char => true})
+      #   cal_ios.tap_keyboard_delete_key
       #
-      #   # Types the \d key.
-      #   tap_keyboard_delete_key({:use_escaped_char => '\d'})
-      #
-      #   # Uses UIAutomation to tap the 'Slet' key or button.
-      #   tap_keyboard_delete_key({:delete_key_label => 'Slet'})
-      #
-      #   # Don't specify both options!  If :use_escape_sequence is truthy,
-      #   # Calabash will ignore the :delete_key_label and try to use an
-      #   # escaped character sequence.
-      #   tap_keyboard_delete_key({:use_escaped_char => true,
-      #                            :delete_key_label => 'Slet'})
-      #
-      # @param [Hash] options Alternative ways to tap the delete key.
-      # @option options [Boolean, String] :use_escaped_char (false) If true,
-      #  delete by typing the \b character.  If this value is truthy, but not
-      #  'true', they it is expected to be an alternative escaped character.
-      # @option options [String] :delete_key_label ('Delete') An alternative
-      #  localization of 'Delete'.
-      # @todo Need translations of 'Delete' key.
-      def tap_keyboard_delete_key(options = {})
-        default_options =
-            {
-                use_escaped_char: false,
-                delete_key_label: 'Delete'
-            }
-        merged_options = default_options.merge(options)
-
-        use_escape_sequence = merged_options[:use_escaped_char]
-        if use_escape_sequence
-          if use_escape_sequence.to_s == 'true'
-            # Use the default \b
-            char_sequence = ESCAPED_KEYBOARD_CHARACTERS[:delete]
-          else
-            char_sequence = use_escape_sequence
-          end
-          return Device.default.uia_route("uia.keyboard().typeString('#{char_sequence}')")
+      def tap_keyboard_delete_key
+        Calabash::Internal.with_default_device(required_os: :ios) do |device|
+          device.tap_keyboard_delete_key
         end
-
-        delete_key_label = merged_options[:delete_key_label]
-        uia = "uia.keyboard().elements().firstWithName('#{delete_key_label}').tap()"
-        Device.default.uia_route(uia)
       end
 
       # Returns the the text in the first responder.
@@ -183,7 +127,9 @@ module Calabash
       #
       # @raise [RuntimeError] If there is no visible keyboard.
       def text_from_keyboard_first_responder
-        Device.default.text_from_keyboard_first_responder
+        Calabash::Internal.with_default_device(required_os: :ios) do |device|
+          device.text_from_keyboard_first_responder
+        end
       end
 
       private