diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-12 19:10:49 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-12 19:10:49 +0530 |
| commit | 70237e7dd3dde34dd4b7849619457bcb214ff674 (patch) | |
| tree | 660564946242a4307621b0ff397a87a0add398e2 /activesupport/test | |
| parent | f2f6534272b7895aa39183890043bc8c8e0ee1e8 (diff) | |
| parent | 84d198b4a0846ae74ff49001adaa7c3c80bc0607 (diff) | |
| download | rails-70237e7dd3dde34dd4b7849619457bcb214ff674.tar.gz rails-70237e7dd3dde34dd4b7849619457bcb214ff674.tar.bz2 rails-70237e7dd3dde34dd4b7849619457bcb214ff674.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activesupport/lib/active_support/callbacks.rb
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/core_ext/hash_ext_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb index afca636777..8239054117 100644 --- a/activesupport/test/core_ext/hash_ext_test.rb +++ b/activesupport/test/core_ext/hash_ext_test.rb @@ -491,11 +491,11 @@ class HashExtTest < ActiveSupport::TestCase original = { :a => 'x', :b => 'y', :c => 10 } expected = { :a => 'x', :b => 'y' } - # Should return a new hash with only the given keys. + # Should return a new hash without the given keys. assert_equal expected, original.except(:c) assert_not_equal expected, original - # Should replace the hash with only the given keys. + # Should replace the hash without the given keys. assert_equal expected, original.except!(:c) assert_equal expected, original end |