calabash-cucumber 0.9.163.pre10 → 0.9.163.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d077c3d3d772aa7ef94f355d79ff2f82235d7006
-  data.tar.gz: 48f440454e8d31c85e1da8f2781025ad2b7e71fd
+  metadata.gz: a3a488993902bfbb00390bc250e3c1bd67863115
+  data.tar.gz: 838d8084acb6139715dbf5f8597cd6255f603f8e
 SHA512:
-  metadata.gz: 61335091bedc4531d384ace379a34dfb834abaa30278bda089eb7bb0bff30bc478277a6c0e64901f07dbf05d916d1e89057b9a13dec0d8a78a68db94e4ef917b
-  data.tar.gz: ffdeb716445fbd7f24246d928d4499383dac8650835377b4cfb190dfd596da572c9d3c41b1671db32e2d30eb1cb9682a4f30819a5b97d82224a34f40e8799425
+  metadata.gz: ca26a0000569e4729514796fa4273178096df47e647d2fcba6688bc429d3a8d1d21d4da144881a3431e38a2b59cf8f5d12ce91bd5e17fbfe2cb7242ed41d39a7
+  data.tar.gz: 39743981fa30de194e00ef53a538d561a0bba9025102fafc139253c8c64a4e47de539c457febe6481d95113b6420099d8e5747a2126c7e1c38e0a8b2ec70a899

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

@@ -1,13 +1,11 @@
 require 'calabash-cucumber/uia'
 require 'calabash-cucumber/connection_helpers'
-require 'calabash-cucumber/failure_helpers'
 require 'calabash-cucumber/query_helpers'
 require 'calabash-cucumber/map'
 
 class Calabash::Cucumber::InstrumentsActions
   include Calabash::Cucumber::UIA
   include Calabash::Cucumber::ConnectionHelpers
-  include Calabash::Cucumber::FailureHelpers
   include Calabash::Cucumber::QueryHelpers
   include Calabash::Cucumber::Map
 
@@ -71,7 +69,9 @@ class Calabash::Cucumber::InstrumentsActions
     ui_query = options[:query]
     offset = options[:offset]
     if ui_query
-      el = find_and_normalize_or_raise(ui_query)
+      res = find_and_normalize(ui_query)
+      return res if res.empty?
+      el = res.first
       final_offset = point_from(el, options)
       if block_given?
         yield final_offset
@@ -89,23 +89,17 @@ class Calabash::Cucumber::InstrumentsActions
     end
   end
 
-  def find_and_normalize_or_raise(ui_query)
-    raw_result = find_or_raise(ui_query)
+  def find_and_normalize(ui_query)
+    raw_result = raw_map(ui_query, :query)
     orientation = raw_result['status_bar_orientation']
-    res = raw_result['results'].first
+    res = raw_result['results']
 
-    normalize_rect_for_orientation!(orientation, res['rect']) if res['rect']
+    return res if res.empty?
 
-    res
-  end
+    first_res = res.first
+    normalize_rect_for_orientation!(orientation, first_res['rect']) if first_res['rect']
 
-  def find_or_raise(ui_query)
-    raw_result = raw_map(ui_query, :query)
-    if raw_result['results'].empty?
-      screenshot_and_raise "Unable to find element matching query #{ui_query}"
-    else
-      raw_result
-    end
+    res
   end
 
   def normalize_rect_for_orientation!(orientation, rect)

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

@@ -1,14 +1,11 @@
-require 'calabash-cucumber/connection'
 require 'calabash-cucumber/playback_helpers'
 require 'calabash-cucumber/connection_helpers'
-require 'calabash-cucumber/failure_helpers'
 require 'calabash-cucumber/query_helpers'
 
 
 class Calabash::Cucumber::PlaybackActions
   include Calabash::Cucumber::PlaybackHelpers
   include Calabash::Cucumber::ConnectionHelpers
-  include Calabash::Cucumber::FailureHelpers
   include Calabash::Cucumber::QueryHelpers
 
 

data/lib/calabash-cucumber/playback_helpers.rb

@@ -79,7 +79,7 @@ EOF
           candidates.each { |file| searched_for.concat("    * '#{file}'\n") }
           searched_in = "  in directories =>\n"
           playback_file_directories(rec_dir).each { |dir| searched_in.concat("    * '#{dir}'\n") }
-          screenshot_and_raise "Playback file not found for: '#{recording_name}'\n#{searched_for}#{searched_in}"
+          raise "Playback file not found for: '#{recording_name}'\n#{searched_for}#{searched_in}"
         end
 
         data
@@ -119,7 +119,7 @@ EOF
 
         res = JSON.parse(res)
         if res['outcome'] != 'SUCCESS'
-          screenshot_and_raise "playback failed because: #{res['reason']}\n#{res['details']}"
+          raise "playback failed because: #{res['reason']}\n#{res['details']}"
         end
         res['results']
       end
@@ -138,7 +138,7 @@ EOF
 
         res = JSON.parse(res)
         if res['outcome'] != 'SUCCESS'
-          screenshot_and_raise "interpolate failed because: #{res['reason']}\n#{res['details']}"
+          raise "interpolate failed because: #{res['reason']}\n#{res['details']}"
         end
         res['results']
       end

data/lib/calabash-cucumber/uia.rb

@@ -9,7 +9,7 @@ module Calabash
         res = http({:method => :post, :path => 'uia'}, {command:command}.merge(options))
         res = JSON.parse(res)
         if res['outcome'] != 'SUCCESS'
-          screenshot_and_raise "uia action failed because: #{res['reason']}\n#{res['details']}"
+          raise "uia action failed because: #{res['reason']}\n#{res['details']}"
         end
         res['results'].first
       end
@@ -123,7 +123,7 @@ module Calabash
         status = res['status']
         if status.eql?('error')
           value = res['value']
-          screenshot_and_raise "could not type '#{string}' - '#{value}'"
+          raise "could not type '#{string}' - '#{value}'"
         end
       end
 

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.163.pre10'
+    VERSION = '0.9.163.pre11'
     FRAMEWORK_VERSION = '0.9.163.pre10'
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -23,7 +23,7 @@ module Calabash
            :screenshot_on_error => true}, &block)
         #note Hash is preferred, number acceptable for backwards compat
         default_timeout = 30
-        timeout=options_or_timeout || default_timeout
+        timeout = options_or_timeout || default_timeout
         post_timeout=0
         retry_frequency=0.3
         timeout_message = nil
@@ -65,7 +65,7 @@ module Calabash
           FileUtils.rm_f(path)
           return res
         else
-          embed(path)
+          embed(path, 'image/png', msg)
           raise wait_error(msg)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.163.pre10
+  version: 0.9.163.pre11
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber