diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-17 04:29:16 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-17 04:29:16 -0800 |
| commit | 68b0bacaf50b7c5784cb91caf2b1ebc0f513766d (patch) | |
| tree | 879e33ae5b7bd3822c4344c6b9bf6c853420d9b4 /activesupport/lib | |
| parent | 02e368413301b9b60a29b9c8d901185e29e479ba (diff) | |
| parent | c0c87922baf47eed64a53d3afceba978bb175da9 (diff) | |
| download | rails-68b0bacaf50b7c5784cb91caf2b1ebc0f513766d.tar.gz rails-68b0bacaf50b7c5784cb91caf2b1ebc0f513766d.tar.bz2 rails-68b0bacaf50b7c5784cb91caf2b1ebc0f513766d.zip | |
Merge pull request #8248 from zenspider/master
Removed extra call to #diff in #assert_recognizes
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/diff.rb | 2 |
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) }) |