1 files changed, 19 insertions, 23 deletions
diff --git a/activesupport/test/core_ext/range_ext_test.rb b/activesupport/test/core_ext/range_ext_test.rb
index 6e94d5e10d..6d6afc85c4 100644
--- a/activesupport/test/core_ext/range_ext_test.rb
+++ b/activesupport/test/core_ext/range_ext_test.rb
@@ -1,7 +1,6 @@
 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
@@ -17,7 +16,6 @@ class RangeTest < ActiveSupport::TestCase
   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
@@ -44,7 +42,7 @@ class RangeTest < ActiveSupport::TestCase
     assert((1...10).include?(1...10))
   end
 
-  def test_should_include_other_with_exlusive_end
+  def test_should_include_other_with_exclusive_end
     assert((1..10).include?(1...10))
   end
 
@@ -56,7 +54,7 @@ class RangeTest < ActiveSupport::TestCase
     assert((1...10) === (1...10))
   end
 
-  def test_should_compare_other_with_exlusive_end
+  def test_should_compare_other_with_exclusive_end
     assert((1..10) === (1...10))
   end
 
@@ -93,27 +91,25 @@ class RangeTest < ActiveSupport::TestCase
     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')
+  def test_each_on_time_with_zone
+    twz = ActiveSupport::TimeWithZone.new(nil, ActiveSupport::TimeZone['Eastern Time (US & Canada)'] , Time.utc(2006,11,28,10,30))
+    assert_raises TypeError do
+      ((twz - 1.hour)..twz).each {}
+    end
+  end
 
-    [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)
+  def test_step_on_time_with_zone
+    twz = ActiveSupport::TimeWithZone.new(nil, ActiveSupport::TimeZone['Eastern Time (US & Canada)'] , Time.utc(2006,11,28,10,30))
+    assert_raises TypeError do
+      ((twz - 1.hour)..twz).step(1) {}
+    end
+  end
 
-          assert !Range.new(bound, infinity).include?(value - 10.years)
-          assert !Range.new(-infinity, bound).include?(value + 10.years)
-        end
-      end
+  def test_include_on_time_with_zone
+    twz = ActiveSupport::TimeWithZone.new(nil, ActiveSupport::TimeZone['Eastern Time (US & Canada)'] , Time.utc(2006,11,28,10,30))
+    assert_raises TypeError do
+      ((twz - 1.hour)..twz).include?(twz)
     end
   end
+
 end