diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-12-07 11:48:25 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-12-07 11:48:25 -0800 |
| commit | 85f4956fad22e1e039149a76db962157112679b6 (patch) | |
| tree | b8ce875c26e0a5d2a9692e303df5b38eb6062dca /activesupport/test | |
| parent | 339e4e80d514bd94fcb0e15689db43e5de83642a (diff) | |
| parent | 6ee03a40bbb95c68d7517098b1e215f08ad82fb5 (diff) | |
| download | rails-85f4956fad22e1e039149a76db962157112679b6.tar.gz rails-85f4956fad22e1e039149a76db962157112679b6.tar.bz2 rails-85f4956fad22e1e039149a76db962157112679b6.zip | |
Merge pull request #8454 from frodsan/deprecate_as_basic_object
Rename ActiveSupport::BasicObject to ActiveSupport::ProxyObject
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/core_ext/duration_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb index c8312aa653..2826f51f2d 100644 --- a/activesupport/test/core_ext/duration_test.rb +++ b/activesupport/test/core_ext/duration_test.rb @@ -21,7 +21,7 @@ class DurationTest < ActiveSupport::TestCase assert ActiveSupport::Duration === 1.day assert !(ActiveSupport::Duration === 1.day.to_i) assert !(ActiveSupport::Duration === 'foo') - assert !(ActiveSupport::Duration === ActiveSupport::BasicObject.new) + assert !(ActiveSupport::Duration === ActiveSupport::ProxyObject.new) end def test_equals @@ -131,7 +131,7 @@ class DurationTest < ActiveSupport::TestCase assert_equal Time.local(2009,3,29,0,0,0) + 1.day, Time.local(2009,3,30,0,0,0) end end - + def test_delegation_with_block_works counter = 0 assert_nothing_raised do |