diff options
| author | Prathamesh Sonpatki <csonpatki@gmail.com> | 2014-11-05 12:01:06 +0530 |
|---|---|---|
| committer | Prathamesh Sonpatki <csonpatki@gmail.com> | 2014-11-05 15:00:19 +0530 |
| commit | e0109460526b9595007905475437ccbf77739e7f (patch) | |
| tree | a69788506344f6adfb8dc1e6a6c9106bb0493939 | |
| parent | bb441843a76c14285694588b9b36d32ff59c0d48 (diff) | |
| download | rails-e0109460526b9595007905475437ccbf77739e7f.tar.gz rails-e0109460526b9595007905475437ccbf77739e7f.tar.bz2 rails-e0109460526b9595007905475437ccbf77739e7f.zip | |
Removed the unused require of proxy_object and test related to it
- Reference : https://github.com/rails/rails/pull/17493#issuecomment-61739359
- Duration stopped inheriting from ProxyObject in https://github.com/rails/rails/pull/16574
| -rw-r--r-- | activesupport/lib/active_support/duration.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/core_ext/duration_test.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb index 584fc1e1c5..baa83223d2 100644 --- a/activesupport/lib/active_support/duration.rb +++ b/activesupport/lib/active_support/duration.rb @@ -1,4 +1,3 @@ -require 'active_support/proxy_object' require 'active_support/core_ext/array/conversions' require 'active_support/core_ext/object/acts_like' diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb index 5a2af7f943..a5d254e115 100644 --- a/activesupport/test/core_ext/duration_test.rb +++ b/activesupport/test/core_ext/duration_test.rb @@ -30,7 +30,6 @@ class DurationTest < ActiveSupport::TestCase assert ActiveSupport::Duration === 1.day assert !(ActiveSupport::Duration === 1.day.to_i) assert !(ActiveSupport::Duration === 'foo') - assert !(ActiveSupport::Duration === ActiveSupport::ProxyObject.new) end def test_equals |