1 files changed, 31 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/range_ext_test.rb b/activesupport/test/core_ext/range_ext_test.rb
index f0cdc0bfd4..6e94d5e10d 100644
--- a/activesupport/test/core_ext/range_ext_test.rb
+++ b/activesupport/test/core_ext/range_ext_test.rb
@@ -1,6 +1,7 @@
 require 'abstract_unit'
 require 'active_support/time'
 require 'active_support/core_ext/range'
+require 'active_support/core_ext/numeric'
 
 class RangeTest < ActiveSupport::TestCase
   def test_to_s_from_dates
@@ -12,6 +13,12 @@ class RangeTest < ActiveSupport::TestCase
     date_range = Time.utc(2005, 12, 10, 15, 30)..Time.utc(2005, 12, 10, 17, 30)
     assert_equal "BETWEEN '2005-12-10 15:30:00' AND '2005-12-10 17:30:00'", date_range.to_s(:db)
   end
+  
+  def test_date_range
+    assert_instance_of Range, DateTime.new..DateTime.new
+    assert_instance_of Range, DateTime::Infinity.new..DateTime::Infinity.new
+    assert_instance_of Range, DateTime.new..DateTime::Infinity.new
+  end
 
   def test_overlaps_last_inclusive
     assert((1..5).overlaps?(5..10))
@@ -85,4 +92,28 @@ class RangeTest < ActiveSupport::TestCase
     time_range_2 = Time.utc(2005, 12, 10, 17, 31)..Time.utc(2005, 12, 10, 18, 00)
     assert !time_range_1.overlaps?(time_range_2)
   end
+
+  def test_infinite_bounds
+    time_zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+
+    time = Time.now
+    date = Date.today
+    datetime = DateTime.now
+    twz = ActiveSupport::TimeWithZone.new(time, time_zone)
+
+    infinity1 = Float::INFINITY
+    infinity2 = BigDecimal.new('Infinity')
+
+    [infinity1, infinity2].each do |infinity|
+      [time, date, datetime, twz].each do |bound|
+        [time, date, datetime, twz].each do |value|
+          assert Range.new(bound, infinity).include?(value + 10.years)
+          assert Range.new(-infinity, bound).include?(value - 10.years)
+
+          assert !Range.new(bound, infinity).include?(value - 10.years)
+          assert !Range.new(-infinity, bound).include?(value + 10.years)
+        end
+      end
+    end
+  end
 end