capybara-screenshot 0.3.8 → 0.3.10

data/.travis.yml

@@ -2,6 +2,4 @@ language: ruby
 script: "bundle exec rspec"
 rvm:
   - 1.9.3
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - 1.8.7
+  - jruby-19mode # JRuby in 1.9 mode

data/README.md

@@ -2,11 +2,14 @@ capybara-screenshot gem
 =======================
 
 [![Build Status](https://travis-ci.org/mattheworiordan/capybara-screenshot.png)](https://travis-ci.org/mattheworiordan/capybara-screenshot)
+[![Code Climate](https://d3s6mut3hikguw.cloudfront.net/github/mattheworiordan/capybara-screenshot.png)](https://codeclimate.com/github/mattheworiordan/capybara-screenshot)
 
 Using this gem, whenever a [Capybara](https://github.com/jnicklas/capybara) test in [Cucumber](http://cukes.info/), [Rspec](https://www.relishapp.com/rspec) or Minitest  fails, the HTML for the failed page and a screenshot (when using [capybara-webkit](https://github.com/thoughtbot/capybara-webkit), [Selenium](http://seleniumhq.org/) or [poltergeist](https://github.com/jonleighton/poltergeist)) is saved into $APPLICATION_ROOT/tmp/capybara.
 
 This is a huge help when trying to diagnose a problem in your failing steps as you can view the source code and potentially how the page looked at the time of the failure.
 
+_Please note that Ruby 1.9 is required to use this Gem.  For Ruby 1.8 support, please see the [capybara-screenshot Ruby 1.8 branch](https://github.com/mattheworiordan/capybara-screenshot/tree/ruby-1.8-support)_
+
 Installation
 -----
 

data/lib/capybara-screenshot/saver.rb

@@ -18,19 +18,24 @@ module Capybara
       end
 
       def save_html
-        if Capybara::VERSION.match(/^\d+/)[0] == '1'
-          capybara.save_page(page.body, "#{html_path}")
-        else
-          capybara.save_page("#{html_path}")
+        clear_save_and_open_page_path do
+          if Capybara::VERSION.match(/^\d+/)[0] == '1'
+            capybara.save_page(page.body, "#{html_path}")
+          else
+            capybara.save_page("#{html_path}")
+          end
         end
         warn "Saved file #{html_path}"
       end
 
       def save_screenshot
-        Capybara::Screenshot.registered_drivers.fetch(capybara.current_driver) { |driver_name|
-          warn "capybara-screenshot could not detect a screenshot driver for '#{capybara.current_driver}'. Saving with default with unknown results."
-          Capybara::Screenshot.registered_drivers[:default]
-        }.call(page.driver, screenshot_path)
+        clear_save_and_open_page_path do
+          Capybara.save_and_open_page_path = nil
+          Capybara::Screenshot.registered_drivers.fetch(capybara.current_driver) { |driver_name|
+            warn "capybara-screenshot could not detect a screenshot driver for '#{capybara.current_driver}'. Saving with default with unknown results."
+            Capybara::Screenshot.registered_drivers[:default]
+          }.call(page.driver, screenshot_path)
+        end
       end
 
       def html_path
@@ -41,6 +46,15 @@ module Capybara
         File.join(Capybara::Screenshot.capybara_root, "#{file_base_name}.png")
       end
 
+      # If Capybara.save_and_open_page_path is set then
+      # the html_path or screenshot_path will be appended to this path
+      # instead of replacing it
+      def clear_save_and_open_page_path
+        old_path = Capybara.save_and_open_page_path
+        Capybara.save_and_open_page_path = nil
+        yield
+        Capybara.save_and_open_page_path = old_path
+      end
     end
   end
 end

data/lib/capybara-screenshot/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-03 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: 3507128222500016468
+      hash: -2459750308362478257
 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: 3507128222500016468
+      hash: -2459750308362478257
 requirements: []
 rubyforge_project: capybara-screenshot
 rubygems_version: 1.8.24