capybara-screenshot 0.3.20 → 0.3.21

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWU2OWY4YzU2ZjQyYjIwNWM0MGEzOTA3Mjg4YjFiMTY5NTA1NTdhYQ==
-  data.tar.gz: !binary |-
-    NmU0ZjcwMTYyMzlmOGYwYzYyODI1YmZlNjg1OGExMmI3ZTM0NDgyYw==
+SHA1:
+  metadata.gz: 91a97a9e0bf879f017c84d44a8f8924bb85c4fd9
+  data.tar.gz: 42f70ae43c2d25cea336b84eb26bb4473130791a
 SHA512:
-  metadata.gz: !binary |-
-    NTRiMDIxYmQ1NzkwNTIzM2RkOGMzNzE0MDJiMGE1OGM3MTk3ZDc1YmNiZDYx
-    ZTVhNDI0MjM0OGQ0YWQ0YTIyOWQ4M2Y5MWJmMGVjYmRmODZkMTYxOWIxNjQ5
-    MzRlZDI5NDIwMmI3NzE0ZDU5ZTE5NGI0ZmEyNTZlNmFlZjE4NzU=
-  data.tar.gz: !binary |-
-    YzhhMjc5MTQ1MGNlNjU4YWE2ZmZjNzNiNDAwM2I3M2I2ZDM3MTk5ODk3ZjVh
-    YTM3NjE5Yjk1MDBlMDM3Yjk3ODYyY2E5NTk0NDAxMTQ1N2RkNmIzMDZiMmU3
-    NGY5ZjI2ZmVlYzA1MzczN2E4ZDkyMjAzYjZhYzk1MzYzNmVjOGY=
+  metadata.gz: a1c6eef0cdd4e3d0f8145cd5b2604890dda72ec6b59cf18b94a3efc961824c2620935fa3a8104c2edb8bcb7c0ae6814238c25714847e50b88d7dc92141787d3b
+  data.tar.gz: 7256a232ad55ac1ea9573e53672011d11693a3745cf1f30352863313d298eca9849a016ad89a14b62d140fa87da1542a1e3641b4b57ccf74eac5cb48c4a603f5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+22 July 2014 - 0.3.20 -> 0.3.21
+-----------
+
+As a result of recent merges and insufficient test coverage, it seems that for test suites other than RSpec the HTML or Image screenshot path was no longer being outputted in the test results.  This has now been fixed, and screenshot output format for RSpec and all other test suites has been standardised.
+
 11 July 2014 - 0.3.19 -> 0.3.20
 -----------
 

data/capybara-screenshot.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |s|
     s.add_dependency 'capybara', ['>= 1.0', '< 3']
   end
   s.add_dependency 'launchy'
-  
-  s.add_development_dependency 'rspec', '~> 2.7'
+  s.add_dependency 'colorize'
+
+  s.add_development_dependency 'rspec', '~> 2.9'
   s.add_development_dependency 'timecop'
 
   s.files         = `git ls-files`.split("\n")

data/lib/capybara-screenshot/cucumber.rb

@@ -4,6 +4,7 @@ After do |scenario|
 
     saver = Capybara::Screenshot::Saver.new(Capybara, Capybara.page, true, filename_prefix)
     saver.save
+    saver.output_screenshot_path
 
     # Trying to embed the screenshot into our output."
     if File.exist?(saver.screenshot_path)
@@ -15,4 +16,4 @@ After do |scenario|
       embed("data:image/png;base64,#{encoded_img}", 'image/png', "Screenshot of the error")
     end
   end
-end
+end

data/lib/capybara-screenshot/minitest.rb

@@ -16,9 +16,10 @@ unless method.nil?
 
         saver = Capybara::Screenshot::Saver.new(Capybara, Capybara.page, true, filename_prefix)
         saver.save
+        saver.output_screenshot_path
       end
     end
   rescue NoMethodError
     # do nothing, teardown for minitest not available
   end
-end
+end

data/lib/capybara-screenshot/rspec/text_reporter.rb

@@ -11,9 +11,8 @@ module Capybara
           dump_failure_info_without_screenshot(example)
           return unless (screenshot = example.metadata[:screenshot])
 
-          colorize = lambda { |str| respond_to?(:failure_color, true) ? failure_color(str) : red(str) }
-          output.puts(long_padding + colorize["HTML page: #{screenshot[:html]}"]) if screenshot[:html]
-          output.puts(long_padding + colorize["Screenshot: #{screenshot[:image]}"]) if screenshot[:image]
+          output.puts(long_padding + "HTML screenshot: #{screenshot[:html]}".colorize(:yellow)) if screenshot[:html]
+          output.puts(long_padding + "Image screenshot: #{screenshot[:image]}".colorize(:yellow)) if screenshot[:image]
         end
       end
     end

data/lib/capybara-screenshot/saver.rb

@@ -1,3 +1,5 @@
+require 'colorize'
+
 module Capybara
   module Screenshot
     class Saver
@@ -67,6 +69,16 @@ module Capybara
         yield
         Capybara.save_and_open_page_path = old_path
       end
+
+      def output_screenshot_path
+        output "HTML screenshot: #{html_path}" if html_saved?
+        output "Image screenshot: #{screenshot_path}" if screenshot_saved?
+      end
+
+      private
+      def output(message)
+        puts "    #{message.colorize(:yellow)}"
+      end
     end
   end
 end

data/lib/capybara-screenshot/spinach.rb

@@ -3,5 +3,6 @@ Spinach.hooks.on_failed_step do |step_data, exception, location, step_definition
     filename_prefix = Capybara::Screenshot.filename_prefix_for(:spinach, step_data)
     saver = Capybara::Screenshot::Saver.new(Capybara, Capybara.page, true, filename_prefix)
     saver.save
+    saver.output_screenshot_path
   end
-end
+end

data/lib/capybara-screenshot/testunit.rb

@@ -11,6 +11,7 @@ Test::Unit::TestResult.class_eval do
 
         saver = Capybara::Screenshot::Saver.new(Capybara, Capybara.page, true, filename_prefix)
         saver.save
+        saver.output_screenshot_path
       end
     end
   end

data/lib/capybara-screenshot/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Screenshot
-    VERSION = "0.3.20"
+    VERSION = "0.3.21"
   end
 end

data/spec/capybara-screenshot/saver_spec.rb

@@ -106,7 +106,7 @@ describe Capybara::Screenshot::Saver do
     capybara_mock.should_not_receive(:save_page)
 
     saver.save
-    saver.html_saved?.should be_false
+    expect(saver.html_saved?).to be_falsey
   end
 
   it 'should not save if current_path is empty' do
@@ -115,8 +115,29 @@ describe Capybara::Screenshot::Saver do
     driver_mock.should_not_receive(:render)
 
     saver.save
-    saver.screenshot_saved?.should be_false
-    saver.html_saved?.should be_false
+    expect(saver.screenshot_saved?).to be_falsey
+    expect(saver.html_saved?).to be_falsey
+  end
+
+  describe '#output_screenshot_path' do
+    let(:saver) { Capybara::Screenshot::Saver.new(capybara_mock, page_mock) }
+
+    before do
+      allow(saver).to receive(:html_path) { 'page.html' }
+      allow(saver).to receive(:screenshot_path) { 'screenshot.png' }
+    end
+
+    it 'should output the path for the HTML screenshot' do
+      saver.stub(:html_saved?).and_return(true)
+      expect(saver).to receive(:output).with("HTML screenshot: page.html")
+      saver.output_screenshot_path
+    end
+
+    it 'should output the path for the Image screenshot' do
+      saver.stub(:screenshot_saved?).and_return(true)
+      expect(saver).to receive(:output).with("Image screenshot: screenshot.png")
+      saver.output_screenshot_path
+    end
   end
 
   describe "with selenium driver" do
@@ -130,7 +151,7 @@ describe Capybara::Screenshot::Saver do
       browser_mock.should_receive(:save_screenshot).with(screenshot_path)
 
       saver.save
-      saver.screenshot_saved?.should be_true
+      expect(saver.screenshot_saved?).to be_truthy
     end
   end
 
@@ -143,7 +164,7 @@ describe Capybara::Screenshot::Saver do
       driver_mock.should_receive(:render).with(screenshot_path, {:full => true})
 
       saver.save
-      saver.screenshot_saved?.should be_true
+      expect(saver.screenshot_saved?).to be_truthy
     end
   end
 
@@ -161,7 +182,7 @@ describe Capybara::Screenshot::Saver do
         driver_mock.should_receive(:render).with(screenshot_path)
 
         saver.save
-        saver.screenshot_saved?.should be_true
+        expect(saver.screenshot_saved?).to be_truthy
       end
     end
 
@@ -176,7 +197,7 @@ describe Capybara::Screenshot::Saver do
         driver_mock.should_receive(:save_screenshot).with(screenshot_path, {})
 
         saver.save
-        saver.screenshot_saved?.should be_true
+        expect(saver.screenshot_saved?).to be_truthy
       end
 
       it 'should pass webkit_options to driver' do
@@ -184,7 +205,7 @@ describe Capybara::Screenshot::Saver do
         driver_mock.should_receive(:save_screenshot).with(screenshot_path, webkit_options)
 
         saver.save
-        saver.screenshot_saved?.should be_true
+        expect(saver.screenshot_saved?).to be_truthy
       end
     end
   end
@@ -198,7 +219,7 @@ describe Capybara::Screenshot::Saver do
       driver_mock.should_receive(:render).with(screenshot_path)
 
       saver.save
-      saver.screenshot_saved?.should be_true
+      expect(saver.screenshot_saved?).to be_truthy
     end
   end
 
@@ -212,7 +233,7 @@ describe Capybara::Screenshot::Saver do
       driver_mock.should_receive(:render).with(screenshot_path)
 
       saver.save
-      saver.screenshot_saved?.should be_true
+      expect(saver.screenshot_saved?).to be_truthy
     end
 
     it 'should output warning about unknown results' do
@@ -220,7 +241,7 @@ describe Capybara::Screenshot::Saver do
       saver.should_receive(:warn).with(/screenshot driver for 'unknown'.*unknown results/).and_return(nil)
 
       saver.save
-      saver.screenshot_saved?.should be_true
+      expect(saver.screenshot_saved?).to be_truthy
     end
 
     describe "with rack_test driver" do
@@ -230,7 +251,7 @@ describe Capybara::Screenshot::Saver do
 
       it 'should indicate that a screenshot could not be saved' do
         saver.save
-        saver.screenshot_saved?.should be_false
+        expect(saver.screenshot_saved?).to be_falsey
       end
     end
 
@@ -241,7 +262,7 @@ describe Capybara::Screenshot::Saver do
 
       it 'should indicate that a screenshot could not be saved' do
         saver.save
-        saver.screenshot_saved?.should be_false
+        expect(saver.screenshot_saved?).to be_falsey
       end
     end
   end

data/spec/rspec/text_reporter_spec.rb

@@ -42,20 +42,20 @@ describe Capybara::Screenshot::RSpec::TextReporter do
   end
 
   context 'when a html file was saved' do
-    let(:example) { double("example", metadata: {screenshot: {html: "path/to/html"}}) }
+    let(:example) { double("example", metadata: { screenshot: { html: "path/to/html" } }) }
 
     it 'appends the html file path to the original output' do
       @reporter.dump_failure_info(example)
-      @reporter.output.string.should == "original failure info\n  colorized(HTML page: path/to/html)\n"
+      @reporter.output.string.should == "original failure info\n  #{"HTML screenshot: path/to/html".colorize(:yellow)}\n"
     end
   end
 
   context 'when a html file and an image were saved' do
-    let(:example) { double("example", metadata: {screenshot: {html: "path/to/html", image: "path/to/image"}}) }
+    let(:example) { double("example", metadata: { screenshot: { html: "path/to/html", image: "path/to/image" } }) }
 
     it 'appends the image path to the original output' do
       @reporter.dump_failure_info(example)
-      @reporter.output.string.should == "original failure info\n  colorized(HTML page: path/to/html)\n  colorized(Screenshot: path/to/image)\n"
+      @reporter.output.string.should == "original failure info\n  #{"HTML screenshot: path/to/html".colorize(:yellow)}\n  #{"Image screenshot: path/to/image".colorize(:yellow)}\n"
     end
   end
 
@@ -69,8 +69,8 @@ describe Capybara::Screenshot::RSpec::TextReporter do
     end
     old_reporter = old_reporter_class.new
     old_reporter.singleton_class.send :include, described_class
-    example = double("example", metadata: {screenshot: {html: "path/to/html"}})
+    example = double("example", metadata: { screenshot: { html: "path/to/html" } })
     old_reporter.dump_failure_info(example)
-    old_reporter.output.string.should == "original failure info\n  red(HTML page: path/to/html)\n"
+    old_reporter.output.string.should == "original failure info\n  #{"HTML screenshot: path/to/html".colorize(:yellow)}\n"
   end
 end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Matthew O'Riordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
     - - <
@@ -24,7 +24,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
     - - <
@@ -34,14 +34,28 @@ dependencies:
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -50,26 +64,26 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: When a Cucumber step fails, it is useful to create a screenshot image
@@ -124,17 +138,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: capybara-screenshot
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Automatically create snapshots when Cucumber steps fail with Capybara and