calabash-cucumber 0.20.0 → 0.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3beda8dc174cf33416893af2d2e58ed4a18d58cb
-  data.tar.gz: 60902d11897fa82bccba3e46aa869b52f152b9cc
+  metadata.gz: 5d80bc583ef0ea5ae3fb6548acd4d5ced7f15b2c
+  data.tar.gz: 61431194a8a83d91b41674c2d5ec6f83076b92fa
 SHA512:
-  metadata.gz: 734473873f98af082e74350e287571804aacb5855adff80bec317eb5cc73083ee6f7da6055f58aba53b3a9e15e9b5a775434febd7dfa18c5785ae89203958d87
-  data.tar.gz: 033948ff96011ee84c325adad1d72ceeef5fb4e22fdc607cb88e725ff19a20a17c6c6f7c6ba5c011054ae4f06a2c88e62993bf0eb6122127374615928610d176
+  metadata.gz: 1b9e3bbb6993f444dfd6a9e83e8e4de9d9c2b48080a820c71032967755366eb984de455bac2bfce9fe18a823050a482c8cdf937c56e1e8ae6cfc592b8047fcc8
+  data.tar.gz: c25c2390ba6e3b3542bfa5e5a1c5cad9dfc6ad73fea899405f2aacc8b25d09b817a3f92dee5a1285cd8a67044ee7b189730bb67c20fc8c9c439c115c6bb1a0af

data/lib/calabash-cucumber/automator/automator.rb

@@ -34,6 +34,28 @@ module Calabash
           abstract_method!
         end
 
+        # @!visibility private
+        #
+        # This code is redundant.  It would be easy to pass the Launcher
+        # device instance to the automator, but that would require an XTC patch.
+        #
+        # This code is also duplicated in the EnvironmentHelpers.
+        #
+        # We need the device screen size to support full-screen pan gestures.
+        #
+        # Asking for the top-most view is not good enough and asking for the
+        # largest UIWindow is not specific enough (map apps have a huge window).
+        def device
+          @device ||= begin
+            require "calabash-cucumber/http/http"
+            require "calabash-cucumber/environment"
+            require "calabash-cucumber/device"
+            _, body = Calabash::Cucumber::HTTP.ensure_connectivity
+            endpoint = Calabash::Cucumber::Environment.device_endpoint
+            Calabash::Cucumber::Device.new(endpoint, body)
+          end
+        end
+
         # @!visibility private
         def touch(options)
           abstract_method!
@@ -79,6 +101,8 @@ module Calabash
         end
 
         # @!visibility private
+        #
+        # Callers must validate the options.
         def pinch(in_or_out, options)
           abstract_method!
         end

data/lib/calabash-cucumber/automator/device_agent.rb

@@ -130,13 +130,14 @@ args[0] = #{args[0]}])
           dupped_options = options.dup
 
           if dupped_options[:query].nil?
-            dupped_options[:query] = "*"
+            element = element_for_device_screen
+            from_point = point_from(element, options)
+          else
+            hash = query_for_coordinates(dupped_options)
+            from_point = hash[:coordinates]
+            element = hash[:view]
           end
 
-          hash = query_for_coordinates(dupped_options)
-          from_point = hash[:coordinates]
-          element = hash[:view]
-
           # DeviceAgent does not understand the :force. Does anyone?
           force = dupped_options[:force]
           case force
@@ -158,7 +159,38 @@ args[0] = #{args[0]}])
           direction = dupped_options[:direction]
           to_point = Coordinates.end_point_for_swipe(direction, element, force)
           client.pan_between_coordinates(from_point, to_point, gesture_options)
-          [hash[:view]]
+          [element]
+        end
+
+        # @!visibility private
+        def pinch(in_out, options)
+          dupped_options = options.dup
+
+          if dupped_options[:query].nil?
+            element = element_for_device_screen
+            coordinates = point_from(element, options)
+          else
+            hash = query_for_coordinates(dupped_options)
+            element = hash[:view]
+            coordinates = hash[:coordinates]
+          end
+
+          in_out = in_out.to_s
+          duration = dupped_options[:duration]
+          amount = dupped_options[:amount]
+
+          gesture_options = {
+            :pinch_direction => in_out,
+            :amount => amount,
+            :duration => duration
+          }
+
+          client.perform_coordinate_gesture("pinch",
+                                            coordinates[:x],
+                                            coordinates[:y],
+                                            gesture_options)
+
+          [element]
         end
 
         # @!visibility private
@@ -223,12 +255,12 @@ args[0] = #{args[0]}])
 
         # @!visibility private
         def enter_text_with_keyboard(string, options={})
-          client.enter_text(string)
+          client.enter_text_without_keyboard_check(string)
         end
 
         # @!visibility private
         def enter_char_with_keyboard(char)
-          client.enter_text(char)
+          client.enter_text_without_keyboard_check(char)
         end
 
         # @!visibility private
@@ -242,7 +274,7 @@ args[0] = #{args[0]}])
           if mark
             begin
               # The underlying query for coordinates always expects results.
-              value = client.touch({marked: mark})
+              value = client.touch({type: "Button", marked: mark})
               return value
             rescue RuntimeError => _
               RunLoop.log_debug("Cannot find mark '#{mark}' with query; will send a newline")
@@ -252,7 +284,7 @@ args[0] = #{args[0]}])
           end
 
           code = char_for_keyboard_action("Return")
-          client.enter_text(code)
+          client.enter_text_without_keyboard_check(code)
         end
 
         # @!visibility private
@@ -262,7 +294,7 @@ args[0] = #{args[0]}])
 
         # @!visibility private
         def fast_enter_text(text)
-          client.enter_text(text)
+          client.enter_text_without_keyboard_check(text)
         end
 
         # @!visibility private
@@ -353,6 +385,27 @@ Make sure your query returns at least one view.
           end
         end
 
+        # @!visibility private
+        def element_for_device_screen
+          screen_dimensions = device.screen_dimensions
+
+          scale = screen_dimensions[:scale]
+          height = (screen_dimensions[:height]/scale).to_i
+          center_y = (height/2)
+          width = (screen_dimensions[:width]/scale).to_i
+          center_x = (width/2)
+
+          {
+            "screen" => true,
+            "rect" => {
+              "height" => height,
+              "width" => width,
+              "center_x" => center_x,
+              "center_y" => center_y
+            }
+          }
+        end
+
         # @!visibility private
         #
         # Don't change the double quotes.
@@ -400,17 +453,25 @@ Make sure your query returns at least one view.
         # @!visibility private
         def return_key_type_of_first_responder
 
-          ['textField', 'textView'].each do |ui_class|
-            query = "#{ui_class} isFirstResponder:1"
-            raw = Calabash::Cucumber::Map.raw_map(query, :query, :returnKeyType)
-            results = raw["results"]
-            if !results.empty?
-              return results.first
-            end
+          query = "* isFirstResponder:1"
+          raw = Calabash::Cucumber::Map.raw_map(query, :query, :returnKeyType)
+          elements = raw["results"]
+          return nil if elements.count == 0
+
+          return_key_type = elements[0]
+
+          # first responder did not respond to :text selector
+          if return_key_type == "*****"
+            RunLoop.log_debug("First responder does not respond to :returnKeyType")
+            return nil
+          end
+
+          if return_key_type.nil?
+            RunLoop.log_debug("First responder has nil :returnKeyType")
+            return nil
           end
 
-          RunLoop.log_debug("Cannot find keyboard first responder to ask for its returnKeyType")
-          nil
+          return_key_type
         end
 
         # @!visibility private

data/lib/calabash-cucumber/console_helpers.rb

@@ -102,7 +102,9 @@ module Calabash
           "Uti, non abuti.",
           "Non Satis Scire",
           "Nullius in verba",
-          "Det ka æn jå væer ei jált"
+          "Det ka æn jå væer ei jált",
+          "Dzień dobry",
+          "Jestem tu by ocalić świat"
         ]
         puts RunLoop::Color.green("Calabash says, \"#{messages.shuffle.first}\"")
       end
@@ -148,6 +150,19 @@ module Calabash
         puts ""
       end
 
+      # @!visibility private
+      # Do not call this method directly.
+      def _try_to_attach
+        begin
+          Calabash::Cucumber::HTTP.ping_app
+          launcher = Calabash::Cucumber::Launcher.new
+          launcher.attach
+          puts(RunLoop::Color.green("Attached to: #{launcher}"))
+          launcher
+        rescue => _
+        end
+      end
+
       private
 
       # List the visible element with given mark(s).

data/lib/calabash-cucumber/core.rb

@@ -382,13 +382,13 @@ Expected: options[:offset] = {:x => NUMERIC, :y => NUMERIC}
       # @option options {Hash} :offset (nil) optional offset to touch point.
       #  Offset supports an `:x` and `:y` key and causes the touch to be
       #  offset with `(x,y)` relative to the center.
-      # @option options {String} :query (nil) If specified, the swipe will be
-      #  made on the first view matching this query.  If this option is nil
-      #  (the default), the swipe will happen on the first view matched by "*".
       # @option options [Symbol] :force (normal) Indicates the force of the
       #  swipe.  Valid values are :strong, :normal, :light.
+      # @option options {String} :query (nil) If specified, the swipe will be
+      #  made on the first view matching this query.  If this option is nil
+      #  (the default), the swipe will happen at the center of the screen.
       #
-      # @return {Array<Hash>,String} An array with one element; the view that
+      # @return {Array<Hash>} An array with one element; the view that
       #  was swiped.
       #
       # @raise [ArgumentError] If :force is invalid.
@@ -584,20 +584,70 @@ The minimum duration is 0.0.
       end
 
       # Performs a "pinch" gesture.
+      #
       # By default, the gesture starts at the center of the screen.
-      # @todo `pinch` is an old style API which doesn't take a query as its first argument. We should migrate this.
+      #
       # @example
+      #   # Zoom in
       #   pinch :out
-      # @example
+      #
+      #   # Zoom out
       #   pinch :in, query:"MKMapView", offset:{x:42}
-      # @param {String} in_out the direction to pinch ('in' or 'out') (symbols can also be used).
+      #
+      # @param {String, Symbol} in_out the direction to pinch ('in' or 'out')
       # @param {Hash} options option for modifying the details of the touch.
-      # @option options {Hash} :offset (nil) optional offset to touch point. Offset supports an `:x` and `:y` key
-      #   and causes the touch to be offset with `(x,y)` relative to the center (`center + (offset[:x], offset[:y])`).
-      # @option options {String} :query (nil) if specified, the pinch will be made relative to this query.
-      # @return {Array<Hash>,String} array containing the serialized version of the touched view if `options[:query]` is given.
+      # @option options {Hash} :offset (nil) optional offset to touch point.
+      # @option options {String} :query (nil) The view to pinch on.  If this
+      #  value is nil, the pinch happens at the center of the screen.
+      # @option options {Numeric} :amount (100) How large (in points) the
+      #  pinch should be.  This option is ignored when running with UIAutomation.
+      # @option options {Numeric} :duration (1.0) duration of the 'pinch'.  The
+      #  minimum value of pan in UIAutomation is 0.5.  For DeviceAgent, the
+      #  duration must be > 0.
+      # @return {Array<Hash>} array containing the serialized version of
+      #  the view touched.
+      #
+      # @raise [ArgumentError] If duration is < 0.5 for UIAutomation and <= 0
+      #  for DeviceAgent.
+      # @raise [ArgumentError] If in_out argument is invalid.
       def pinch(in_out, options={})
-        launcher.automator.pinch(in_out.to_sym, options)
+        merged_options = {
+          :query => nil,
+          # Ignored by UIAutomation
+          :amount => 100,
+          :duration => 0.5
+        }.merge(options)
+
+        symbol = in_out.to_sym
+
+        if ![:in, :out].include?(symbol)
+          raise ArgumentError, %Q[
+Invalid pinch direction: '#{symbol}'.  Valid directions are:
+
+"in", "out", :in, :out
+
+]
+        end
+
+        duration = merged_options[:duration]
+
+        if uia_available? && duration < 0.5
+          raise ArgumentError, %Q[
+Invalid duration: #{duration}
+
+The minimum duration is 0.5
+
+]
+        elsif duration <= 0.0
+          raise ArgumentError, %Q[
+Invalid duration: #{duration}
+
+The minimum duration is 0.0.
+
+]
+        end
+
+        launcher.automator.pinch(in_out.to_sym, merged_options)
       end
 
       # @deprecated 0.21.0 Use #keyboard_enter_text
@@ -757,7 +807,7 @@ To type strings with more than one character, use keyboard_enter_text.
       # for the keyboard to disappear.
       #
       # @note
-      #  the dismiss keyboard key does not exist on the iPhone or iPod
+      #  The dismiss keyboard key does not exist on the iPhone or iPod
       #
       # @raise [RuntimeError] If the device is not an iPad
       # @raise [Calabash::Cucumber::WaitHelpers::WaitError] If the keyboard does
@@ -802,38 +852,111 @@ Use `ipad?` to branch in your test.
         views_touched
       end
 
+      # Scrolls to a mark in a UIScrollView.
+      #
+      # Make sure your query matches exactly one UIScrollView.  If multiple
+      # scroll views are matched, the results can be unpredictable.
+      #
+      # @example
+      #  scroll_to_mark("settings")
+      #  scroll_to_mark("Android", {:animated => false})
+      #  scroll_to_mark("Alarm", {:query => "UIScrollView marked:'Settings'"})
+      #
+      # @see #scroll_to_row_with_mark
+      # @see #scroll_to_collection_view_item_with_mark
+      #
+      # @param [String] mark an accessibility label or identifier or text
+      # @param [Hash] options controls the query and and scroll behavior
+      # @option options [String] :query ("UIScrollView index:0") A query to
+      #  uniquely identify the scroll view if there are multiple scroll views.
+      # @option options [Boolean] :animate (true) should the scrolling be animated
+      # @option options [String] :failure_message (nil) If nil, a default failure
+      #  message will be shown if this scroll scroll cannot be performed.
+      #
+      # @raise [RuntimeError] If the scroll cannot be performed
+      # @raise [RuntimeError] If the :query finds no scroll view
+      # @raise [ArgumentError] If the mark is nil
+      # @raise [ArgumentError] If the :query value is nil, "", or "*".
+      def scroll_to_mark(mark, options={})
+        if mark.nil?
+          raise ArgumentError, "The mark cannot be nil"
+        end
+
+        merged_options = {:query => "UIScrollView index:0",
+                          :animate => true,
+                          :failure_message => nil}.merge(options)
+
+        uiquery = merged_options[:query]
+
+        if uiquery.nil?
+          raise ArgumentError, "The :query option cannot be nil"
+        end
+
+        if uiquery == ""
+          raise ArgumentError, "The :query option cannot be the empty string"
+        end
+
+        if uiquery == "*"
+          raise ArgumentError, "The :query option cannot be the wildcard '*'"
+        end
+
+        args = [merged_options[:animate]]
+
+        views_touched = Map.map(uiquery, :scrollToMark, mark, *args)
+
+        message = merged_options[:failure_message]
+
+        if !message
+          message = %Q[
+
+Unable to scroll to mark '#{mark}' in UIScrollView matching #{uiquery}"
+
+]
+        end
+
+        Map.assert_map_results(views_touched, message)
+        views_touched
+      end
+
       # Scroll a table view to a row. Table view should have only one section.
+      #
+      # Make sure your query matches exactly one UITableView.  If multiple views
+      # are matched, the results can be unpredictable.
+      #
       # @see #scroll_to_cell
+      #
       # @example
-      #   scroll_to_row "UITableView", 2
-      # @note this is implemented by calling the Obj-C `scrollToRowAtIndexPath:atScrollPosition:animated:` method
-      #   and can do things users cant.
+      #   scroll_to_row "UITableView index:0", 2
       #
-      # @param {String} uiquery query describing view scroll (should be  UIScrollView or a web view).
+      # @param {String} uiquery Should match a UITableView
       def scroll_to_row(uiquery, number)
         views_touched = Map.map(uiquery, :scrollToRow, number)
-        msg = "unable to scroll: '#{uiquery}' to: #{number}"
+        msg = "Unable to scroll to row #{number} in table view with '#{uiquery}'"
         Map.assert_map_results(views_touched, msg)
         views_touched
       end
 
-      # Scroll a table view to a section and row. Table view can have multiple sections.
+      # Scroll a table view to a section and row.
+      #
+      # Make sure your query matches exactly one UITableView.  If multiple views
+      # are matched, the results can be unpredictable.
       #
       # @todo should expose a non-option first argument query and required parameters `section`, `row`
       #
       # @see #scroll_to_row
       # @example
-      #   scroll_to_cell query:"UITableView", row:4, section:0, animate: false
-      # @note this is implemented by calling the Obj-C `scrollToRowAtIndexPath:atScrollPosition:animated:` method
-      #   and can do things users cant.
+      #   scroll_to_cell  row:4, section:0, animate: false
       #
       # @param {Hash} options specifies details of the scroll
-      # @option options {String} :query ('tableView') query specifying which table view to scroll
+      # @option options {String} :query ("UITableView index:0") query specifying
+      #   which table view to scroll
       # @option options {Fixnum} :section section to scroll to
       # @option options {Fixnum} :row row to scroll to
       # @option options {String} :scroll_position position to scroll to
       # @option options {Boolean} :animated (true) animate or not
-      def scroll_to_cell(options={:query => 'tableView',
+      # @raise [ArgumentError] If row or section is nil
+      # @raise [ArgumentError] If the :query value is nil, "", or "*".
+      def scroll_to_cell(options={:query => "UITableView index:0",
                                   :row => 0,
                                   :section => 0,
                                   :scroll_position => :top,
@@ -841,8 +964,8 @@ Use `ipad?` to branch in your test.
         uiquery = options[:query] || 'tableView'
         row = options[:row]
         sec = options[:section]
-        if row.nil? or sec.nil?
-          raise 'You must supply both :row and :section keys to scroll_to_cell'
+        if row.nil? || sec.nil?
+          raise ArgumentError, 'You must supply both :row and :section keys to scroll_to_cell'
         end
 
         args = []
@@ -862,14 +985,16 @@ Use `ipad?` to branch in your test.
 
       # Scrolls to a mark in a UITableView.
       #
+      # Make sure your query matches exactly one UITableView.  If multiple
+      # views are matched, the results can be unpredictable.
+      #
       # @example Scroll to the top of the item with the given mark.
       #  scroll_to_row_with_mark('settings', {:scroll_position => :top})
       #
       # @example Scroll to the bottom of the item with the given mark.
       #  scroll_to_row_with_mark('about', {:scroll_position => :bottom})
       #
-      # @param [String] mark an accessibility `{label | identifier}` or text in
-      #  or on the row
+      # @param [String] mark an accessibility label or identifier or text in row
       # @param [Hash] options controls the query and and scroll behavior
       #
       # @option options [String] :query ('tableView')
@@ -879,38 +1004,64 @@ Use `ipad?` to branch in your test.
       #  `{:middle | :top | :bottom}`
       # @option options [Boolean] :animate (true)
       #  should the scrolling be animated
+      # @option options [String] :failure_message (nil) If nil, a default failure
+      #  message will be shown if this scroll scroll cannot be performed.
       #
       # @raise [RuntimeError] if the scroll cannot be performed
-      # @raise [RuntimeError] if the mark is nil
       # @raise [RuntimeError] if the table query finds no table view
       # @raise [RuntimeError] if the scroll position is invalid
-      def scroll_to_row_with_mark(mark, options={:query => 'tableView',
-                                                 :scroll_position => :middle,
-                                                 :animate => true})
+      # @raise [ArgumentError] if the mark is nil
+      # @raise [ArgumentError] If the :query value is nil, "", or "*".
+      def scroll_to_row_with_mark(mark, options={})
+        merged_options = {:query => "UITableView index:0",
+                          :scroll_position => :middle,
+                          :animate => true,
+                          :failure_message => nil}.merge(options)
+
         if mark.nil?
-          screenshot_and_raise 'mark argument cannot be nil'
+          raise ArgumentError, "The mark cannot be nil"
         end
 
-        uiquery = options[:query] || 'tableView'
+        uiquery = merged_options[:query]
 
-        args = []
-        if options.has_key?(:scroll_position)
-          args << options[:scroll_position]
-        else
-          args << 'middle'
+        if uiquery.nil?
+          raise ArgumentError, "The :query option cannot be nil"
         end
-        if options.has_key?(:animate)
-          args << options[:animate]
+
+        if uiquery == ""
+          raise ArgumentError, "The :query option cannot be the empty string"
         end
 
+        if uiquery == "*"
+          raise ArgumentError, "The :query option cannot be the wildcard '*'"
+        end
+
+        args = [merged_options[:scroll_position], merged_options[:animate]]
+
         views_touched = Map.map(uiquery, :scrollToRowWithMark, mark, *args)
-        msg = options[:failed_message] || "Unable to scroll: '#{uiquery}' to: #{options}"
-        Map.assert_map_results(views_touched, msg)
+
+        message = merged_options[:failure_message]
+        if !message
+          message = %Q[
+Unable to scroll to mark: '#{mark}' in table view matched by query:
+
+#{uiquery}
+
+with options:
+
+#{merged_options}
+
+]
+        end
+        Map.assert_map_results(views_touched, message)
         views_touched
       end
 
       # Scrolls to an item in a section of a UICollectionView.
       #
+      # Make sure your query matches exactly one UICollectionView.  If multiple
+      # views are matched, the results can be unpredictable.
+      #
       # @note item and section are zero-indexed
       #
       # @example Scroll to item 0 in section 2 to top.
@@ -922,12 +1073,12 @@ Use `ipad?` to branch in your test.
       # @example The following are the allowed :scroll_position values.
       #  {:top | :center_vertical | :bottom | :left | :center_horizontal | :right}
       #
-      # @param [Integer] item the index of the item to scroll to
-      # @param [Integer] section the section of the item to scroll to
-      # @param [Hash] opts options for controlling the collection view query
+      # @param [Integer] item_index the index of the item to scroll to.  Must be >= 0.
+      # @param [Integer] section_index the section of the item to scroll to. Must be > 0.
+      # @param [Hash] options options for controlling the collection view query
       #  and scroll behavior
       #
-      # @option opts [String] :query ('collectionView')
+      # @option opts [String] :query ("UICollectionView index:0")
       #  the query that is used to identify which collection view to scroll
       #
       # @option opts [Symbol] :scroll_position (top)
@@ -936,46 +1087,86 @@ Use `ipad?` to branch in your test.
       # @option opts [Boolean] :animate (true)
       #  should the scrolling be animated
       #
-      # @option opts [String] :failed_message (nil)
+      # @option opts [String] :failure_message (nil)
       #  a custom error message to display if the scrolling fails - if not
       #  specified, a generic failure will be displayed
       #
       # @raise [RuntimeError] if the scroll cannot be performed
       # @raise [RuntimeError] :query finds no collection view
       # @raise [RuntimeError] the collection view does not contain a cell at item/section
-      # @raise [RuntimeError] :scroll_position is invalid
-      def scroll_to_collection_view_item(item, section, opts={})
-        default_options = {:query => 'collectionView',
+      # @raise [ArgumentError] :scroll_position is invalid
+      # @raise [ArgumentError] item or section is < 0.
+      # @raise [ArgumentError] If the :query value is nil, "", or "*".
+      def scroll_to_collection_view_item(item_index, section_index, options={})
+        default_options = {:query => "UICollectionView index:0",
                            :scroll_position => :top,
                            :animate => true,
-                           :failed_message => nil}
-        opts = default_options.merge(opts)
-        uiquery = opts[:query]
+                           :failure_message => nil}
+        merged_options = default_options.merge(options)
+        uiquery = merged_options[:query]
+
+        if uiquery.nil?
+          raise ArgumentError, "The :query option cannot be nil"
+        end
+
+        if uiquery == ""
+          raise ArgumentError, "The :query option cannot be the empty string"
+        end
+
+        if uiquery == "*"
+          raise ArgumentError, "The :query option cannot be the wildcard '*'"
+        end
+
+        if item_index < 0
+          raise ArgumentError, "Invalid item index: '#{item_index}' - must be >= 0"
+        end
+
+        if section_index < 0
+          raise ArgumentError, "Invalid section index: '#{section_index}' - must be >= 0"
+        end
 
-        scroll_position = opts[:scroll_position]
+        scroll_position = merged_options[:scroll_position]
         candidates = [:top, :center_vertical, :bottom, :left, :center_horizontal, :right]
-        unless candidates.include?(scroll_position)
-          raise "scroll_position '#{scroll_position}' is not one of '#{candidates}'"
+        if !candidates.include?(scroll_position)
+          raise ArgumentError, %Q[
+
+Invalid :scroll_position option '#{scroll_position}'.  Valid options are:
+
+#{candidates.join(", ")}
+
+          ]
         end
 
-        animate = opts[:animate]
+        animate = merged_options[:animate]
 
         views_touched = Map.map(uiquery, :collectionViewScroll,
-                                item.to_i, section.to_i,
+                                item_index.to_i, section_index.to_i,
                                 scroll_position, animate)
 
-        if opts[:failed_message]
-          msg = opts[:failed_message]
-        else
-          msg = "unable to scroll: '#{uiquery}' to item '#{item}' in section '#{section}'"
+        message = merged_options[:failure_message]
+        if !message
+          message = %Q[
+Unable to scroll to item index '#{item_index}' in section index '#{section_index}'
+in CollectionView matched by:
+
+#{uiquery}
+
+with options:
+
+#{merged_options}
+
+]
         end
 
-        Map.assert_map_results(views_touched, msg)
+        Map.assert_map_results(views_touched, message)
         views_touched
       end
 
       # Scrolls to mark in a UICollectionView.
       #
+      # Make sure your query matches exactly one UICollectionView.  If multiple
+      # views are matched, the results can be unpredictable.
+      #
       # @example Scroll to the top of the item with the given mark.
       #  scroll_to_collection_view_item_with_mark('cat', {:scroll_position => :top})
       #
@@ -987,7 +1178,7 @@ Use `ipad?` to branch in your test.
       #
       # @param [String] mark an accessibility `{label | identifier}` or text in
       #  or on the item
-      # @param [Hash] opts options for controlling the collection view query
+      # @param [Hash] options options for controlling the collection view query
       #  and scroll behavior
       #
       # @option opts [String] :query ('collectionView')
@@ -996,43 +1187,74 @@ Use `ipad?` to branch in your test.
       #   the position in the collection view to scroll the item to
       # @option opts [Boolean] :animate (true) should the scroll
       #   be animated
-      # @option opts [String] :failed_message (nil)
-      #  a custom error message to display if the scrolling fails - if not
-      #  specified, a generic failure will be displayed
+      # @option opts [String] :failure_message (nil) a custom error message to
+      #   display if the scrolling fails - if not specified, a generic failure
+      #   will be displayed
       #
       # @raise [RuntimeError] if the scroll cannot be performed
-      # @raise [RuntimeError] if the mark is nil
       # @raise [RuntimeError] :query finds no collection view
       # @raise [RuntimeError] the collection view does not contain a cell
       #  with the mark
       # @raise [RuntimeError] :scroll_position is invalid
-      def scroll_to_collection_view_item_with_mark(mark, opts={})
-        default_options = {:query => 'collectionView',
+      # @raise [ArgumentError] If the :query value is nil, "", or "*".
+      # @raise [ArgumentError] if the mark is nil
+      def scroll_to_collection_view_item_with_mark(mark, options={})
+        default_options = {:query => "UICollectionView index:0",
                            :scroll_position => :top,
                            :animate => true,
-                           :failed_message => nil}
-        opts = default_options.merge(opts)
-        uiquery = opts[:query]
+                           :failure_message => nil}
+        merged_options = default_options.merge(options)
+        uiquery = merged_options[:query]
 
         if mark.nil?
-          raise 'mark argument cannot be nil'
+          raise ArgumentError, "The mark cannot be nil"
         end
 
-        args = []
-        scroll_position = opts[:scroll_position]
+        if uiquery.nil?
+          raise ArgumentError, "The :query option cannot be nil"
+        end
+
+        if uiquery == ""
+          raise ArgumentError, "The :query option cannot be the empty string"
+        end
+
+        if uiquery == "*"
+          raise ArgumentError, "The :query option cannot be the wildcard '*'"
+        end
+
+        scroll_position = merged_options[:scroll_position]
         candidates = [:top, :center_vertical, :bottom, :left, :center_horizontal, :right]
-        unless candidates.include?(scroll_position)
-          raise "scroll_position '#{scroll_position}' is not one of '#{candidates}'"
+        if !candidates.include?(scroll_position)
+          raise ArgumentError, %Q[
+
+Invalid :scroll_position option '#{scroll_position}'.  Valid options are:
+
+#{candidates.join(", ")}
+
+          ]
         end
 
-        args << scroll_position
-        args << opts[:animate]
+        args = [scroll_position, merged_options[:animate]]
 
-        views_touched = Map.map(uiquery, :collectionViewScrollToItemWithMark,
+        views_touched = Map.map(uiquery,
+                                :collectionViewScrollToItemWithMark,
                                 mark, *args)
 
-        msg = opts[:failed_message] || "Unable to scroll: '#{uiquery}' to cell with mark: '#{mark}' with #{opts}"
-        Map.assert_map_results(views_touched, msg)
+        message = merged_options[:failure_message]
+        if !message
+          message = %Q[
+Unable to scroll to item with mark '#{mark}' in UICollectionView matching query:
+
+#{uiquery}
+
+with options:
+
+#{merged_options}
+
+]
+        end
+
+        Map.assert_map_results(views_touched, message)
         views_touched
       end
 

data/lib/calabash-cucumber/device.rb

@@ -239,6 +239,12 @@ module Calabash
         ios_version_object.major.to_s
       end
 
+      # Is this device running iOS 10?
+      # @return [Boolean] true if the major version of the OS is 10
+      def ios10?
+        ios_version_object.major == 10
+      end
+
       # Is this device running iOS 9?
       # @return [Boolean] true if the major version of the OS is 9
       def ios9?

data/lib/calabash-cucumber/device_agent.rb

@@ -24,7 +24,7 @@ module Calabash
         @world = world
       end
 
-      # @!visibility private
+      # Query the UI for elements.
       #
       # @example
       #  query({id: "login", :type "Button"})
@@ -126,7 +126,7 @@ module Calabash
       #
       # @raise [RuntimeError] if no view matches the uiquery after waiting.
       def query_for_coordinate(uiquery)
-        fail_with_screenshot { client.query_for_coordinate(uiquery) }
+        with_screenshot_on_failure { client.query_for_coordinate(uiquery) }
       end
 
       # Perform a touch on the center of the first view matched the uiquery.
@@ -140,7 +140,7 @@ module Calabash
       #
       # @raise [RuntimeError] if no view matches the uiquery after waiting.
       def touch(uiquery)
-        fail_with_screenshot { client.touch(uiquery) }
+        with_screenshot_on_failure { client.touch(uiquery) }
       end
 
       # Perform a touch at a coordinate.
@@ -173,7 +173,7 @@ module Calabash
       #
       # @raise [RuntimeError] if no view matches the uiquery after waiting.
       def double_tap(uiquery)
-        fail_with_screenshot { client.double_tap(uiquery) }
+        with_screenshot_on_failure { client.double_tap(uiquery) }
       end
 
       # Perform a two finger tap on the center of the first view matched the uiquery.
@@ -187,7 +187,7 @@ module Calabash
       #
       # @raise [RuntimeError] if no view matches the uiquery after waiting.
       def two_finger_tap(uiquery)
-        fail_with_screenshot { client.two_finger_tap(uiquery) }
+        with_screenshot_on_failure { client.two_finger_tap(uiquery) }
       end
 
       # Perform a long press on the center of the first view matched the uiquery.
@@ -202,7 +202,7 @@ module Calabash
       #
       # @raise [RuntimeError] if no view matches the uiquery after waiting.
       def long_press(uiquery, duration)
-        fail_with_screenshot { client.long_press(uiquery, {:duration => duration}) }
+        with_screenshot_on_failure { client.long_press(uiquery, {:duration => duration}) }
       end
 
       # Returns true if there is a keyboard visible.
@@ -228,7 +228,7 @@ module Calabash
       # @raise [RuntimeError] if there is no visible keyboard.
       # @deprecated 0.21.0 Use Core#enter_text
       def enter_text(text)
-        fail_with_screenshot { client.enter_text(text) }
+        with_screenshot_on_failure { client.enter_text(text) }
       end
 
       # Enter text into the first view matched by uiquery.
@@ -244,7 +244,7 @@ module Calabash
       #
       # @deprecated 0.21.0 Use Core#enter_text
       def enter_text_in(uiquery, text)
-        fail_with_screenshot do
+        with_screenshot_on_failure do
           client.touch(uiquery)
           client.wait_for_keyboard
           client.enter_text(text)
@@ -311,20 +311,6 @@ module Calabash
         client.springboard_alert
       end
 
-=begin
-PROTECTED
-=end
-      protected
-
-      # @!visibility private
-      def method_missing(name, *args, &block)
-        if world.respond_to?(name)
-          world.send(name, *args, &block)
-        else
-          super
-        end
-      end
-
 =begin
 PRIVATE
 =end
@@ -334,7 +320,7 @@ PRIVATE
       attr_reader :client, :world
 
       # @!visibility private
-      def fail_with_screenshot(&block)
+      def with_screenshot_on_failure(&block)
         begin
           block.call
         rescue => e

data/lib/calabash-cucumber/environment_helpers.rb

@@ -192,6 +192,14 @@ module Calabash
        _default_device_or_create.ios9?
       end
 
+      # Is the device under test running iOS 10?
+      #
+      # @raise [RuntimeError] if the server cannot be reached
+      # @return [Boolean] true if device under test is running iOS 9
+      def ios10?
+       _default_device_or_create.ios10?
+      end
+
       # Is the app that is being tested an iPhone app emulated on an iPad?
       #
       # @see Calabash::Cucumber::IPad

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -173,14 +173,19 @@ module Calabash
           screenshot_and_raise "There must be a visible keyboard"
         end
 
-        ['textField', 'textView'].each do |ui_class|
-          query = "#{ui_class} isFirstResponder:1"
-          result = _query_wrapper(query, :text)
-          if !result.empty?
-            return result.first
-          end
-        end
-        ""
+        query = "* isFirstResponder:1"
+        elements = _query_wrapper(query, :text)
+
+        return "" if elements.count == 0
+
+        text = elements[0]
+
+        # first responder did not respond to :text selector
+        return "" if text == "*****"
+
+        return "" if text.nil?
+
+        text
       end
 
       # @visibility private

data/lib/calabash-cucumber/launcher.rb

@@ -132,11 +132,11 @@ module Calabash
       #
       # +1 for tools to ask physical devices about attributes.
       def device
-        @device ||= lambda do
+        @device ||= begin
           _, body = Calabash::Cucumber::HTTP.ensure_connectivity
           endpoint = Calabash::Cucumber::Environment.device_endpoint
           Calabash::Cucumber::Device.new(endpoint, body)
-        end.call
+        end
       end
 
       # @!visibility private
@@ -170,20 +170,6 @@ module Calabash
                            :http_connection_timeout => 10}
         merged_options = default_options.merge(options)
 
-        @run_loop = RunLoop::HostCache.default.read
-
-        if @run_loop[:automator] == :device_agent
-          # TODO Attach to DeviceAgent - run-loop supports this!
-          # TODO Rewrite UIA methods to raise in the context of UIA
-          raise RuntimeError, %Q[
-
-Cannot attach to DeviceAgent automator.
-
-This behavior is not implemented yet.
-
-]
-        end
-
         begin
           Calabash::Cucumber::HTTP.ensure_connectivity(merged_options)
         rescue Calabash::Cucumber::ServerNotRespondingError => _
@@ -207,13 +193,22 @@ Try `start_test_server_in_background`
           return false
         end
 
-        if run_loop[:pid]
-          @automator = Calabash::Cucumber::Automator::Instruments.new(run_loop)
+        # TODO check that the :pid is alive - no sense attaching if Automator
+        # is not running.
+        run_loop_cache = RunLoop::HostCache.default.read
+
+        if run_loop_cache[:automator] == :device_agent
+          # Sets the @run_loop variable to a new RunLoop::DeviceAgent::Client
+          # instance.
+          @automator = _attach_to_device_agent!(run_loop_cache)
+        elsif run_loop_cache[:automator] == :instruments
+          @run_loop = run_loop_cache
+          @automator = Calabash::Cucumber::Automator::Instruments.new(run_loop_cache)
         else
           RunLoop.log_warn(
 %Q[
 
-Connected to an app that was not launched by Calabash using instruments.
+Connected to an app that was not launched by Calabash using instruments or DeviceAgent.
 
 Queries will work, but gestures and other automator actions will not.
 
@@ -627,6 +622,28 @@ true.  Please remove this method call from your hooks.
           value
         end
       end
+
+      # @!visibility private
+      def _attach_to_device_agent!(hash)
+        simctl = Calabash::Cucumber::Environment.simctl
+        instruments = Calabash::Cucumber::Environment.instruments
+        xcode = Calabash::Cucumber::Environment.xcode
+
+        options = { simctl: simctl, instruments: instruments, xcode: xcode}
+        device = RunLoop::Device.device_with_identifier(hash[:udid], options)
+        bundle_id = hash[:app]
+
+        options = { cbx_launcher: hash[:launcher] }
+        cbx_launcher = RunLoop::DeviceAgent::Client.detect_cbx_launcher(options, device)
+        launcher_options = hash[:launcher_options]
+
+        device_agent_client = RunLoop::DeviceAgent::Client.new(bundle_id,
+                                                               device,
+                                                               cbx_launcher,
+                                                               launcher_options)
+        @run_loop = device_agent_client
+        Calabash::Cucumber::Automator::DeviceAgent.new(@run_loop)
+      end
     end
   end
 end

data/lib/calabash-cucumber/map.rb

@@ -145,7 +145,7 @@ details: #{hash["details"]}
       def self.assert_map_results(map_results, msg)
         compact = map_results.compact
         if compact.empty? or compact.member? '<VOID>' or compact.member? '*****'
-          Map.new.screenshot_and_raise msg
+          self.map_factory.screenshot_and_raise msg
         end
       end
 

data/lib/calabash-cucumber/usage_tracker.rb

@@ -163,7 +163,7 @@ module Calabash
         hash = {
           :event_name => "session",
           :data_version => DATA_VERSION,
-          :user_id => user_id
+          :distinct_id => user_id
         }
 
         if allowed == "system_info"
@@ -178,6 +178,9 @@ module Calabash
               :used_cucumber => used_cucumber?,
 
               :version => Calabash::Cucumber::VERSION,
+              :run_loop_version => RunLoop::VERSION,
+
+              :xcode_version => RunLoop::Xcode.new.version,
 
               :ci => RunLoop::Environment.ci?,
               :jenkins => RunLoop::Environment.jenkins?,

data/lib/calabash-cucumber/version.rb

@@ -3,10 +3,10 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = "0.20.0"
+    VERSION = "0.20.3"
 
     # @!visibility public
     # The minimum required version of the Calabash embedded server.
-    MIN_SERVER_VERSION = "0.20.0"
+    MIN_SERVER_VERSION = "0.20.3"
   end
 end

data/scripts/.irbrc

@@ -89,3 +89,4 @@ Calabash::Cucumber::UIA.redefine_instance_methods_if_necessary(xcode)
 
 puts_console_details
 puts_message_of_the_day
+_try_to_attach

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.3
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.7.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -94,7 +94,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.7.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -142,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -286,6 +286,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement