calabash-cucumber 0.9.168 → 0.9.169.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 263716c55576ea9c83ca12e9a10083e353301ee3
-  data.tar.gz: fd0034d17b171b8d35312c4bcd09c5bb54cd3463
+  metadata.gz: c860c07a3b899e7aa1ee325f1dfc8bcd047ae2e6
+  data.tar.gz: 564980de6ded2290c81e2b6c6348ce2f649e553c
 SHA512:
-  metadata.gz: 5f131a4bbbb06af009c2318a847896808571c1a85ffc7351b5ebfef7f1e786779023d55c07558a2a55ec6c59f531f022645f9cd3312dd8bd9e8c5718f0429770
-  data.tar.gz: 2f520f3726a0d6459965657de66ff7f4c963da559bad85c40c6a2008b9d5298fb370e93f591ab3c479cc022962215f6839a736c1ea5893250cf549cf1c0276f3
+  metadata.gz: b08713ae250a8b54b24e05f89a4b41f015f6483932289a2b4f0806260d90c6d0ada14773afe9acac2026beaf003d04f9246597efea055a771eb080cf48fa1b62
+  data.tar.gz: 735c45b24c1bdd1dd67a89653f8a31397542426352b6fbde2b638ff59e457839f7ac55005b371a4d4fa449473b8cce19a9237126d74cde1439d656d4214fcc9d

data/lib/calabash-cucumber/actions/instruments_actions.rb

@@ -13,6 +13,10 @@ class Calabash::Cucumber::InstrumentsActions
     query_action(options, :uia_tap_offset)
   end
 
+  def tap(options)
+    uia_tap_server(options[:query], options)
+  end
+
   def double_tap(options)
     query_action(options, :uia_double_tap_offset)
   end

data/lib/calabash-cucumber/actions/playback_actions.rb

@@ -13,6 +13,10 @@ class Calabash::Cucumber::PlaybackActions
     playback('touch', options)
   end
 
+  def tap(options)
+    touch(options)
+  end
+
   def double_tap(options)
     playback('double_tap', options)
   end

data/lib/calabash-cucumber/core.rb

@@ -39,6 +39,10 @@ module Calabash
         map(uiquery, :query, *args)
       end
 
+      def q(uiquery, *args)
+        query(uiquery, *args)
+      end
+
       # causes all views matched by the +query+ to briefly change colors making
       # them visually identifiable.
       #
@@ -74,6 +78,16 @@ module Calabash
         query_action_with_options(:touch, uiquery, options)
       end
 
+      def tap_q(uiquery, options={})
+        _uiquery, options = extract_query_and_options(uiquery, options)
+        launcher.actions.tap(options)
+      end
+
+      def t(uiquery, options={})
+        tap_q(uiquery, options)
+      end
+
+
       def double_tap(uiquery, options={})
         query_action_with_options(:double_tap, uiquery, options)
       end

data/lib/calabash-cucumber/launch/simulator_helper.rb

@@ -108,8 +108,10 @@ module Calabash
             msg << "Alternatively you can use the environment variable APP_BUNDLE_PATH.\n"
             raise msg.join("\n")
           else
-            puts "Found potential build dir: #{build_dirs.first}"
-            puts "Checking..."
+            if FULL_CONSOLE_OUTPUT
+              puts "Found potential build dir: #{build_dirs.first}"
+              puts "Checking..."
+            end
             return build_dirs.first
           end
         end

data/lib/calabash-cucumber/operations.rb

@@ -64,6 +64,10 @@ module Calabash
         simple_touch(label, *args)
       end
 
+      def tap_mark(label, *args)
+        simple_touch(label, *args)
+      end
+
       def html(q)
         query(q).map { |e| e['html'] }
       end

data/lib/calabash-cucumber/uia.rb

@@ -16,6 +16,15 @@ module Calabash
         res['results'].first
       end
 
+      def uia_tap_server(query, options={})
+        res = http({:method => :post, :path => 'uia-tap'}, {:query => query}.merge(options))
+        res = JSON.parse(res)
+        if res['outcome'] != 'SUCCESS'
+          raise "uia-tap action failed because: #{res['reason']}\n#{res['details']}"
+        end
+        res['results'].first
+      end
+
       def uia_query(*queryparts)
         #TODO escape '\n etc in query
         uia_handle_command(:query, queryparts)

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.168'
-    FRAMEWORK_VERSION = '0.9.168'
+    VERSION = '0.9.169.pre2'
+    FRAMEWORK_VERSION = '0.9.169.pre2'
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -8,6 +8,8 @@ module Calabash
       include Calabash::Cucumber::Core
       include Calabash::Cucumber::TestsHelpers
 
+      CLIENT_TIMEOUT_ADDITION = 5
+
       class WaitError < RuntimeError
       end
 
@@ -112,8 +114,11 @@ module Calabash
       end
 
       def wait_for_condition(options = {})
-        options[:timeout] = options[:timeout] || 30
-        options[:query] = options[:query] || "view"
+        timeout = options[:timeout]
+        unless timeout && timeout > 0
+          timeout = 30
+        end
+        options[:query] = options[:query] || '*'
         if options.has_key?(:condition)
           opt_condition = options[:condition]
           if opt_condition.is_a?(Symbol)
@@ -125,22 +130,23 @@ module Calabash
         end
         options[:condition] = options[:condition] || CALABASH_CONDITIONS[:none_animating]
         options[:post_timeout] = options[:post_timeout] || 0
-        options[:frequency] = options[:frequency] || 0.3
-        retry_frequency = options[:retry_frequency] = options[:retry_frequency] || 0.3
-        options[:count] = options[:count] || 2
-        timeout_message = options[:timeout_message] = options[:timeout_message] || "Timeout waiting for condition (#{options[:condition]})"
-        screenshot_on_error = options[:screenshot_on_error] = options[:screenshot_on_error] || true
+
+        retry_frequency = options[:frequency] = options[:frequency] || 0.2
+        timeout_message = options[:timeout_message] = options[:timeout_message] || "Timeout waiting (#{options[:timeout]}) for condition (#{options[:condition]})"
+        screenshot_on_error = true
+        if options.key?(:screenshot_on_error)
+          screenshot_on_error = options[:screenshot_on_error]
+        end
 
         begin
-          Timeout::timeout(options[:timeout],WaitError) do
-            loop do
+          Timeout::timeout(timeout+CLIENT_TIMEOUT_ADDITION, WaitError) do
               res = http({:method => :post, :path => 'condition'},
                          options)
               res = JSON.parse(res)
-              break if res['outcome'] == 'SUCCESS'
-              sleep(options[:retry_frequency]) if options[:retry_frequency] > 0
-            end
-            sleep(options[:post_timeout]) if options[:post_timeout] > 0
+              unless res['outcome'] == 'SUCCESS'
+                raise WaitError.new(res['reason'])
+              end
+              sleep(options[:post_timeout]) if options[:post_timeout] > 0
           end
         rescue WaitError => e
           msg = timeout_message || e
@@ -156,7 +162,7 @@ module Calabash
             raise wait_error(msg)
           end
         rescue Exception => e
-          handle_error_with_options(e,nil, options[:screenshot_on_error])
+          handle_error_with_options(e,nil, screenshot_on_error)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.168
+  version: 0.9.169.pre2
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -384,12 +384,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS