capybara-screenshot 0.3 → 0.3.1

data/capybara-screenshot.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "capybara-screenshot"
 
-  s.add_dependency 'capybara', '>= 1.0'
+  s.add_dependency 'capybara', ['>= 1.0', '< 3']
   s.add_development_dependency 'rspec', '~> 2.7'
   s.add_development_dependency 'timecop'
 

data/lib/capybara-screenshot.rb

@@ -98,5 +98,9 @@ Capybara::Screenshot.class_eval do
 end
 
 require 'capybara/dsl'
+require 'capybara/util/save_and_open_page' if Capybara::VERSION.match(/^\d+/)[0] == '1' # no longer needed in Capybara version 2
+
 require 'capybara-screenshot/saver'
-require 'capybara-screenshot/capybara'
+require 'capybara-screenshot/capybara'
+
+

data/lib/capybara-screenshot/rspec.rb

@@ -1,13 +1,15 @@
 RSpec.configure do |config|
   # use the before hook to add an after hook that runs last
-  config.after(:type => :request) do
-    if Capybara::Screenshot.autosave_on_failure && example.exception
-      filename_prefix = Capybara::Screenshot.filename_prefix_for(:rspec, example)
+  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
+        filename_prefix = Capybara::Screenshot.filename_prefix_for(:rspec, example)
 
-      saver = Capybara::Screenshot::Saver.new(Capybara, Capybara.page, true, filename_prefix)
-      saver.save
+        saver = Capybara::Screenshot::Saver.new(Capybara, Capybara.page, true, filename_prefix)
+        saver.save
 
-      example.metadata[:full_description] += "\n     Screenshot: #{saver.screenshot_path}"
+        example.metadata[:full_description] += "\n     Screenshot: #{saver.screenshot_path}"
+      end
     end
   end
 end

data/lib/capybara-screenshot/saver.rb

@@ -5,7 +5,7 @@ module Capybara
 
       def initialize(capybara, page, html_save=true, filename_prefix='screenshot')
         @capybara, @page, @html_save = capybara, page, html_save
-        @file_base_name = "#{filename_prefix}-#{Time.now.strftime('%Y-%m-%d-%H-%M-%S')}"
+        @file_base_name = "#{filename_prefix}_#{Time.now.strftime('%Y-%m-%d-%H-%M-%S.%L')}"
       end
 
       def save
@@ -17,8 +17,12 @@ module Capybara
       end
 
       def save_html
-        require 'capybara/util/save_and_open_page'
-        capybara.save_page(page.body, "#{file_base_name}.html")
+        if Capybara::VERSION.match(/^\d+/)[0] == '1'
+          capybara.save_page(page.body, "#{file_base_name}.html")
+        else
+          capybara.save_page("#{file_base_name}.html")
+        end
+        warn "Saved file #{file_base_name}"
       end
 
       def save_screenshot

data/lib/capybara-screenshot/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Screenshot
-    VERSION = "0.3"
+    VERSION = "0.3.1"
   end
 end

data/spec/capybara-screenshot/saver_spec.rb

@@ -12,12 +12,12 @@ describe Capybara::Screenshot::Saver do
 
   before do
     Capybara::Screenshot.stub(:capybara_root).and_return(capybara_root)
-    Timecop.freeze(Time.local(2012, 6, 7, 8, 9, 10))
+    Timecop.freeze(Time.local(2012, 6, 7, 8, 9, 10, 0))
   end
 
   let(:capybara_root) { '/tmp' }
-  let(:timestamp) { '2012-06-07-08-09-10' }
-  let(:file_basename) { "screenshot-#{timestamp}" }
+  let(:timestamp) { '2012-06-07-08-09-10.000' }
+  let(:file_basename) { "screenshot_#{timestamp}" }
   let(:screenshot_path) { "#{capybara_root}/#{file_basename}.png" }
 
   let(:driver_mock) { mock('Capybara driver').as_null_object }
@@ -31,8 +31,12 @@ describe Capybara::Screenshot::Saver do
 
   let(:saver) { Capybara::Screenshot::Saver.new(capybara_mock, page_mock) }
 
-  context 'html filename' do
-    it 'should have default format of "screenshot-Y-M-D-H-M-S.html"' do
+  context 'html filename with Capybara Version 1' do
+    before do
+      stub_const("Capybara::VERSION", '1')
+    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")
 
       saver.save
@@ -41,7 +45,27 @@ 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', "custom-prefix_#{timestamp}.html")
+
+      saver.save
+    end
+  end
+
+  context 'html filename with Capybara Version 2' do
+    before do
+      stub_const("Capybara::VERSION", '2')
+    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")
+
+      saver.save
+    end
+
+    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")
 
       saver.save
     end
@@ -54,7 +78,7 @@ describe Capybara::Screenshot::Saver do
       saver.save
     end
 
-    it 'should have default filename format of "screenshot-Y-M-D-H-M-S.png"' do
+    it 'should have default filename format of "screenshot_Y-M-D-H-M-S.ms.png"' do
       driver_mock.should_receive(:render).with(/#{file_basename}\.png$/)
 
       saver.save
@@ -62,7 +86,7 @@ describe Capybara::Screenshot::Saver do
 
     it 'should use filename prefix argument as basename prefix' do
       saver = Capybara::Screenshot::Saver.new(capybara_mock, page_mock, true, 'custom-prefix')
-      driver_mock.should_receive(:render).with(/custom-prefix-#{timestamp}\.png$/)
+      driver_mock.should_receive(:render).with(/#{capybara_root}\/custom-prefix_#{timestamp}\.png$/)
 
       saver.save
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -19,6 +19,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,6 +30,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1964539847270937869
+      hash: -502489258301273906
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1964539847270937869
+      hash: -502489258301273906
 requirements: []
 rubyforge_project: capybara-screenshot
 rubygems_version: 1.8.24