calabash-cucumber 0.9.74 → 0.9.80.pre.1

data/lib/calabash-cucumber/resources/touch_done_ios4_iphone.base64

@@ -1,8 +1,9 @@
-YnBsaXN0MDCiARDVAgQKDA4DBQsND1REYXRhTxA8AQAAAAEAAQAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAQAABQIDAAAAAACgR+FAAECTQwDA50MAAAAAoFhMb2Nh
-dGlvbtIGCAcJUVgiQ5NAAFFZIkPnwABUVGltZRMAAE1aiOi6tFRUeXBlEQu5Xldp
-bmRvd0xvY2F0aW9u0gYIBwnVAgQKDA4REhUNFk8QPAYAAAABAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAEAAAUCAAAAAAAAAAAAAADAkkMAQOVDAAAAAKDSBggT
-FCJDksAAIkPlQAATAABNWpkSZoXSBggTFAAIAAsAFgAbAFsAZABpAGsAcAByAHcA
-fACFAIoAjQCcAKEArADsAPEA9gD7AQQAAAAAAAACAQAAAAAAAAAXAAAAAAAAAAAA
-AAAAAAABCQ==
+YnBsaXN0MDCiARLVAgMEBQYHCAkOEVRUaW1lVERhdGFeV2luZG93TG9jYXRpb25Y
+TG9jYXRpb25UVHlwZRMAACs09fZLc08QPAEAAAABAAEAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAEzRAICAgAAAIA/AACAPwAA6EEAAK5DAdE4ANIKCwwNUVhRWSNA
+PQAAAAAAACNAdcAAAAAAANIKCw8QI0A9AAAAAAAAI0B1wAAAAAAAEQu51QIDBAUG
+ExQVGBETAAArNPhGKp9PEDwGAAAAAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAABCJECAgEAAACAPwAAgD8AAOhBAACuQwEAekPSCgsWFyNAPQAAAAAAACNAdcAA
+AAAAANIKCxkaI0A9AAAAAAAAI0B1wAAAAAAAAAgACwAWABsAIAAvADgAPQBGAIUA
+igCMAI4AlwCgAKUArgC3ALoAxQDOAQ0BEgEbASQBKQEyAAAAAAAAAgEAAAAAAAAA
+GwAAAAAAAAAAAAAAAAAAATs=

data/lib/calabash-cucumber/resources/touch_done_ios5_iphone.base64

@@ -1,8 +1,9 @@
-YnBsaXN0MDCiARDVAgQKDA4DBQsND1REYXRhTxA8AQAAAAEAAQAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAQEAAQIDAAAAAAAgXN9AAMCXQwDA40MAAAAAoFhMb2Nh
-dGlvbtIGCAcJUVgiQ5fAAFFZIkPjwABUVGltZRMAABycAYmmI1RUeXBlEQu5Xldp
-bmRvd0xvY2F0aW9u0gYIBwnVAgQKDA4REhUNFk8QPAYAAAABAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAABAAECAAAAAAAAAAAAAACAmEMAgONDAAAAAKDSBggT
-FCJDmIAAIkPjgAATAAAcnAYp5sLSBggTFAAIAAsAFgAbAFsAZABpAGsAcAByAHcA
-fACFAIoAjQCcAKEArADsAPEA9gD7AQQAAAAAAAACAQAAAAAAAAAXAAAAAAAAAAAA
-AAAAAAABCQ==
+YnBsaXN0MDCiARLVAgMEBQYHCAkOEVRUaW1lVERhdGFeV2luZG93TG9jYXRpb25Y
+TG9jYXRpb25UVHlwZRMAACxOMOM7BE8QPAEAAAABAAEAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAABRAICAgAAAIA/AACAPwAAAEIAgLBDAdE4ANIKCwwNUVhRWSNA
+QAAAAAAAACNAdhAAAAAAANIKCw8QI0BAAAAAAAAAI0B2EAAAAAAAEQu51QIDBAUG
+ExQVGBETAAAsTjJSfK5PEDwGAAAAAQABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAZECAgEAAACAPwAAgD8AAABCAICwQwEAdUPSCgsWFyNAQAAAAAAAACNAdhAA
+AAAAANIKCxkaI0BAAAAAAAAAI0B2EAAAAAAAAAgACwAWABsAIAAvADgAPQBGAIUA
+igCMAI4AlwCgAKUArgC3ALoAxQDOAQ0BEgEbASQBKQEyAAAAAAAAAgEAAAAAAAAA
+GwAAAAAAAAAAAAAAAAAAATs=

data/lib/calabash-cucumber/tests_helpers.rb

@@ -0,0 +1,59 @@
+require 'calabash-cucumber/core'
+
+module Calabash
+  module Cucumber
+    module TestsHelpers
+      include Calabash::Cucumber::Core
+
+      def element_does_not_exist(uiquery)
+        query(uiquery).empty?
+      end
+
+      def element_exists(uiquery)
+        not element_does_not_exist(uiquery)
+      end
+
+      def view_with_mark_exists(expected_mark)
+        element_exists("view marked:'#{expected_mark}'")
+      end
+
+      def check_element_exists(query)
+        if not element_exists(query)
+          screenshot_and_raise "No element found for query: #{query}"
+        end
+      end
+
+      def check_element_does_not_exist(query)
+        if element_exists(query)
+          screenshot_and_raise "Expected no elements to match query: #{query}"
+        end
+      end
+
+      def check_view_with_mark_exists(expected_mark)
+        check_element_exists("view marked:'#{expected_mark}'")
+      end
+
+      def screenshot_and_raise(msg, prefix=nil, name=nil)
+        screenshot(prefix, name)
+        raise(msg)
+      end
+
+      def fail(msg="Error. Check log for details.", prefix=nil, name=nil)
+        screenshot_and_raise(msg, prefix, name)
+      end
+
+      def screenshot(prefix=nil, name=nil)
+        res = http({:method => :get, :path => 'screenshot'})
+        prefix = prefix || ENV['SCREENSHOT_PATH'] || ""
+        name = "screenshot_#{CALABASH_COUNT[:step_line]}.png" if name.nil?
+        path = "#{prefix}#{name}"
+        File.open(path, 'wb') do |f|
+          f.write res
+        end
+        puts "Saved screenshot: #{path}"
+        path
+      end
+
+    end
+  end
+end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.74"
-    FRAMEWORK_VERSION = "0.9.74"
+    VERSION = "0.9.80.pre.1"
+    FRAMEWORK_VERSION = "0.9.80.pre.1"
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -0,0 +1,114 @@
+require 'calabash-cucumber/core'
+require 'calabash-cucumber/tests_helpers'
+
+module Calabash
+  module Cucumber
+    module WaitHelpers
+      include Calabash::Cucumber::Core
+      include Calabash::Cucumber::TestsHelpers
+
+      CALABASH_CONDITIONS = {:none_animating => "NONE_ANIMATING"}
+
+
+      def wait_for(options_or_timeout=
+          {:timeout => 10,
+           :retry_frequency => 0.2,
+           :post_timeout => 0.1,
+           :timeout_message => "Timed out waiting...",
+           :screenshot_on_error => true}, &block)
+        #note Hash is preferred, number acceptable for backwards compat
+        timeout=options_or_timeout
+        post_timeout=0.1
+        retry_frequency=0.2
+        timeout_message = nil
+        screenshot_on_error = true
+
+        if options_or_timeout.is_a?(Hash)
+          timeout = options_or_timeout[:timeout] || 10
+          retry_frequency = options_or_timeout[:retry_frequency] || 0.2
+          post_timeout = options_or_timeout[:post_timeout] || 0.1
+          timeout_message = options_or_timeout[:timeout_message]
+          screenshot_on_error = options_or_timeout[:screenshot_on_error] || true
+        end
+
+        begin
+          Timeout::timeout(timeout) do
+            until block.call
+              sleep(retry_frequency)
+            end
+          end
+          sleep(post_timeout) if post_timeout > 0
+        rescue Timeout::Error => e
+          handle_error_with_options(e,timeout_message, screenshot_on_error)
+        rescue Exception => e
+          handle_error_with_options(e, nil, screenshot_on_error)
+        end
+      end
+
+      #options for wait_for apply
+      def wait_for_elements_exist(elements_arr, options={})
+        options[:timeout_message] = options[:timeout_message] || "Timeout waiting for elements: #{elements_arr.join(",")}"
+        wait_for(options) do
+          elements_arr.all? { |q| element_exists(q) }
+        end
+      end
+
+      def wait_for_condition(options = {})
+        options[:timeout] = options[:timeout] || 10
+        options[:query] = options[:query] || "view"
+        options[:condition] = options[:condition] || CALABASH_CONDITIONS[:none_animating]
+        options[:post_timeout] = options[:post_timeout] || 0.1
+        options[:frequency] = options[:frequency] || 0.2
+        options[:retry_frequency] = options[:retry_frequency] || 0.2
+        options[:count] = options[:count] || 2
+        options[:timeout_message] = options[:timeout_message] || "Timeout waiting for condition (#{options[:condition]})"
+        options[:screenshot_on_error] = options[:screenshot_on_error] || true
+
+        begin
+          Timeout::timeout(options[:timeout]) do
+            loop 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
+          end
+        rescue Timeout::Error => 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])
+        end
+      end
+
+      def wait_for_none_animating(options = {})
+        options[:condition] = CALABASH_CONDITIONS[:none_animating]
+        wait_for_condition(options)
+      end
+
+      #may be called with a string (query) or an array of strings
+      def wait_for_transition(done_queries, check_options={},animation_options={})
+        done_queries = [*done_queries]
+        wait_for_elements_exist(done_queries,check_options)
+        wait_for_none_animating(animation_options)
+      end
+
+      def touch_transition(touch_q, done_queries,check_options={},animation_options={})
+        touch(touch_q)
+        wait_for_transition(done_queries,check_options,animation_options)
+      end
+
+      def handle_error_with_options(ex, timeout_message, screenshot_on_error)
+        msg = (timeout_message || ex)
+        if screenshot_on_error
+          screenshot_and_raise msg
+        else
+          raise msg
+        end
+      end
+
+
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.74
-  prerelease: 
+  version: 0.9.80.pre.1
+  prerelease: 7
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: net-http-persistent
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email:
@@ -145,8 +129,9 @@ files:
 - features/step_definitions/calabash_steps.rb
 - lib/calabash-cucumber.rb
 - lib/calabash-cucumber/calabash_steps.rb
-- lib/calabash-cucumber/color_helper.rb
+- lib/calabash-cucumber/core.rb
 - lib/calabash-cucumber/cucumber.rb
+- lib/calabash-cucumber/keyboard_helpers.rb
 - lib/calabash-cucumber/launch/simulator_helper.rb
 - lib/calabash-cucumber/operations.rb
 - lib/calabash-cucumber/resources/cell_swipe_ios4_ipad.base64
@@ -215,7 +200,9 @@ files:
 - lib/calabash-cucumber/resources/touch_ios4_iphone.base64
 - lib/calabash-cucumber/resources/touch_ios5_ipad.base64
 - lib/calabash-cucumber/resources/touch_ios5_iphone.base64
+- lib/calabash-cucumber/tests_helpers.rb
 - lib/calabash-cucumber/version.rb
+- lib/calabash-cucumber/wait_helpers.rb
 - scripts/data/.GlobalPreferences.plist
 - scripts/data/com.apple.Accessibility.plist
 - scripts/reset_simulator.scpt
@@ -234,9 +221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/calabash-cucumber/color_helper.rb

@@ -1,13 +0,0 @@
-module Calabash module Cucumber
-
-module ColorHelper
-  def colorize(text, color_code)
-    "\e[#{color_code}m#{text}\e[0m"
-  end
-
-  def red(text); colorize(text, 31); end
-  def green(text); colorize(text, 32); end
-  def blue(text); colorize(text, 34); end
-end
-
-end end