aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorRyan Davis <ryand-ruby@zenspider.com>2012-11-17 01:46:37 -0800
committerRyan Davis <ryand-ruby@zenspider.com>2012-11-17 01:46:37 -0800
commitc0c87922baf47eed64a53d3afceba978bb175da9 (patch)
tree879e33ae5b7bd3822c4344c6b9bf6c853420d9b4 /activesupport/lib
parent270d1cfe30b4c8c31cdf8512c012f544ae8c564b (diff)
downloadrails-c0c87922baf47eed64a53d3afceba978bb175da9.tar.gz
rails-c0c87922baf47eed64a53d3afceba978bb175da9.tar.bz2
rails-c0c87922baf47eed64a53d3afceba978bb175da9.zip
Please use assert_equal instead of diff directly
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/hash/diff.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/diff.rb b/activesupport/lib/active_support/core_ext/hash/diff.rb
index a27c55479a..5f3868b5b0 100644
--- a/activesupport/lib/active_support/core_ext/hash/diff.rb
+++ b/activesupport/lib/active_support/core_ext/hash/diff.rb
@@ -6,7 +6,7 @@ class Hash
# {}.diff(1 => 2) # => {1 => 2}
# {1 => 2, 3 => 4}.diff(1 => 2) # => {3 => 4}
def diff(other)
- ActiveSupport::Deprecation.warn "Hash#diff is no longer used inside of Rails, and is being deprecated with no replacement. If you're using it to compare hashes for the purpose of testing, please use MiniTest's diff instead."
+ ActiveSupport::Deprecation.warn "Hash#diff is no longer used inside of Rails, and is being deprecated with no replacement. If you're using it to compare hashes for the purpose of testing, please use MiniTest's assert_equal instead."
dup.
delete_if { |k, v| other[k] == v }.
merge!(other.dup.delete_if { |k, v| has_key?(k) })