diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-11-11 04:46:06 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-11-11 04:46:06 -0800 |
| commit | eda34c4a501119d54e156c57284c7938e59f3160 (patch) | |
| tree | 765139b27c5976ade0b76fdc6f12767967c92676 | |
| parent | c49fff93273ddcfdb8ee516e667123c328382be5 (diff) | |
| parent | 63ee59d48ad03b70d8e2fa9192b4d5ebbbfe6ad3 (diff) | |
| download | rails-eda34c4a501119d54e156c57284c7938e59f3160.tar.gz rails-eda34c4a501119d54e156c57284c7938e59f3160.tar.bz2 rails-eda34c4a501119d54e156c57284c7938e59f3160.zip | |
Merge pull request #8172 from nikitug/silent_diff_deprecation
Test Hash#diff deprecation, also prevent deprecation message in AS tests
| -rw-r--r-- | activesupport/test/core_ext/hash_ext_test.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index 6746b58cd3..c378dcd01d 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -656,7 +656,9 @@ class HashExtTest < ActiveSupport::TestCase end def test_diff - assert_equal({ :a => 2 }, { :a => 2, :b => 5 }.diff({ :a => 1, :b => 5 })) + assert_deprecated do + assert_equal({ :a => 2 }, { :a => 2, :b => 5 }.diff({ :a => 1, :b => 5 })) + end end def test_slice |