Ticket #9818: time_and_datetime_advance_ignore_invalid_options.diff

test/core_ext/time_ext_test.rb

@@ -233 +233 @@
-    assert_equal Time.utc(2005,2,22,15,45),    Time.utc(2005,2,22,15,15,10).change(:min => 45)
-  end
-
-plus
+advance
-    assert_equal Time.local(2006,2,28,15,15,10), Time.local(2005,2,28,15,15,10).advance(:years => 1)
-    assert_equal Time.local(2005,6,28,15,15,10), Time.local(2005,2,28,15,15,10).advance(:months => 4)
-    assert_equal Time.local(2012,9,28,15,15,10), Time.local(2005,2,28,15,15,10).advance(:years => 7, :months => 7)
@@ -241 +241 @@
-    assert_equal Time.local(2005,2,28,15,15,10), Time.local(2004,2,29,15,15,10).advance(:years => 1) #leap day plus one year
-  end
-
-plus
+advance
-    assert_equal Time.utc(2006,2,22,15,15,10), Time.utc(2005,2,22,15,15,10).advance(:years => 1)
-    assert_equal Time.utc(2005,6,22,15,15,10), Time.utc(2005,2,22,15,15,10).advance(:months => 4)
-    assert_equal Time.utc(2012,9,22,15,15,10), Time.utc(2005,2,22,15,15,10).advance(:years => 7, :months => 7)
-    assert_equal Time.utc(2013,10,3,15,15,10), Time.utc(2005,2,22,15,15,10).advance(:years => 7, :months => 19, :days => 11)
-    assert_equal Time.utc(2005,2,28,15,15,10), Time.utc(2004,2,29,15,15,10).advance(:years => 1) #leap day plus one year
-  end
+  
+  def test_advance_ignores_invalid_options
+    assert_equal Time.local(2006,2,28,15,15,10), Time.local(2005,2,28,15,15,10).advance(:years => 1, :hour => 3, :min => 4, :sec => 5, :usec => 6, :foo => 19)
+  end
-
-  def test_next_week
-    with_timezone 'US/Eastern' do

test/core_ext/date_time_ext_test.rb

@@ -159 +159 @@
-    assert_equal DateTime.civil(2005,2,22,15,45),    DateTime.civil(2005,2,22,15,15,10).change(:min => 45)
-  end
-
-plus
+advance
-    assert_equal DateTime.civil(2006,2,28,15,15,10), DateTime.civil(2005,2,28,15,15,10).advance(:years => 1)
-    assert_equal DateTime.civil(2005,6,28,15,15,10), DateTime.civil(2005,2,28,15,15,10).advance(:months => 4)
-    assert_equal DateTime.civil(2012,9,28,15,15,10), DateTime.civil(2005,2,28,15,15,10).advance(:years => 7, :months => 7)
-    assert_equal DateTime.civil(2013,10,3,15,15,10), DateTime.civil(2005,2,28,15,15,10).advance(:years => 7, :months => 19, :days => 5)
-    assert_equal DateTime.civil(2005,2,28,15,15,10), DateTime.civil(2004,2,29,15,15,10).advance(:years => 1) #leap day plus one year
-  end
+  
+  def test_advance_ignores_invalid_options
+    assert_equal DateTime.civil(2006,2,28,15,15,10), DateTime.civil(2005,2,28,15,15,10).advance(:years => 1, :hour => 3, :min => 4, :sec => 5, :usec => 6, :foo => 19)
+  end
-
-  def test_next_week
-    assert_equal DateTime.civil(2005,2,28), DateTime.civil(2005,2,22,15,15,10).next_week

lib/active_support/core_ext/date_time/calculations.rb

@@ -31 +31 @@
-        # any of these keys: :months, :days, :years.
-        def advance(options)
-          d = to_date.advance(options)
-options.merge(:year => d.year, :month => d.month, :day => d.day)
+:year => d.year, :month => d.month, :day => d.day
-        end
-
-        # Returns a new DateTime representing the time a number of seconds ago

lib/active_support/core_ext/time/calculations.rb

@@ -75 +75 @@
-        # any of these keys: :months, :days, :years.
-        def advance(options)
-          d = to_date.advance(options)
-options.merge(:year => d.year, :month => d.month, :day => d.day)
+:year => d.year, :month => d.month, :day => d.day
-        end
-
-        # Returns a new Time representing the time a number of seconds ago, this is basically a wrapper around the Numeric extension