watirmark 5.29.0 → 5.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 869eb50af6ffc0f094ab946ce3a02e65300f0cf5
-  data.tar.gz: cb1343978e8f19130cefe1da8ddaa3b9e1a9b469
+  metadata.gz: fdaea98d94f9811dfd4f856eac40bd367c520979
+  data.tar.gz: 469dd269dcc06ce7c4fc2dff6f5a0bb187cfae4c
 SHA512:
-  metadata.gz: 31406663981f396d3660f6785f46a5f63c75dab98d847a7262c5fd3b35a9c2efda3ed5210efba9b6f171f646182d930494f3cc8781fe29a645e87b45f861a5d9
-  data.tar.gz: 54971e2d3debcb65fca67e92faab264b339601f528c57af641f065b888a17e5574af87ca13748f9188b272af2e1499853f2de5dcbd388e446b7650131412bb99
+  metadata.gz: 373699cc4350cd23cf4dde6002d491cdcf2869e1fd051631c15f98c396f74e7321567e9a4148e9bf6a056e0ab24183fd79a1ed3e5af4b5cf44cddc83103c8dbf
+  data.tar.gz: dad1eeafee811eb4fea56345e6a15698824d12c208ce2e040a2d96324eb9b03c1a3c47fb8eab9f684b414c1e854e07f866093fb82dd7a1b17a69f5aeafe2f986

data/lib/watirmark/cucumber/hook_helper.rb

@@ -10,20 +10,12 @@ module HookHelper
     end
 
 
-    def take_screenshot(folder='', feature='')
-      path = "reports/screenshots/#{folder}"
-      if folder.empty?
-        image = "#{Time.now.to_i}-#{UUID.new.generate(:compact)}.png"
-      else
-        image = "#{feature}.png"
-      end
+    def take_screenshot
+      image = "#{Time.now.to_i}-#{UUID.new.generate(:compact)}.png"
+      path = "reports/screenshots"
       file = "#{path}/#{image}"
       FileUtils.mkdir_p path unless File.directory? path
       begin
-        if Page.browser.alert.exists?
-          Watirmark.logger.warn("Alert is Open while taking screenshot: #{Page.browser.alert.text}")
-          Page.browser.alert.close
-        end
         Page.browser.screenshot.save file
         data = File.open(file, 'rb') { |f| f.read }
         data = Base64.encode64(data)

data/lib/watirmark/cucumber/hooks.rb

@@ -13,16 +13,7 @@ Before do |scenario|
 end
 
 After do |scenario|
-  if scenario.passed?
-    prepend = 'p_'
-  elsif scenario.failed?
-    prepend = 'f_'
-  else
-    prepend = 'i_'
-  end
-  folder = scenario.location.to_s[/\/features\/([^\.]*)/, 1]
-  feature = prepend+scenario.title.tr(' ', '_')
-  (file, file_type) = HookHelper.take_screenshot(folder, feature)
+  (file, file_type) = HookHelper.take_screenshot
   embed file, file_type
   HookHelper.serialize_models
 end

data/lib/watirmark/version.rb

@@ -1,5 +1,5 @@
 module Watirmark
   module Version
-    STRING = '5.29.0'
+    STRING = '5.29.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watirmark
 version: !ruby/object:Gem::Version
-  version: 5.29.0
+  version: 5.29.1
 platform: ruby
 authors:
 - Hugh McGowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -232,7 +232,7 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: watirmark 5.29.0
+summary: watirmark 5.29.1
 test_files:
 - spec/model_traits_spec.rb
 - spec/session_spec.rb