capybara-screenshot 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2c4277a621182718153bba9b9bae60234ddfd17
-  data.tar.gz: 6af401d8ae56c2849916c0145f0f0ce928cc92ac
+  metadata.gz: 71470cade862f24352d34e3d61d3e1d6e53ede52
+  data.tar.gz: abbee3986bf463c8b26526337255ec8397b2757d
 SHA512:
-  metadata.gz: 0696563bcf86da3827f2d8392f2555c56e2f830b0ff6c76bad72d5ac2c1b8ddb37730fee26c51924dbd0f4edc4cf8054949adac7506bf01b45cd955fc200c676
-  data.tar.gz: 55ebe3341f404a7c57d5265ca6478127e3b3b4f277a0f2d130f87d5724b0d38d6d441fed4488ab13d0194826432ad0491f6a52b754dc19e578f6f33f61be1a83
+  metadata.gz: 6540046700e726903a13951d1fc8776da24d9db19a0096e65a3009404f66c3aea364727421b629a0292364d54bb19c207322694b198fcf52c3e64ca30019473b
+  data.tar.gz: b7c37d742286182baa7c97d767a12a0c162e465c32338e19407c02a70159046682cb7233bcdba7763b7923a0315b844bdc73792272ffcbecfb02a97eee393dc2

data/.travis.yml

@@ -1,18 +1,13 @@
 language: ruby
 script: "rake travis:ci"
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1.10
   - 2.2.1
-  - jruby-19mode
-  - jruby-1.7.13
+  - 2.3.1
 gemfile:
-  - gemfiles/cucumber.1.2.gemfile
-  - gemfiles/cucumber.1.3.0.gemfile
+  - gemfiles/cucumber.1.3.gemfile
+  - gemfiles/cucumber.2.4.gemfile
   - gemfiles/latest.gemfile
-  - gemfiles/rspec.2.14.gemfile
-  - gemfiles/rspec.2.99.gemfile
   - gemfiles/rspec.3.0.gemfile
-  - gemfiles/spinach.0.7.gemfile
-  - gemfiles/spinach.0.8.0.gemfile
+  - gemfiles/spinach.0.8.gemfile

data/Appraisals

@@ -1,29 +1,17 @@
-appraise "rspec.2.14" do
-  gem "rspec", "2.14"
-end
-
-appraise "rspec.2.99" do
-  gem "rspec", "2.99"
-end
-
 appraise "rspec.3.0" do
   gem "rspec", "3.0"
 end
 
-appraise "cucumber.1.2" do
-  gem "cucumber", "1.2"
-end
-
-appraise "cucumber.1.3.0" do
-  gem "cucumber", "1.3.0"
+appraise "cucumber.1.3" do
+  gem "cucumber", "~>1.3.0"
 end
 
-appraise "spinach.0.7" do
-  gem "spinach", "0.7"
+appraise "cucumber.2.4" do
+  gem "cucumber", "~>2.4.0"
 end
 
-appraise "spinach.0.8.0" do
-  gem "spinach", "0.8.0"
+appraise "spinach.0.8" do
+  gem "spinach", "~>0.8.0"
 end
 
 appraise "latest" do

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+15 Sep 2016 - 1.0.13 -> 1.0.14
+
+* CI stable again - dropped CI support for older versions of Ruby and JRuby.  It is just too painful and there is no evidence that our users need this or that Capybara Screenshot is indeed broken.  It is better to have a reliable build system so that PRs can get merged in reliably and easily.
+* Fixed an inconsistency in the use of `save_and_open_page_path`
+* Improved debugging of Aruba tests so that contributors can easily understand why their builds break
+* Path fixes thanks to [Ryan McGarvey](https://github.com/ryanmcgarvey)
+
 23 May 2016 - 1.0.12 -> 1.0.13
 
 * Fixes [mkmf bug 162](https://github.com/mattheworiordan/capybara-screenshot/issues/162) and [mkmf bug 174](https://github.com/mattheworiordan/capybara-screenshot/issues/174)

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in capybara-screenshot.gemspec
 gemspec
 
-gem 'rake'
-gem 'appraisal'
-gem 'aruba', '~> 0.14.0'
+gem 'rack', '~> 1.0'
+gem 'rake', '~> 10.0'
+gem 'appraisal', '~> 2.0'
+gem 'aruba', '~> 0.14.0'

data/README.md

@@ -170,13 +170,13 @@ By default, when running under Rails, Sinatra, and Padrino, screenshots are save
 If you want to customize the location, override the file path as:
 
 ```ruby
-Capybara.save_and_open_page_path = "/file/path"
+Capybara.save_path = "/file/path"
 ```
 
 
 Uploading screenshots to S3
 --------------------------
-You can configure capybara-screenshot to automatically save your screenshots to an AWS S3 bucket. 
+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
 
@@ -185,7 +185,7 @@ gem 'capybara-screenshot', :group => :test
 gem 'aws-sdk', :group => :test
 ```
 
-Next, configure capybara-screenshot with your S3 credentials, the bucket to save to, and an optional region (default: `us-east-1`). 
+Next, configure capybara-screenshot with your S3 credentials, the bucket to save to, and an optional region (default: `us-east-1`).
 
 ```ruby
 Capybara::Screenshot.s3_configuration = {
@@ -254,7 +254,7 @@ Please raise an issue at [https://github.com/mattheworiordan/capybara-screenshot
 
 #### Contributions
 
-Contributions are welcome.  Please fork this gem, and submit a pull request.  New features must include test coverage and must pass on all versions of the testing frameworks supported.  Run `appraisal "bundle exec rspec && bundle exec cucumber"` locally to test your changes against all versions of testing framework gems supported.
+Contributions are welcome.  Please fork this gem, and submit a pull request.  New features must include test coverage and must pass on all versions of the testing frameworks supported.  Run `appraisal` to set up the your Gems. then `appraisal "rake travis:ci"` locally to test your changes against all versions of testing framework gems supported.
 
 #### Rubygems
 
@@ -272,4 +272,4 @@ This gem was written by **Matthew O'Riordan**, with contributions from [many kin
 License
 -------
 
-Copyright © 2014 Matthew O'Riordan, inc. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+Copyright © 2016 Matthew O'Riordan, inc. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/gemfiles/cucumber.1.3.gemfile

@@ -0,0 +1,11 @@
+# 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 "cucumber", "~>1.3.0"
+
+gemspec :path => "../"

data/gemfiles/cucumber.2.4.gemfile

@@ -0,0 +1,11 @@
+# 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 "cucumber", "~>2.4.0"
+
+gemspec :path => "../"

data/gemfiles/latest.gemfile

@@ -2,7 +2,9 @@
 
 source "http://rubygems.org"
 
-gem "rake"
-gem "appraisal"
+gem "rack", "~> 1.0"
+gem "rake", "~> 10.0"
+gem "appraisal", "~> 2.0"
+gem "aruba", "~> 0.14.0"
 
 gemspec :path => "../"

data/gemfiles/rspec.3.0.gemfile

@@ -2,8 +2,10 @@
 
 source "http://rubygems.org"
 
-gem "rake"
-gem "appraisal"
+gem "rack", "~> 1.0"
+gem "rake", "~> 10.0"
+gem "appraisal", "~> 2.0"
+gem "aruba", "~> 0.14.0"
 gem "rspec", "3.0"
 
 gemspec :path => "../"

data/gemfiles/spinach.0.8.gemfile

@@ -0,0 +1,11 @@
+# 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 "spinach", "~>0.8.0"
+
+gemspec :path => "../"

data/lib/capybara-screenshot.rb

@@ -115,6 +115,19 @@ module Capybara
         Capybara.save_and_open_page_path
       end || '.'
     end
+
+    # Configure the path unless '.'
+    def self.capybara_tmp_path=(path)
+      return if path == '.'
+
+      # `#save_and_open_page_path` is deprecated
+      # https://github.com/jnicklas/capybara/blob/48ab1ede946dec2250a2d1d8cbb3313f25096456/History.md#L37
+      if Capybara.respond_to?(:save_path)
+        Capybara.save_path = path
+      else
+        Capybara.save_and_open_page_path = path
+      end
+    end
   end
 end
 

data/lib/capybara-screenshot/pruner.rb

@@ -13,6 +13,7 @@ module Capybara
           lambda { prune_with_last_run_strategy }
         when Hash
           raise ArgumentError, ":keep key is required" unless strategy[:keep]
+          raise ArgumentError, ":keep must be a Integer" unless strategy[:keep].kind_of?(Integer)
           raise ArgumentError, ":keep value must be number greater than zero" unless strategy[:keep].to_i > 0
           lambda { prune_with_numeric_strategy(strategy[:keep].to_i) }
         else

data/lib/capybara-screenshot/saver.rb

@@ -20,7 +20,7 @@ module Capybara
 
       def save
         # if current_path empty then nothing to screen shot as browser has not loaded any URL
-        return if capybara.current_path.to_s.empty?
+        return if page.current_path.to_s.empty?
 
         save_html if @html_save
         save_screenshot
@@ -28,7 +28,7 @@ module Capybara
 
       def save_html
         path = html_path
-        clear_save_and_open_page_path do
+        clear_save_path do
           if Capybara::VERSION.match(/^\d+/)[0] == '1'
             capybara.save_page(page.body, "#{path}")
           else
@@ -40,7 +40,7 @@ module Capybara
 
       def save_screenshot
         path = screenshot_path
-        clear_save_and_open_page_path do
+        clear_save_path do
           result = 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]
@@ -65,15 +65,15 @@ module Capybara
         @screenshot_saved
       end
 
-      # If Capybara.save_and_open_page_path is set then
+      # If Capybara::Screenshot.capybara_tmp_path is set then
       # the html_path or screenshot_path can be appended to this path in
       # some versions of Capybara instead of using it as an absolute path
-      def clear_save_and_open_page_path
-        old_path = Capybara.save_and_open_page_path
-        Capybara.save_and_open_page_path = nil
+      def clear_save_path
+        old_path = Capybara::Screenshot.capybara_tmp_path
+        Capybara::Screenshot.capybara_tmp_path = nil
         yield
       ensure
-        Capybara.save_and_open_page_path = old_path
+        Capybara::Screenshot.capybara_tmp_path = old_path
       end
 
       def output_screenshot_path

data/lib/capybara-screenshot/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Screenshot
-    VERSION = '1.0.13'
+    VERSION = '1.0.14'
   end
 end

data/spec/rspec/rspec_spec.rb

@@ -6,7 +6,7 @@ describe Capybara::Screenshot::RSpec, :type => :aruba do
 
     before do
       setup_aruba
-      Capybara.save_and_open_page_path = expand_path('tmp')
+      Capybara::Screenshot.capybara_tmp_path = expand_path('tmp')
     end
 
     def run_failing_case(code, error_message, format=nil)

data/spec/support/common_setup.rb

@@ -20,7 +20,7 @@ module CommonSetup
     target.let(:setup_test_app) do
       <<-RUBY
         require 'support/test_app'
-        Capybara.save_and_open_page_path = '#{screenshot_path}'
+        Capybara::Screenshot.capybara_tmp_path = '#{screenshot_path}'
         Capybara.app = TestApp
         Capybara::Screenshot.append_timestamp = false
         #{@additional_setup_steps}
@@ -33,6 +33,14 @@ module CommonSetup
       end
     end
 
+    target.after(:each) do |example|
+      if example.exception
+        puts "Output from failed Aruba test:"
+        puts all_output.split(/\n/).map { |line| "   #{line}"}
+        puts ""
+      end
+    end
+
     def run_simple_with_retry(*args)
       run_simple(*args)
     rescue ChildProcess::TimeoutError => e

data/spec/unit/pruner_spec.rb

@@ -27,7 +27,7 @@ describe Capybara::Screenshot::Pruner do
         let(:strategy) { :invalid_strategy }
 
         it 'raises an error' do
-          expect { pruner }.to raise_error
+          expect { pruner }.to raise_error(/Invalid prune strategy/)
         end
       end
 
@@ -35,7 +35,7 @@ describe Capybara::Screenshot::Pruner do
         let(:strategy) { { keep: :symbol } }
 
         it 'raises an error' do
-          expect { pruner }.to raise_error
+          expect { pruner }.to raise_error(/must be a Integer/)
         end
       end
     end

data/spec/unit/saver_spec.rb

@@ -21,11 +21,14 @@ describe Capybara::Screenshot::Saver do
   let(:screenshot_path) { "#{capybara_root}/#{file_basename}.png" }
 
   let(:driver_mock) { double('Capybara driver').as_null_object }
-  let(:page_mock) { double('Capybara session page', :body => 'body', :driver => driver_mock).as_null_object }
+  let(:page_mock) {
+    double('Capybara session page', :body => 'body', :driver => driver_mock).as_null_object.tap do |m|
+      allow(m).to receive(:current_path).and_return('/')
+    end
+  }
   let(:capybara_mock) {
     double(Capybara).as_null_object.tap do |m|
       allow(m).to receive(:current_driver).and_return(:default)
-      allow(m).to receive(:current_path).and_return('/')
     end
   }
 
@@ -110,7 +113,7 @@ describe Capybara::Screenshot::Saver do
   end
 
   it 'does not save if current_path is empty' do
-    allow(capybara_mock).to receive(:current_path).and_return(nil)
+    allow(page_mock).to receive(:current_path).and_return(nil)
     expect(capybara_mock).to_not receive(:save_page)
     expect(driver_mock).to_not receive(:render)
 
@@ -121,7 +124,7 @@ describe Capybara::Screenshot::Saver do
 
   context 'when saving a screenshot fails' do
     it 'still restores the original value of Capybara.save_and_open_page_path' do
-      Capybara.save_and_open_page_path = 'tmp/bananas'
+      Capybara::Screenshot.capybara_tmp_path = 'tmp/bananas'
 
       expect(capybara_mock).to receive(:save_page).and_raise
 
@@ -129,7 +132,11 @@ describe Capybara::Screenshot::Saver do
         saver.save
       }.to raise_error(RuntimeError)
 
-      expect(Capybara.save_and_open_page_path).to eq('tmp/bananas')
+      if Capybara.respond_to?(:save_path)
+        expect(Capybara.save_path).to eq('tmp/bananas')
+      else
+        expect(Capybara.save_and_open_page_path).to eq('tmp/bananas')
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-screenshot
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Matthew O'Riordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -188,14 +188,11 @@ files:
 - README.md
 - Rakefile
 - capybara-screenshot.gemspec
-- gemfiles/cucumber.1.2.gemfile
-- gemfiles/cucumber.1.3.0.gemfile
+- gemfiles/cucumber.1.3.gemfile
+- gemfiles/cucumber.2.4.gemfile
 - gemfiles/latest.gemfile
-- gemfiles/rspec.2.14.gemfile
-- gemfiles/rspec.2.99.gemfile
 - gemfiles/rspec.3.0.gemfile
-- gemfiles/spinach.0.7.gemfile
-- gemfiles/spinach.0.8.0.gemfile
+- gemfiles/spinach.0.8.gemfile
 - lib/capybara-screenshot.rb
 - lib/capybara-screenshot/capybara.rb
 - lib/capybara-screenshot/cucumber.rb
@@ -258,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capybara-screenshot
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Automatically create snapshots when Cucumber steps fail with Capybara and

data/gemfiles/cucumber.1.2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rake"
-gem "appraisal"
-gem "cucumber", "1.2"
-
-gemspec :path => "../"

data/gemfiles/cucumber.1.3.0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rake"
-gem "appraisal"
-gem "cucumber", "1.3.0"
-
-gemspec :path => "../"

data/gemfiles/rspec.2.14.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rake"
-gem "appraisal"
-gem "rspec", "2.14"
-
-gemspec :path => "../"

data/gemfiles/rspec.2.99.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rake"
-gem "appraisal"
-gem "rspec", "2.99"
-
-gemspec :path => "../"

data/gemfiles/spinach.0.7.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rake"
-gem "appraisal"
-gem "spinach", "0.7"
-
-gemspec :path => "../"

data/gemfiles/spinach.0.8.0.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rake"
-gem "appraisal"
-gem "spinach", "0.8.0"
-
-gemspec :path => "../"