lib/calabash-cucumber/failure_helpers.rb in calabash-cucumber-0.9.163.pre11 vs lib/calabash-cucumber/failure_helpers.rb in calabash-cucumber-0.9.163

- old
+ new

@@ -1,21 +1,23 @@ +require 'fileutils' + module Calabash module Cucumber module FailureHelpers 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'] || "" + prefix = prefix || ENV['SCREENSHOT_PATH'] || '' if name.nil? - name = "screenshot" + name = 'screenshot' else - if File.extname(name).downcase == ".png" - name = name.split(".png")[0] + 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| @@ -25,18 +27,19 @@ path end def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil}) path = screenshot(options) - embed(path, "image/png", options[:label] || File.basename(path)) + filename = options[:label] || File.basename(path) + embed(path, 'image/png', filename) 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}) + def fail(msg='Error. Check log for details.', options={:prefix => nil, :name => nil, :label => nil}) screenshot_and_raise(msg, options) end end end \ No newline at end of file