aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-03-05 15:08:16 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2015-03-05 15:08:16 -0800
commitff18049ca6f27deb7e7f955478e1464f8d756332 (patch)
tree2a090556451c3d68ee592b9cce0eb45888ade2c9
parent67c1fa934bd1ea04ee291df272d3e6a9094994e1 (diff)
downloadrails-ff18049ca6f27deb7e7f955478e1464f8d756332.tar.gz
rails-ff18049ca6f27deb7e7f955478e1464f8d756332.tar.bz2
rails-ff18049ca6f27deb7e7f955478e1464f8d756332.zip
:cut: remove unnecessary rescue Exceptions
-rw-r--r--activerecord/Rakefile2
-rw-r--r--activerecord/test/cases/associations/callbacks_test.rb2
-rw-r--r--activerecord/test/cases/query_cache_test.rb2
3 files changed, 3 insertions, 3 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/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