calabash-cucumber 0.9.163.pre6 → 0.9.163.pre7

data/lib/calabash-cucumber/status_bar_helpers.rb

@@ -0,0 +1,30 @@
+module Calabash
+  module Cucumber
+    module StatusBarHelpers #=> Map
+
+      def device_orientation(force_down=false)
+        res = map(nil, :orientation, :device).first
+
+        if ['face up', 'face down'].include?(res)
+          if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+            if force_down
+              puts "WARN  found orientation '#{res}' - will rotate to force orientation to 'down'"
+            end
+          end
+
+          return res if !force_down
+          return rotate_home_button_to :down
+        end
+
+        return res if !res.eql?('unknown')
+        return res if !force_down
+        rotate_home_button_to(:down)
+      end
+
+      def status_bar_orientation
+        map(nil, :orientation, :status_bar).first
+      end
+
+    end
+  end
+end

data/lib/calabash-cucumber/tests_helpers.rb

@@ -1,9 +1,9 @@
-require 'calabash-cucumber/core'
+require 'calabash-cucumber/failure_helpers'
 
 module Calabash
   module Cucumber
-    module TestsHelpers
-      include Calabash::Cucumber::Core
+    module TestsHelpers #=> http
+      include Calabash::Cucumber::FailureHelpers
 
       def navigation_path(*args)
 
@@ -51,15 +51,6 @@ module Calabash
         check_element_exists("view marked:'#{expected_mark}'")
       end
 
-      def screenshot_and_raise(msg, options={:prefix => nil, :name => nil, :label => nil})
-        screenshot_embed(options)
-        raise(msg)
-      end
-
-      def fail(msg="Error. Check log for details.", options={:prefix => nil, :name => nil, :label => nil})
-        screenshot_and_raise(msg, options)
-      end
-
       def each_cell(opts={:query => "tableView", :post_scroll => 0.3, :animate => true}, &block)
         uiquery = opts[:query] || "tableView"
         skip = opts[:skip_if]
@@ -101,36 +92,6 @@ module Calabash
         end
       end
 
-
-      def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
-        path = screenshot(options)
-        embed(path, "image/png", options[:label] || File.basename(path))
-      end
-
-      def screenshot(options={:prefix => nil, :name => nil})
-        prefix = options[:prefix]
-        name = options[:name]
-
-        @@screenshot_count ||= 0
-        res = http({:method => :get, :path => 'screenshot'})
-        prefix = prefix || ENV['SCREENSHOT_PATH'] || ""
-        if name.nil?
-          name = "screenshot"
-        else
-          if File.extname(name).downcase == ".png"
-            name = name.split(".png")[0]
-          end
-        end
-
-        path = "#{prefix}#{name}_#{@@screenshot_count}.png"
-        File.open(path, 'wb') do |f|
-          f.write res
-        end
-        @@screenshot_count += 1
-        path
-      end
-
-
     end
   end
 end

data/lib/calabash-cucumber/uia.rb

@@ -9,17 +9,11 @@ module Calabash
         res = http({:method => :post, :path => 'uia'}, {command:command}.merge(options))
         res = JSON.parse(res)
         if res['outcome'] != 'SUCCESS'
-          screenshot_and_raise "uia send failed because: #{res['reason']}\n#{res['details']}"
+          screenshot_and_raise "uia action failed because: #{res['reason']}\n#{res['details']}"
         end
         res['results'].first
       end
 
-      def send_uia_command(opts ={})
-        #deprecated, poor method signature
-        #use uia("uia-js...",options)
-        uia(opts[:command], opts)
-      end
-
       def uia_query(*queryparts)
         #TODO escape '\n etc in query
         uia_handle_command(:query, queryparts)
@@ -230,6 +224,13 @@ module Calabash
         escape_quotes string
       end
 
+      def send_uia_command(opts ={})
+        #deprecated, poor method signature
+        #use uia("uia-js...",options)
+        uia(opts[:command], opts)
+      end
+
+
       private
       def validate_hash_is_location!(options)
         return if options[:latitude] and options[:longitude]

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.163.pre6'
-    FRAMEWORK_VERSION = '0.9.163.pre3'
+    VERSION = '0.9.163.pre7'
+    FRAMEWORK_VERSION = '0.9.163.pre7'
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -18,7 +18,7 @@ module Calabash
           {:timeout => 10,
            :retry_frequency => 0.2,
            :post_timeout => 0.1,
-           :timeout_message => "Timed out waiting...",
+           :timeout_message => 'Timed out waiting...',
            :screenshot_on_error => true}, &block)
         #note Hash is preferred, number acceptable for backwards compat
         timeout=options_or_timeout
@@ -43,7 +43,21 @@ module Calabash
           end
           sleep(post_timeout) if post_timeout > 0
         rescue WaitError => e
-          handle_error_with_options(e,timeout_message, screenshot_on_error)
+          msg = timeout_message || e
+          if screenshot_on_error
+            sleep(retry_frequency)
+            path  = screenshot
+            res = yield
+            # Validate after taking screenshot
+            if res
+              return res
+            else
+              embed(path)
+              raise msg
+            end
+          else
+            raise msg
+          end
         rescue Exception => e
           handle_error_with_options(e, nil, screenshot_on_error)
         end
@@ -68,6 +82,9 @@ module Calabash
 
       #options for wait_for apply
       def wait_for_elements_exist(elements_arr, options={})
+        if elements_arr.is_a?(String)
+          elements_arr = [elements_arr]
+        end
         options[:timeout_message] = options[:timeout_message] || "Timeout waiting for elements: #{elements_arr.join(",")}"
         wait_for(options) do
           elements_arr.all? { |q| element_exists(q) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.163.pre6
+  version: 0.9.163.pre7
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre4
+        version: 0.1.0.pre5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre4
+        version: 0.1.0.pre5
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -226,21 +226,34 @@ files:
 - features-skeleton/support/env.rb
 - features/step_definitions/calabash_steps.rb
 - lib/calabash-cucumber.rb
+- lib/calabash-cucumber/actions/instruments_actions.rb
+- lib/calabash-cucumber/actions/playback_actions.rb
 - lib/calabash-cucumber/calabash_steps.rb
+- lib/calabash-cucumber/connection.rb
+- lib/calabash-cucumber/connection_helpers.rb
 - lib/calabash-cucumber/core.rb
 - lib/calabash-cucumber/cucumber.rb
 - lib/calabash-cucumber/date_picker.rb
 - lib/calabash-cucumber/device.rb
+- lib/calabash-cucumber/failure_helpers.rb
+- lib/calabash-cucumber/http_helpers.rb
 - lib/calabash-cucumber/ibase.rb
 - lib/calabash-cucumber/ios7_operations.rb
 - lib/calabash-cucumber/keyboard_helpers.rb
 - lib/calabash-cucumber/launch/simulator_helper.rb
 - lib/calabash-cucumber/launcher.rb
+- lib/calabash-cucumber/map.rb
 - lib/calabash-cucumber/operations.rb
+- lib/calabash-cucumber/playback_helpers.rb
+- lib/calabash-cucumber/query_helpers.rb
 - lib/calabash-cucumber/resources/cell_swipe_ios4_ipad.base64
 - lib/calabash-cucumber/resources/cell_swipe_ios4_iphone.base64
 - lib/calabash-cucumber/resources/cell_swipe_ios5_ipad.base64
 - lib/calabash-cucumber/resources/cell_swipe_ios5_iphone.base64
+- lib/calabash-cucumber/resources/double_tap_ios5_ipad.base64
+- lib/calabash-cucumber/resources/double_tap_ios5_iphone.base64
+- lib/calabash-cucumber/resources/double_tap_ios6_ipad.base64
+- lib/calabash-cucumber/resources/double_tap_ios6_iphone.base64
 - lib/calabash-cucumber/resources/pan_ios5_ipad.base64
 - lib/calabash-cucumber/resources/pan_ios5_iphone.base64
 - lib/calabash-cucumber/resources/pan_ios6_ipad.base64
@@ -289,24 +302,36 @@ files:
 - lib/calabash-cucumber/resources/rotate_right_home_up_ios5_iphone.base64
 - lib/calabash-cucumber/resources/swipe_down_ios5_ipad.base64
 - lib/calabash-cucumber/resources/swipe_down_ios5_iphone.base64
+- lib/calabash-cucumber/resources/swipe_down_ios6_ipad.base64
+- lib/calabash-cucumber/resources/swipe_down_ios6_iphone.base64
 - lib/calabash-cucumber/resources/swipe_left_hard_ios4_ipad.base64
 - lib/calabash-cucumber/resources/swipe_left_hard_ios4_iphone.base64
 - lib/calabash-cucumber/resources/swipe_left_ios4_ipad.base64
 - lib/calabash-cucumber/resources/swipe_left_ios4_iphone.base64
 - lib/calabash-cucumber/resources/swipe_left_ios5_ipad.base64
 - lib/calabash-cucumber/resources/swipe_left_ios5_iphone.base64
+- lib/calabash-cucumber/resources/swipe_left_ios6_ipad.base64
+- lib/calabash-cucumber/resources/swipe_left_ios6_iphone.base64
 - lib/calabash-cucumber/resources/swipe_right_hard_ios4_ipad.base64
 - lib/calabash-cucumber/resources/swipe_right_hard_ios4_iphone.base64
 - lib/calabash-cucumber/resources/swipe_right_ios4_ipad.base64
 - lib/calabash-cucumber/resources/swipe_right_ios4_iphone.base64
 - lib/calabash-cucumber/resources/swipe_right_ios5_ipad.base64
 - lib/calabash-cucumber/resources/swipe_right_ios5_iphone.base64
+- lib/calabash-cucumber/resources/swipe_right_ios6_ipad.base64
+- lib/calabash-cucumber/resources/swipe_right_ios6_iphone.base64
 - lib/calabash-cucumber/resources/swipe_up_ios5_ipad.base64
 - lib/calabash-cucumber/resources/swipe_up_ios5_iphone.base64
+- lib/calabash-cucumber/resources/swipe_up_ios6_ipad.base64
+- lib/calabash-cucumber/resources/swipe_up_ios6_iphone.base64
 - lib/calabash-cucumber/resources/touch_done_ios4_ipad.base64
 - lib/calabash-cucumber/resources/touch_done_ios4_iphone.base64
 - lib/calabash-cucumber/resources/touch_done_ios5_ipad.base64
 - lib/calabash-cucumber/resources/touch_done_ios5_iphone.base64
+- lib/calabash-cucumber/resources/touch_hold_ios5_ipad.base64
+- lib/calabash-cucumber/resources/touch_hold_ios5_iphone.base64
+- lib/calabash-cucumber/resources/touch_hold_ios6_ipad.base64
+- lib/calabash-cucumber/resources/touch_hold_ios6_iphone.base64
 - lib/calabash-cucumber/resources/touch_ios4_ipad.base64
 - lib/calabash-cucumber/resources/touch_ios4_iphone.base64
 - lib/calabash-cucumber/resources/touch_ios5_ipad.base64
@@ -321,6 +346,8 @@ files:
 - lib/calabash-cucumber/resources/wheel_up_ios4_iphone.base64
 - lib/calabash-cucumber/resources/wheel_up_ios5_ipad.base64
 - lib/calabash-cucumber/resources/wheel_up_ios5_iphone.base64
+- lib/calabash-cucumber/rotation_helpers.rb
+- lib/calabash-cucumber/status_bar_helpers.rb
 - lib/calabash-cucumber/tests_helpers.rb
 - lib/calabash-cucumber/uia.rb
 - lib/calabash-cucumber/version.rb