aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorNikita Afanasenko <nikita@afanasenko.name>2012-11-11 16:06:26 +0400
committerNikita Afanasenko <nikita@afanasenko.name>2012-11-11 16:08:39 +0400
commit63ee59d48ad03b70d8e2fa9192b4d5ebbbfe6ad3 (patch)
treea890c0080a7eb0dfc83e22b4da283e5393010d61 /activesupport
parent12d6d3a6f8914d272529d79cba461759e2dedf09 (diff)
downloadrails-63ee59d48ad03b70d8e2fa9192b4d5ebbbfe6ad3.tar.gz
rails-63ee59d48ad03b70d8e2fa9192b4d5ebbbfe6ad3.tar.bz2
rails-63ee59d48ad03b70d8e2fa9192b4d5ebbbfe6ad3.zip
Test Hash#diff deprecation, also prevent deprecation message in AS tests
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/core_ext/hash_ext_test.rb4
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