diff options
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/Rakefile | 2 | ||||
-rw-r--r-- | activerecord/test/cases/associations/callbacks_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/mixin_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/query_cache_test.rb | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/Rakefile b/activerecord/Rakefile index 976b559da9..ec6a902c00 100644 --- a/activerecord/Rakefile +++ b/activerecord/Rakefile @@ -10,7 +10,7 @@ def run_without_aborting(*tasks) tasks.each do |task| begin Rake::Task[task].invoke - rescue Exception + rescue errors << task end end diff --git a/activerecord/test/cases/associations/callbacks_test.rb b/activerecord/test/cases/associations/callbacks_test.rb index a531e0e02c..a341cb706d 100644 --- a/activerecord/test/cases/associations/callbacks_test.rb +++ b/activerecord/test/cases/associations/callbacks_test.rb @@ -180,7 +180,7 @@ class AssociationCallbacksTest < ActiveRecord::TestCase assert !@david.unchangable_posts.include?(@authorless) begin @david.unchangable_posts << @authorless - rescue Exception + rescue end assert @david.post_log.empty? assert !@david.unchangable_posts.include?(@authorless) diff --git a/activerecord/test/cases/mixin_test.rb b/activerecord/test/cases/mixin_test.rb index 7ddb2bfee1..7ebdcac711 100644 --- a/activerecord/test/cases/mixin_test.rb +++ b/activerecord/test/cases/mixin_test.rb @@ -61,8 +61,6 @@ class TouchTest < ActiveRecord::TestCase # Make sure Mixin.record_timestamps gets reset, even if this test fails, # so that other tests do not fail because Mixin.record_timestamps == false - rescue Exception => e - raise e ensure Mixin.record_timestamps = true end diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb index 744f9edc47..a5f8776f77 100644 --- a/activerecord/test/cases/query_cache_test.rb +++ b/activerecord/test/cases/query_cache_test.rb @@ -235,7 +235,7 @@ class QueryCacheTest < ActiveRecord::TestCase assert_equal 1, Post.where(title: 'rollback').to_a.count raise 'broken' end - rescue Exception + rescue end assert_equal 0, Post.where(title: 'rollback').to_a.count |