calabash-cucumber 0.9.51 → 0.9.53

data/Gemfile.lock

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

data/features-skeleton/support/hooks.rb

@@ -1,5 +1,6 @@
 CALABASH_COUNT = {:step_index => 0, :step_line => nil}
 
+#TODO change this approach as it breaks scenario outlines
 Before do |scenario|
   begin
     CALABASH_COUNT[:step_index] = 0
@@ -10,7 +11,6 @@ Before do |scenario|
 end
 
 AfterStep do |scenario|
-  #Håndtering af den situation hvor Feature/Scenario/steps er mulitline
   CALABASH_COUNT[:step_index] = CALABASH_COUNT[:step_index] + 1
   raw = scenario.raw_steps[CALABASH_COUNT[:step_index]]
   CALABASH_COUNT[:step_line] = raw.line unless raw.nil?

data/features-skeleton/support/launch.rb

@@ -55,13 +55,19 @@ def relaunch
   end
 end
 
-
 def app_path
   ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
 end
 
+def calabash_notify
+  if self.respond_to?:on_launch
+    self.on_launch
+  end
+end
+
 Before do |scenario|
   relaunch
+  calabash_notify
 end
 
 at_exit do

data/lib/calabash-cucumber/operations.rb

@@ -33,6 +33,10 @@ module Operations
     end
   end
 
+  def escape_quotes(str)
+    str.gsub("'","\\\\'")
+  end
+
   def wait_for(timeout, &block)
     begin
       Timeout::timeout(timeout) do
@@ -45,6 +49,23 @@ module Operations
     end
   end
 
+  def wait_ready(timeout, times=2,sleep=0.3, &block)
+    raise "Times parameter must be greater than or equal 2" if times < 2
+    raise "Sleep parameter must be greater than 0" if sleep <= 0
+    begin
+      Timeout::timeout(timeout) do
+        while times > 0 do
+          if block.call
+            times -= 1
+          end
+          sleep 0.3
+        end
+      end
+    rescue Exception => e
+      screenshot_and_raise e
+    end
+  end
+
   def query(uiquery, *args)
     map(uiquery, :query, *args)
   end
@@ -268,7 +289,7 @@ module Operations
     data = load_playback_data(recording)
 
     post_data = %Q|{"events":"#{data}"|
-    post_data<< %Q|,"query":"#{options[:query]}"| if options[:query]
+    post_data<< %Q|,"query":"#{escape_quotes(options[:query])}"| if options[:query]
     post_data<< %Q|,"offset":#{options[:offset].to_json}| if options[:offset]
     post_data<< %Q|,"reverse":#{options[:reverse]}| if options[:reverse]
     post_data<< %Q|,"prototype":"#{options[:prototype]}"| if options[:prototype]
@@ -287,8 +308,8 @@ module Operations
       data = load_playback_data(recording)
 
       post_data = %Q|{"events":"#{data}"|
-      post_data<< %Q|,"start":"#{options[:start]}"| if options[:start]
-      post_data<< %Q|,"end":"#{options[:end]}"| if options[:end]
+      post_data<< %Q|,"start":"#{escape_quotes(options[:start])}"| if options[:start]
+      post_data<< %Q|,"end":"#{escape_quotes(options[:end])}"| if options[:end]
       post_data<< %Q|,"offset_start":#{options[:offset_start].to_json}| if options[:offset_start]
       post_data<< %Q|,"offset_end":#{options[:offset_end].to_json}| if options[:offset_end]
       post_data << "}"

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.51"
-    FRAMEWORK_VERSION = "0.9.50"
+    VERSION = "0.9.53"
+    FRAMEWORK_VERSION = "0.9.51"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.51
+  version: 0.9.53
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70135029292260 !ruby/object:Gem::Requirement
+  requirement: &70277488769700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135029292260
+  version_requirements: *70277488769700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70135029290660 !ruby/object:Gem::Requirement
+  requirement: &70277488768760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135029290660
+  version_requirements: *70277488768760
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &70135029289440 !ruby/object:Gem::Requirement
+  requirement: &70277488767520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135029289440
+  version_requirements: *70277488767520
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70135029287680 !ruby/object:Gem::Requirement
+  requirement: &70277488766520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135029287680
+  version_requirements: *70277488766520
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70135029285080 !ruby/object:Gem::Requirement
+  requirement: &70277488765640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135029285080
+  version_requirements: *70277488765640
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70135029282960 !ruby/object:Gem::Requirement
+  requirement: &70277488764420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135029282960
+  version_requirements: *70277488764420
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email: