calabash-cucumber 0.9.84 → 0.9.85

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-cucumber (0.9.84)
+    calabash-cucumber (0.9.85)
       CFPropertyList
       cucumber
       json

data/features/step_definitions/calabash_steps.rb

@@ -1,4 +1,4 @@
-WAIT_TIMEOUT = ENV['WAIT_TIMEOUT'] || 30
+WAIT_TIMEOUT = (ENV['WAIT_TIMEOUT'] || 30).to_f
 STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
 
 Given /^(my|the) app is running$/ do |_|
@@ -34,7 +34,7 @@ Then /^I (?:press|touch) the "([^\"]*)" button$/ do |name|
 end
 
 Then /^I (?:press|touch) the "([^\"]*)" (?:input|text) field$/ do |name|
-  touch("textField placeholdwer:'#{name}'")
+  touch("textField placeholder:'#{name}'")
   sleep(STEP_PAUSE)
 end
 

data/lib/calabash-cucumber/core.rb

@@ -351,23 +351,23 @@ module Calabash
 
       def make_http_request(url, req)
         body = nil
-        CAL_HTTP_RETRY_COUNT.times do |count|
-          begin
-            if not (@http) or not (@http.started?)
+        #CAL_HTTP_RETRY_COUNT.times do |count|
+        #  begin
+        if not (@http) or not (@http.started?)
               @http = init_request(url)
               @http.start
-            end
-            body = @http.request(req).body
-            break
-          rescue Exception => e
-            if count < CAL_HTTP_RETRY_COUNT-1
-              puts "Retrying.."
-            else
-              puts "Failing..."
-              raise e
-            end
-          end
         end
+        body = @http.request(req).body
+         #   break
+        #  rescue Exception => e
+        #    if count < CAL_HTTP_RETRY_COUNT-1
+        #      puts "Retrying.."
+        #    else
+        #      puts "Failing..."
+        #      raise e
+        #    end
+        #  end
+        #end
 
         body
       end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.84"
+    VERSION = "0.9.85"
     FRAMEWORK_VERSION = "0.9.84"
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -7,6 +7,9 @@ module Calabash
       include Calabash::Cucumber::Core
       include Calabash::Cucumber::TestsHelpers
 
+
+      class WaitError < RuntimeError
+      end
       CALABASH_CONDITIONS = {:none_animating => "NONE_ANIMATING"}
 
 
@@ -32,13 +35,13 @@ module Calabash
         end
 
         begin
-          Timeout::timeout(timeout) do
+          Timeout::timeout(timeout,WaitError) do
             until block.call
               sleep(retry_frequency)
             end
           end
           sleep(post_timeout) if post_timeout > 0
-        rescue Timeout::Error => e
+        rescue WaitError => e
           handle_error_with_options(e,timeout_message, screenshot_on_error)
         rescue Exception => e
           handle_error_with_options(e, nil, screenshot_on_error)
@@ -65,7 +68,7 @@ module Calabash
         options[:screenshot_on_error] = options[:screenshot_on_error] || true
 
         begin
-          Timeout::timeout(options[:timeout]) do
+          Timeout::timeout(options[:timeout],WaitError) do
             loop do
               res = http({:method => :post, :path => 'condition'},
                          options)
@@ -75,7 +78,7 @@ module Calabash
             end
             sleep(options[:post_timeout]) if options[:post_timeout] > 0
           end
-        rescue Timeout::Error => e
+        rescue WaitError => e
           handle_error_with_options(e,options[:timeout_message], options[:screenshot_on_error])
         rescue Exception => e
           handle_error_with_options(e,nil, options[:screenshot_on_error])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.84
+  version: 0.9.85
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber