diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-03-06 12:13:40 +0100 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-03-06 12:16:18 +0100 |
commit | a068aa3e86215da4d50ac5a8862ce11ed33140ca (patch) | |
tree | e6801664678a3f78be332da4d9d28c6adabf81e0 /activerecord/test | |
parent | bfbabc59d55be94c4833aad3dbe36a9b332eb87e (diff) | |
download | rails-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.
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/associations/callbacks_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/query_cache_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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 |