aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/aggregations_test.rb
diff options
context:
space:
mode:
authorYasuo Honda <yasuo.honda@gmail.com>2017-12-19 21:14:55 +0000
committerYasuo Honda <yasuo.honda@gmail.com>2017-12-20 11:52:01 +0000
commit01efbc128d1379d02dd14acf324d011944a1c429 (patch)
treef423627193befc7de8cf689ce6bbf62f3e088b60 /activerecord/test/cases/aggregations_test.rb
parent053a4c699043ea5449effaba0549b2f8a5821228 (diff)
downloadrails-01efbc128d1379d02dd14acf324d011944a1c429.tar.gz
rails-01efbc128d1379d02dd14acf324d011944a1c429.tar.bz2
rails-01efbc128d1379d02dd14acf324d011944a1c429.zip
Handle `FrozenError` if it is available
This pull request handles `FrozenError` introduced by Ruby 2.5. Refer https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/61131 Since `FrozenError` is a subclass of `RuntimeError` minitest used by master branch can handle it, though it would be better to handle `FrozenError` explicitly if possible. `FrozenError` does not exist in Ruby 2.4 or lower, `frozen_error_class` handles which exception is expected to be raised. This pull request is intended to be merged to master, then backported to `5-1-stable` to address #31508
Diffstat (limited to 'activerecord/test/cases/aggregations_test.rb')
-rw-r--r--activerecord/test/cases/aggregations_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/aggregations_test.rb b/activerecord/test/cases/aggregations_test.rb
index 7f654ec6f6..fbdf2ada4b 100644
--- a/activerecord/test/cases/aggregations_test.rb
+++ b/activerecord/test/cases/aggregations_test.rb
@@ -27,7 +27,7 @@ class AggregationsTest < ActiveRecord::TestCase
def test_immutable_value_objects
customers(:david).balance = Money.new(100)
- assert_raise(RuntimeError) { customers(:david).balance.instance_eval { @amount = 20 } }
+ assert_raise(frozen_error_class) { customers(:david).balance.instance_eval { @amount = 20 } }
end
def test_inferred_mapping