capybara-screenshot 0.3.6 → 0.3.8

data/CHANGELOG.md

@@ -1,7 +1,8 @@
-18 Apri 2013
+18 Apr 2013
 -----------
 
 Improved documentation, Ruby 1.8.7 support by not allowing Capybara 2.1 to be used, improved Sinatra support.
+RSpec screenshot fix to only screenshot when applicable: https://github.com/mattheworiordan/capybara-screenshot/issues/44
 
 07 Jan 2013
 -----------

data/lib/capybara-screenshot/rspec.rb

@@ -2,7 +2,7 @@ RSpec.configure do |config|
   # use the before hook to add an after hook that runs last
   config.after do
     if Capybara.page.respond_to?(:save_page) # Capybara DSL method has been included for a feature we can snapshot
-      if Capybara::Screenshot.autosave_on_failure && example.exception
+      if Capybara.page.current_url != '' && Capybara::Screenshot.autosave_on_failure && example.exception
         filename_prefix = Capybara::Screenshot.filename_prefix_for(:rspec, example)
 
         saver = Capybara::Screenshot::Saver.new(Capybara, Capybara.page, true, filename_prefix)

data/lib/capybara-screenshot/saver.rb

@@ -19,11 +19,11 @@ module Capybara
 
       def save_html
         if Capybara::VERSION.match(/^\d+/)[0] == '1'
-          capybara.save_page(page.body, "#{file_base_name}.html")
+          capybara.save_page(page.body, "#{html_path}")
         else
-          capybara.save_page("#{file_base_name}.html")
+          capybara.save_page("#{html_path}")
         end
-        warn "Saved file #{file_base_name}"
+        warn "Saved file #{html_path}"
       end
 
       def save_screenshot

data/lib/capybara-screenshot/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Screenshot
-    VERSION = "0.3.6"
+    VERSION = "0.3.8"
   end
 end

data/spec/capybara-screenshot/saver_spec.rb

@@ -37,7 +37,7 @@ describe Capybara::Screenshot::Saver do
     end
 
     it 'should have default format of "screenshot_Y-M-D-H-M-S.ms.html"' do
-      capybara_mock.should_receive(:save_page).with('body', "#{file_basename}.html")
+      capybara_mock.should_receive(:save_page).with('body', File.join(capybara_root, "#{file_basename}.html"))
 
       saver.save
     end
@@ -45,7 +45,7 @@ describe Capybara::Screenshot::Saver do
     it 'should use name argument as prefix' do
       saver = Capybara::Screenshot::Saver.new(capybara_mock, page_mock, true, 'custom-prefix')
 
-      capybara_mock.should_receive(:save_page).with('body', "custom-prefix_#{timestamp}.html")
+      capybara_mock.should_receive(:save_page).with('body', File.join(capybara_root, "custom-prefix_#{timestamp}.html"))
 
       saver.save
     end
@@ -57,7 +57,7 @@ describe Capybara::Screenshot::Saver do
     end
 
     it 'should have default format of "screenshot_Y-M-D-H-M-S.ms.html"' do
-      capybara_mock.should_receive(:save_page).with("#{file_basename}.html")
+      capybara_mock.should_receive(:save_page).with(File.join(capybara_root, "#{file_basename}.html"))
 
       saver.save
     end
@@ -65,7 +65,7 @@ describe Capybara::Screenshot::Saver do
     it 'should use name argument as prefix' do
       saver = Capybara::Screenshot::Saver.new(capybara_mock, page_mock, true, 'custom-prefix')
 
-      capybara_mock.should_receive(:save_page).with("custom-prefix_#{timestamp}.html")
+      capybara_mock.should_receive(:save_page).with(File.join(capybara_root, "custom-prefix_#{timestamp}.html"))
 
       saver.save
     end

data/spec/spec_helper.rb

@@ -15,3 +15,5 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 end
+
+Capybara.app = lambda { |env| [200, {}, ["OK"]] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3211411598851201235
+      hash: 3507128222500016468
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3211411598851201235
+      hash: 3507128222500016468
 requirements: []
 rubyforge_project: capybara-screenshot
 rubygems_version: 1.8.24