Fix Duration#to_json

larssmit · Dec 29, 2010 · 0ac66ca · 0ac66ca
1 parent 43433b3
commit 0ac66ca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb
@@ -80,6 +80,10 @@ def inspect #:nodoc:
       parts.to_sentence(:locale => :en)
     end
 
+    def as_json(options = nil) #:nodoc:
+      to_i
+    end
+
     protected
 
       def sum(sign, time = ::Time.current) #:nodoc:

diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'active_support/time'
+require 'active_support/json'
 
 class DurationTest < ActiveSupport::TestCase
   def test_is_a
@@ -138,6 +139,10 @@ def test_delegation_with_block_works
     assert_equal counter, 60
   end
 
+  def test_to_json
+    assert_equal '172800', 2.days.to_json
+  end
+
   protected
     def with_env_tz(new_tz = 'US/Eastern')
       old_tz, ENV['TZ'] = ENV['TZ'], new_tz