diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-04 11:18:20 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-07-04 11:18:20 -0700 |
| commit | c8d6dded997b46d0e1807fe295363fc5048a33ef (patch) | |
| tree | dabbd4f98eeb44001266e07383edac93cc04dea2 /activesupport | |
| parent | 9669f6f7883787aa209207cab68b1069636aed9e (diff) | |
| parent | 6f74d36c4263a6cbbc6dc32a03edeed04faefbd9 (diff) | |
| download | rails-c8d6dded997b46d0e1807fe295363fc5048a33ef.tar.gz rails-c8d6dded997b46d0e1807fe295363fc5048a33ef.tar.bz2 rails-c8d6dded997b46d0e1807fe295363fc5048a33ef.zip | |
Merge branch 'master' into testclean
* master:
activesupport gem dependencies should reflect the versions we actually use
fix link and add activeresource link in release notes page [ci skip]
Update 4.0 Release Notes
Kill not used constant since removal of runner method
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/activesupport.gemspec | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/test_case.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/testing/setup_and_teardown.rb | 9 |
3 files changed, 2 insertions, 9 deletions
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' 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 |