diff options
| author | Yasuo Honda <yasuo.honda@gmail.com> | 2017-12-19 21:14:55 +0000 |
|---|---|---|
| committer | Yasuo Honda <yasuo.honda@gmail.com> | 2017-12-20 11:52:01 +0000 |
| commit | 01efbc128d1379d02dd14acf324d011944a1c429 (patch) | |
| tree | f423627193befc7de8cf689ce6bbf62f3e088b60 /activesupport/test/core_ext | |
| parent | 053a4c699043ea5449effaba0549b2f8a5821228 (diff) | |
| download | rails-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 'activesupport/test/core_ext')
| -rw-r--r-- | activesupport/test/core_ext/hash_ext_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index 746d7ad416..17952e9fc7 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -446,7 +446,7 @@ class HashExtTest < ActiveSupport::TestCase original.freeze assert_nothing_raised { original.except(:a) } - assert_raise(RuntimeError) { original.except!(:a) } + assert_raise(frozen_error_class) { original.except!(:a) } end def test_except_does_not_delete_values_in_original |