capybara-screenshot 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab9945e12e4f0aecbd988f805e0823c97506dda
-  data.tar.gz: 3114b7782691089bf0226c05473be33b14f148c6
+  metadata.gz: 0b22d05c34f635af9cc03ca84aa57d11addd461e
+  data.tar.gz: bab574490ec585c958590977030bec8101b91e06
 SHA512:
-  metadata.gz: 7fa7efb0ec06499bd65217077de23ecd8f63a89c7562f08187d2525ae3b9e5b873d8c769b181232aa433bf2749dd109a1421b045bed8cfd5fda6b44204ead894
-  data.tar.gz: 2fdd28b3be83176029cdb4461c2891412571469bbde6634a0ab1f6b3cff8bee767e2053a7b595b7769a2cff3df36a618f12f4100ca5adfc35ac7ce3b3311cb3d
+  metadata.gz: 84e95bc1a09fd91f0d59de2cdce2494a967d44d970b5bde24d02eb205e59ceefb46905faa55f544568229c02e94313e6a7524d0ae269ec8af3ba9cbfcffa6ff2
+  data.tar.gz: a49fa5149d17b6aa390af17a76c74afe8bfdb96f4f33fcd2b3b77fc0dca163ec84774fa5414e6f24450665b2715156d8e1f04e8278ccfdba2497d78b88ea4d4a

data/.travis.yml

@@ -11,4 +11,5 @@ gemfile:
   - gemfiles/cucumber.2.4.gemfile
   - gemfiles/latest.gemfile
   - gemfiles/rspec.3.0.gemfile
+  - gemfiles/rspec.3.3.gemfile
   - gemfiles/spinach.0.8.gemfile

data/Appraisals

@@ -1,19 +1,29 @@
 appraise "rspec.3.0" do
   gem "rspec", "3.0"
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
+end
+
+appraise "rspec.3.3" do
+  gem "rspec", "~> 3.3.0"
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end
 
 appraise "cucumber.1.3" do
   gem "cucumber", "~>1.3.0"
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end
 
 appraise "cucumber.2.4" do
   gem "cucumber", "~>2.4.0"
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end
 
 appraise "spinach.0.8" do
   gem "spinach", "~>0.8.0"
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end
 
 appraise "latest" do
   # will get latest versions of all gems
+  gem 'nokogiri', '< 1.7.0', platform: :ruby_20
 end

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+2 November 2017 - 1.0.17 -> 1.0.18
+
+* [RSpec 3.3 support](https://github.com/mattheworiordan/capybara-screenshot/pull/213)
+* [Add support for selenium_chrome and selenium_chrome_headless](https://github.com/mattheworiordan/capybara-screenshot/pull/219)
+* [Less dependencies for S3 uploads](https://github.com/mattheworiordan/capybara-screenshot/pull/218)
+
+Special thanks to the fine contribution from [Matt Bricston](https://github.com/mattbrictson)
+
 17 July 2017 - 1.0.16 -> 1.0.17
 
 * [Better handling of `page.current_path` exceptions for Spinach](https://github.com/mattheworiordan/capybara-screenshot/pull/208)

data/README.md

@@ -194,11 +194,11 @@ Uploading screenshots to S3
 --------------------------
 You can configure capybara-screenshot to automatically save your screenshots to an AWS S3 bucket.
 
-First, install the `aws-sdk` gem or add it to your Gemfile
+First, install the `aws-sdk-s3` gem or add it to your Gemfile
 
 ```ruby
-gem 'capybara-screenshot', :group => :test
-gem 'aws-sdk', :group => :test
+gem 'aws-sdk-s3', group: :test
+gem 'capybara-screenshot', group: :test
 ```
 
 Next, configure capybara-screenshot with your S3 credentials, the bucket to save to, and an optional region (default: `us-east-1`).

data/capybara-screenshot.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'spinach'
   s.add_development_dependency 'minitest'
-  s.add_development_dependency 'aws-sdk'
+  s.add_development_dependency 'aws-sdk-s3'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/gemfiles/cucumber.1.3.gemfile

@@ -7,5 +7,6 @@ gem "rake", "~> 10.0"
 gem "appraisal", "~> 2.0"
 gem "aruba", "~> 0.14.0"
 gem "cucumber", "~>1.3.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
 
 gemspec :path => "../"

data/gemfiles/cucumber.2.4.gemfile

@@ -7,5 +7,6 @@ gem "rake", "~> 10.0"
 gem "appraisal", "~> 2.0"
 gem "aruba", "~> 0.14.0"
 gem "cucumber", "~>2.4.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
 
 gemspec :path => "../"

data/gemfiles/latest.gemfile

@@ -6,5 +6,6 @@ gem "rack", "~> 1.0"
 gem "rake", "~> 10.0"
 gem "appraisal", "~> 2.0"
 gem "aruba", "~> 0.14.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
 
 gemspec :path => "../"

data/gemfiles/rspec.3.0.gemfile

@@ -7,5 +7,6 @@ gem "rake", "~> 10.0"
 gem "appraisal", "~> 2.0"
 gem "aruba", "~> 0.14.0"
 gem "rspec", "3.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
 
 gemspec :path => "../"

data/gemfiles/rspec.3.3.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rack", "~> 1.0"
+gem "rake", "~> 10.0"
+gem "appraisal", "~> 2.0"
+gem "aruba", "~> 0.14.0"
+gem "rspec", "~> 3.3.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
+
+gemspec :path => "../"

data/gemfiles/spinach.0.8.gemfile

@@ -7,5 +7,6 @@ gem "rake", "~> 10.0"
 gem "appraisal", "~> 2.0"
 gem "aruba", "~> 0.14.0"
 gem "spinach", "~>0.8.0"
+gem "nokogiri", "< 1.7.0", platform: :ruby_20
 
 gemspec :path => "../"

data/lib/capybara-screenshot.rb

@@ -156,10 +156,14 @@ Capybara::Screenshot.class_eval do
     :not_supported
   end
 
-  register_driver(:selenium) do |driver, path|
+  selenium_block = proc do |driver, path|
     driver.browser.save_screenshot(path)
   end
 
+  register_driver :selenium, &selenium_block
+  register_driver :selenium_chrome, &selenium_block
+  register_driver :selenium_chrome_headless, &selenium_block
+
   register_driver(:poltergeist) do |driver, path|
     driver.render(path, :full => true)
   end

data/lib/capybara-screenshot/rspec.rb

@@ -43,7 +43,8 @@ module Capybara
         "RSpec::Core::Formatters::JsonFormatter"          => Capybara::Screenshot::RSpec::JsonReporter,
         "RSpec::Core::Formatters::TextMateFormatter"      => Capybara::Screenshot::RSpec::TextMateLinkReporter, # RSpec 2
         "RSpec::Mate::Formatters::TextMateFormatter"      => Capybara::Screenshot::RSpec::TextMateLinkReporter,  # RSpec 3
-        "Fuubar"                                          => Capybara::Screenshot::RSpec::TextReporter
+        "Fuubar"                                          => Capybara::Screenshot::RSpec::TextReporter,
+        "Spec::Runner::Formatter::TeamcityFormatter"      => Capybara::Screenshot::RSpec::TextReporter
       }
 
       class << self
@@ -52,7 +53,7 @@ module Capybara
         def after_failed_example(example)
           if example.example_group.include?(Capybara::DSL) # Capybara DSL method has been included for a feature we can snapshot
             Capybara.using_session(Capybara::Screenshot.final_session_name) do
-              if Capybara.page.current_url != '' && Capybara::Screenshot.autosave_on_failure && example.exception
+              if Capybara::Screenshot.autosave_on_failure && failed?(example) && Capybara.page.current_url != ''
                 filename_prefix = Capybara::Screenshot.filename_prefix_for(:rspec, example)
 
                 saver = Capybara::Screenshot.new_saver(Capybara, Capybara.page, true, filename_prefix)
@@ -65,6 +66,18 @@ module Capybara
             end
           end
         end
+
+        private
+
+        def failed?(example)
+          return true if example.exception
+          return false unless defined?(::RSpec::Expectations::FailureAggregator)
+
+          failure_notifier = ::RSpec::Support.failure_notifier
+          return false unless failure_notifier.is_a?(::RSpec::Expectations::FailureAggregator)
+
+          failure_notifier.failures.any? || failure_notifier.other_errors.any?
+        end
       end
 
       self.add_link_to_screenshot_for_failed_examples = true

data/lib/capybara-screenshot/s3_saver.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-s3'
 
 module Capybara
   module Screenshot

data/lib/capybara-screenshot/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Screenshot
-    VERSION = '1.0.17'
+    VERSION = '1.0.18'
   end
 end

data/spec/rspec/rspec_spec.rb

@@ -40,7 +40,7 @@ describe Capybara::Screenshot::RSpec, :type => :aruba do
       "rspec #{"--format #{format} " if format}#{expand_path('spec/test_failure.rb')}"
     end
 
-    it 'saves a screenshot on failure' do
+    it 'saves a screenshot when browser action fails' do
       run_failing_case <<-RUBY, %q{Unable to find link or button "you'll never find me"}
         feature 'screenshot with failure' do
           scenario 'click on a missing link' do
@@ -50,7 +50,19 @@ describe Capybara::Screenshot::RSpec, :type => :aruba do
           end
         end
       RUBY
-      expect(expand_path('tmp/screenshot.html')).to_not have_file_content('This is the root page')
+      expect('tmp/screenshot.html').to have_file_content('This is the root page')
+    end
+
+    it 'saves a screenshot when expectation fails when using :aggregate_failures' do
+      run_failing_case <<-RUBY, %q{expected "This is the root page" to include "you'll never find me"}
+        feature 'screenshot with failure', :aggregate_failures do
+          scenario 'expect a missing link' do
+            visit '/'
+            expect(page.body).to include("you'll never find me")
+          end
+        end
+      RUBY
+      expect('tmp/screenshot.html').to have_file_content('This is the root page')
     end
 
     formatters = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Matthew O'Riordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -157,7 +157,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -192,6 +192,7 @@ files:
 - gemfiles/cucumber.2.4.gemfile
 - gemfiles/latest.gemfile
 - gemfiles/rspec.3.0.gemfile
+- gemfiles/rspec.3.3.gemfile
 - gemfiles/spinach.0.8.gemfile
 - lib/capybara-screenshot.rb
 - lib/capybara-screenshot/callbacks.rb