capybara-screenshot 0.1.6 → 0.1.7

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+3 December 2011
+---------------
+
+More robust handling of Minitest for users who have it installed as a dependency
+https://github.com/mattheworiordan/capybara-screenshot/issues/5
+
+
 2 December 2011
 ---------------
 

data/lib/capybara-screenshot/minitest.rb

@@ -1,27 +1,25 @@
 require 'capybara-screenshot/saver'
 
 if defined?(ActionDispatch::IntegrationTest)
-  # older versions of Minitest support add_tear_downhook
-  if defined?(ActionDispath::IntegrationTest.add_teardown_hook)
-    ActionDispatch::IntegrationTest.add_teardown_hook do |context|
-      # by adding the argument context, MiniTest passes the context of the test
-      # which has an instance variable @passed indicating success / failure
-      context.instance_eval do
-        if @passed.blank?
-          Capybara::Screenshot::Saver.screen_shot_and_save_page Capybara, Capybara.body
-        end
-      end
-    end
-  else
-    # new since 2.8.1 use after instead of add_tear_downhook
-    ActionDispatch::IntegrationTest.after do |context|
-      # by adding the argument context, MiniTest passes the context of the test
-      # which has an instance variable @passed indicating success / failure
-      context.instance_eval do
-        if @passed.blank?
-          Capybara::Screenshot::Saver.screen_shot_and_save_page Capybara, Capybara.body
+  method = if ActionDispatch::IntegrationTest.respond_to? :teardown
+    :teardown
+  elsif ActionDispatch::IntegrationTest.respond_to? :add_tear_down_hook
+    :add_tear_down_hook
+  end
+
+  unless method.nil?
+    begin
+      ActionDispatch::IntegrationTest.send method do |context|
+        # by adding the argument context, MiniTest passes the context of the test
+        # which has an instance variable @passed indicating success / failure
+        context.instance_eval do
+          if @passed.blank?
+            Capybara::Screenshot::Saver.screen_shot_and_save_page Capybara, Capybara.body
+          end
         end
       end
+    rescue NoMethodError
+      # do nothing, teardown for minitest not available
     end
   end
 end

data/lib/capybara-screenshot/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Screenshot
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capybara-screenshot
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Matthew O'Riordan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 +00:00
+date: 2011-12-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency