Merge pull request rails#52880 from mopp/fix_travel_to_with_ms

Set usec 0 unless with_usec

Author: rafaelfranca

activesupport/CHANGELOG.md

@@ -65,4 +65,8 @@
 
     *Frederik Erbs Spang Thomsen*
 
+*   Fix `travel_to` to set usec 0 when `with_usec` is `false` and the given argument String or DateTime.
+
+    *mopp*
+
 Please check [7-2-stable](https://github.com/rails/rails/blob/7-2-stable/activesupport/CHANGELOG.md) for previous changes.

activesupport/lib/active_support/testing/time_helpers.rb

@@ -166,9 +166,10 @@ def travel_to(date_or_time, with_usec: false)
         else
           now = date_or_time
           now = now.to_time unless now.is_a?(Time)
-          now = now.change(usec: 0) unless with_usec
         end
 
+        now = now.change(usec: 0) unless with_usec
+
         # +now+ must be in local system timezone, because +Time.at(now)+
         # and +now.to_date+ (see stubs below) will use +now+'s timezone too!
         now = now.getlocal

activesupport/test/time_travel_test.rb

@@ -174,6 +174,20 @@ def test_time_helper_travel_to_with_string_for_time_zone
     end
   end
 
+  def test_time_helper_travel_to_with_string_and_milliseconds
+    with_env_tz "US/Eastern" do
+      with_tz_default ActiveSupport::TimeZone["UTC"] do
+        Time.stub(:now, Time.now) do
+          expected_time = Time.new(2004, 11, 24, 1, 4, 44)
+
+          travel_to "2004-11-24T01:04:44.123-05:00" do
+            assert_equal expected_time, Time.zone.now
+          end
+        end
+      end
+    end
+  end
+
   def test_time_helper_travel_to_with_separate_class
     travel_object = TravelClass.new
     date1 = Date.new(2004, 11, 24)
@@ -330,6 +344,93 @@ def test_time_helper_with_usec_true
     end
   end
 
+  def test_time_helper_travel_to_with_datetime_and_usec
+    with_env_tz "US/Eastern" do
+      with_tz_default ActiveSupport::TimeZone["UTC"] do
+        Time.stub(:now, Time.now) do
+          duration_usec = 0.1.seconds
+          traveled_time = DateTime.iso8601("2004-11-24T01:04:44.000-05:00") + duration_usec
+          expected_time = Time.new(2004, 11, 24, 1, 4, 44)
+
+          assert_nothing_raised do
+            travel_to traveled_time
+
+            assert_equal expected_time, Time.zone.now
+
+            travel_back
+          end
+        ensure
+          travel_back
+        end
+      end
+    end
+  end
+
+  def test_time_helper_travel_to_with_datetime_and_usec_true
+    with_env_tz "US/Eastern" do
+      with_tz_default ActiveSupport::TimeZone["UTC"] do
+        Time.stub(:now, Time.now) do
+          duration_usec = 0.1.seconds
+          traveled_time = DateTime.iso8601("2004-11-24T01:04:44.000-05:00") + duration_usec
+          expected_time = Time.new(2004, 11, 24, 1, 4, 44) + duration_usec
+
+          assert_nothing_raised do
+            travel_to traveled_time, with_usec: true
+
+            assert_equal expected_time, Time.now
+
+            travel_back
+          end
+        ensure
+          travel_back
+        end
+      end
+    end
+  end
+
+  def test_time_helper_travel_to_with_string_and_usec
+    with_tz_default ActiveSupport::TimeZone["UTC"] do
+      Time.stub(:now, Time.now) do
+        duration_usec = 0.1.seconds
+        traveled_time = Time.new(2004, 11, 24, 1, 4, 44) + duration_usec
+        expected_time = Time.new(2004, 11, 24, 1, 4, 44)
+
+        assert_nothing_raised do
+          travel_to traveled_time.iso8601(3)
+
+          assert_equal expected_time, Time.now
+
+          travel_back
+        end
+      ensure
+        travel_back
+      end
+    end
+  end
+
+  def  test_time_helper_travel_to_with_string_and_usec_true
+    with_tz_default ActiveSupport::TimeZone["UTC"] do
+      Time.stub(:now, Time.now) do
+        duration_usec = 0.1.seconds
+        expected_time = Time.new(2004, 11, 24, 1, 4, 44) + duration_usec
+
+        assert_nothing_raised do
+          travel_to expected_time.iso8601(3), with_usec: true
+
+          assert_equal expected_time.to_f, Time.now.to_f
+
+          travel 0.5, with_usec: true
+
+          assert_equal((expected_time + 0.5).to_f, Time.now.to_f)
+
+          travel_back
+        end
+      ensure
+        travel_back
+      end
+    end
+  end
+
   def test_time_helper_freeze_time_with_usec_true
     # repeatedly test in case Time.now happened to actually be 0 usec
     checks = 9.times.map do