aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-03-06 12:13:40 +0100
committerYves Senn <yves.senn@gmail.com>2015-03-06 12:16:18 +0100
commita068aa3e86215da4d50ac5a8862ce11ed33140ca (patch)
treee6801664678a3f78be332da4d9d28c6adabf81e0
parentbfbabc59d55be94c4833aad3dbe36a9b332eb87e (diff)
downloadrails-a068aa3e86215da4d50ac5a8862ce11ed33140ca.tar.gz
rails-a068aa3e86215da4d50ac5a8862ce11ed33140ca.tar.bz2
rails-a068aa3e86215da4d50ac5a8862ce11ed33140ca.zip
Revert ":cut: remove unnecessary rescue Exceptions"
This reverts commit ff18049ca6f27deb7e7f955478e1464f8d756332. This broke the AR build for every adapter: 1) Error: AssociationCallbacksTest#test_dont_add_if_before_callback_raises_exception: Exception: You can't add a post 2) Failure: QueryCacheTest#test_query_cache_doesnt_leak_cached_results_of_rolled_back_queries [/Users/senny/Projects/rails/activerecord/test/cases/query_cache_test.rb:235]: Expected: 1 Actual: 0 I'm reverting to get the build green again.
-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 ec6a902c00..976b559da9 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
+ rescue Exception
errors << task
end
end
diff --git a/activerecord/test/cases/associations/callbacks_test.rb b/activerecord/test/cases/associations/callbacks_test.rb
index a341cb706d..a531e0e02c 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
+ rescue Exception
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 a5f8776f77..744f9edc47 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
+ rescue Exception
end
assert_equal 0, Post.where(title: 'rollback').to_a.count