From f3353895a04dfd9a06cf1ca2e7bbfb80a38dbfad Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Tue, 3 Jul 2012 21:02:46 -0300
Subject: Kill not used constant since removal of runner method

Runner method was removed in ada571bfcdbad669ae43a4dd18277ef227680a0b.
---
 activesupport/lib/active_support/testing/setup_and_teardown.rb | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'activesupport')

diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index ddb7396aa9..a65148cf1f 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -4,20 +4,11 @@ require 'active_support/callbacks'
 module ActiveSupport
   module Testing
     module SetupAndTeardown
-
-      PASSTHROUGH_EXCEPTIONS = [
-        NoMemoryError,
-        SignalException,
-        Interrupt,
-        SystemExit
-      ]
-
       extend ActiveSupport::Concern
 
       included do
         include ActiveSupport::Callbacks
         define_callbacks :setup, :teardown
-
       end
 
       module ClassMethods
-- 
cgit v1.2.3


From 6f74d36c4263a6cbbc6dc32a03edeed04faefbd9 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 4 Jul 2012 11:16:21 -0700
Subject: activesupport gem dependencies should reflect the versions we
 actually use

---
 activesupport/activesupport.gemspec           | 1 +
 activesupport/lib/active_support/test_case.rb | 1 +
 2 files changed, 2 insertions(+)

(limited to 'activesupport')

diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index fa38d5c1e3..836bc2f9cf 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_dependency('i18n',       '~> 0.6')
   s.add_dependency('multi_json', '~> 1.3')
   s.add_dependency('tzinfo',     '~> 0.3.33')
+  s.add_dependency('minitest',   '~> 3.2')
 end
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index b6abc3b561..a6f3b43792 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -1,3 +1,4 @@
+gem 'minitest' # make sure we get the gem, not stdlib
 require 'minitest/spec'
 require 'active_support/testing/setup_and_teardown'
 require 'active_support/testing/assertions'
-- 
cgit v1.2.3