calabash-cucumber 0.21.4 → 0.21.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47062da2a6696fc997c91dcceb968781b69e4b74
-  data.tar.gz: 3e3be7398ac0910b76fe161c36e51f21fd0d495c
+  metadata.gz: b7dfee76ce28e4b2e416e448dac9e7e23982c776
+  data.tar.gz: 068aa05c346dd2246aa432ea2f14e401fcb98f04
 SHA512:
-  metadata.gz: 1f23f97f83b6292d6114bf6d8ca2215a43ab74e86354a96aa5ac90fed75cb2c6b123a60ffbf39092556dc0d3739866d42f355803ae8e85b14383b87ce05c76d5
-  data.tar.gz: 5953b4bc82d80d392d657d2055d74634f8327008f925a99bb928ccb51d872a1a9e73c59f855d051f70813410386b6e8f79e6f5dffa22409611c15d91799d7305
+  metadata.gz: eb268b9620002b1d5400254492682a19bc1e60eb973387faabe9b4097c5e35e2d0ea54834c275c27c99e3848bdaa288341218702e88c829730be247fe733dfaa
+  data.tar.gz: faeec233cb862347585781cec66c866c0f6da97777435114d7ccd961babd92a1613b76467cfee1ef4300f9bf9bfb2b0ca872c6f09a276754bd53864886a38e54

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

@@ -206,11 +206,13 @@ args[0] = #{args[0]}])
           to_point = to_hash[:coordinates]
 
           gesture_options = {
-            :duration => dupped_options[:duration]
+            duration: dupped_options[:duration],
+            num_fingers: dupped_options.fetch(:num_fingers, 1),
+            first_touch_hold_duration:
+              dupped_options.fetch(:first_touch_hold_duration, 0.0)
           }
 
-          client.pan_between_coordinates(from_point, to_point,
-                                         gesture_options)
+          client.pan_between_coordinates(from_point, to_point, gesture_options)
 
           [from_hash[:view], to_hash[:view]]
         end
@@ -219,11 +221,13 @@ args[0] = #{args[0]}])
         def pan_coordinates(from_point, to_point, options)
 
           gesture_options = {
-            :duration => options[:duration]
+            duration: options[:duration],
+            num_fingers: options.fetch(:num_fingers, 1),
+            first_touch_hold_duration:
+              options.fetch(:first_touch_hold_duration, 0.0)
           }
 
-          client.pan_between_coordinates(from_point, to_point,
-                                         gesture_options)
+          client.pan_between_coordinates(from_point, to_point, gesture_options)
           [first_element_for_query("*")]
         end
 

data/lib/calabash-cucumber/core.rb

@@ -490,6 +490,9 @@ Valid forces are: :strong, :normal, :light
       # @option options {Numeric} :duration (1.0) duration of the 'pan'.  The
       #  minimum value of pan in UIAutomation is 0.5.  For DeviceAgent, the
       #  duration must be > 0.
+      # @option options {Numeric} :first_touch_hold_duration (0.0) How long the
+      #  first touch holds before starting the pan.  Only available for iOS 9
+      #  or greater (requires DeviceAgent)
       # @return {Array<Hash>} array containing the serialized version of the
       #  touched views.  The first element is the first view matched by
       #  the from_query and the second element is the first view matched by
@@ -522,6 +525,8 @@ The minimum duration is 0.0.
 ]
         end
 
+        # TODO validate first_touch_hold_duration
+
         launcher.automator.pan(from_query, to_query, merged_options)
       end
 
@@ -551,6 +556,9 @@ The minimum duration is 0.0.
       # @option options {Numeric} :duration (1.0) duration of the 'pan'.  The
       #  minimum value of pan in UIAutomation is 0.5.  For DeviceAgent, the
       #  duration must be > 0.
+      # @option options {Numeric} :first_touch_hold_duration (0.0) How long the
+      #  first touch holds before starting the pan. Only available for iOS 9 or
+      #  greater (requires DeviceAgent).
       #
       # @raise [ArgumentError] If duration is < 0.5 for UIAutomation and <= 0
       #  for DeviceAgent.
@@ -579,8 +587,9 @@ The minimum duration is 0.0.
 ]
         end
 
-        launcher.automator.pan_coordinates(from_point, to_point,
-                                           merged_options)
+        # TODO validate first_touch_hold_duration
+
+        launcher.automator.pan_coordinates(from_point, to_point, merged_options)
       end
 
       # Performs a "pinch" gesture.

data/lib/calabash-cucumber/device_agent.rb

@@ -232,6 +232,55 @@ module Calabash
         with_screenshot_on_failure { client.long_press(uiquery, {:duration => duration}) }
       end
 
+      # Wait for text to appear in a view matched by uiquery.
+      #
+      # @param [Hash] text the text to wait for (exact match)
+      # @param [Hash] uiquery query for the view in which the text should appear
+      # @param [Hash] options control the timeout
+      # @option options [Numeric] :timeout How long to wait for the query to
+      #  match a view and the text to appear in that view.
+      #
+      # @raise [Timeout::Error] when no match appears before the timeout
+      # @return The first view that matches uiquery and contains text
+      def wait_for_text_in_view(text, uiquery, options={})
+        value = nil
+        with_screenshot_on_failure do
+          value = client.wait_for_text_in_view(text, uiquery, options)
+        end
+        value
+      end
+
+      # Wait for view to match uiquery.
+      #
+      # @param [Hash] uiquery the query
+      # @param [Hash] options control the timeout
+      # @option options [Numeric] :timeout How long to wait for the query to
+      #  match a view and the text to appear in that view.
+      #
+      # @raise [Timeout::Error] when no match appears before the timeout
+      # @return The first view that matches uiquery
+      def wait_for_view(uiquery, options={})
+        value = nil
+        with_screenshot_on_failure do
+          value = client.wait_for_view(uiquery, options)
+        end
+        value
+      end
+
+      # Wait for no view to match uiquery.
+      #
+      # @param [Hash] uiquery the query
+      # @param [Hash] options control the timeout
+      # @option options [Numeric] :timeout How long to wait for the query to
+      #  match a view and the text to appear in that view.
+      #
+      # @raise [Timeout::Error] when there is a view that matches uiquery
+      def wait_for_no_view(uiquery, options={})
+        with_screenshot_on_failure do
+          client.wait_for_no_view(uiquery, options)
+        end
+      end
+
       # Returns true if there is a keyboard visible.
       #
       # Scheduled for removal in 0.21.0.  Use Core#keyboard_visible?. If you

data/lib/calabash-cucumber/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.21.4
+  version: 0.21.5
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.6.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -142,7 +142,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: 2.6.6
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'