diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-10-02 18:54:28 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-02 18:54:28 +0900 |
commit | 96e69b5a33f44e5339345ef3c4871aba51a1e938 (patch) | |
tree | a0662fdf46c00056fb2ea6ec804611f2587e0be0 /activesupport | |
parent | 8171a1b9db029f4c6d45e2df3037d53a4864acb1 (diff) | |
parent | 3c4b729f48c0320499f16a2e6f50a3d27bde1114 (diff) | |
download | rails-96e69b5a33f44e5339345ef3c4871aba51a1e938.tar.gz rails-96e69b5a33f44e5339345ef3c4871aba51a1e938.tar.bz2 rails-96e69b5a33f44e5339345ef3c4871aba51a1e938.zip |
Merge pull request #34049 from sharang-d/marshalling-text-changes
Fix spellings for 'unmarshall(ing/ed)' & 'marshall(ing/ed)'
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/test/core_ext/time_ext_test.rb | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb index e1cb22fda8..7078f3506d 100644 --- a/activesupport/test/core_ext/time_ext_test.rb +++ b/activesupport/test/core_ext/time_ext_test.rb @@ -950,39 +950,39 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase end class TimeExtMarshalingTest < ActiveSupport::TestCase - def test_marshaling_with_utc_instance + def test_marshalling_with_utc_instance t = Time.utc(2000) - unmarshaled = Marshal.load(Marshal.dump(t)) - assert_equal "UTC", unmarshaled.zone - assert_equal t, unmarshaled + unmarshalled = Marshal.load(Marshal.dump(t)) + assert_equal "UTC", unmarshalled.zone + assert_equal t, unmarshalled end - def test_marshaling_with_local_instance + def test_marshalling_with_local_instance t = Time.local(2000) - unmarshaled = Marshal.load(Marshal.dump(t)) - assert_equal t.zone, unmarshaled.zone - assert_equal t, unmarshaled + unmarshalled = Marshal.load(Marshal.dump(t)) + assert_equal t.zone, unmarshalled.zone + assert_equal t, unmarshalled end - def test_marshaling_with_frozen_utc_instance + def test_marshalling_with_frozen_utc_instance t = Time.utc(2000).freeze - unmarshaled = Marshal.load(Marshal.dump(t)) - assert_equal "UTC", unmarshaled.zone - assert_equal t, unmarshaled + unmarshalled = Marshal.load(Marshal.dump(t)) + assert_equal "UTC", unmarshalled.zone + assert_equal t, unmarshalled end - def test_marshaling_with_frozen_local_instance + def test_marshalling_with_frozen_local_instance t = Time.local(2000).freeze - unmarshaled = Marshal.load(Marshal.dump(t)) - assert_equal t.zone, unmarshaled.zone - assert_equal t, unmarshaled + unmarshalled = Marshal.load(Marshal.dump(t)) + assert_equal t.zone, unmarshalled.zone + assert_equal t, unmarshalled end def test_marshalling_preserves_fractional_seconds t = Time.parse("00:00:00.500") - unmarshaled = Marshal.load(Marshal.dump(t)) - assert_equal t.to_f, unmarshaled.to_f - assert_equal t, unmarshaled + unmarshalled = Marshal.load(Marshal.dump(t)) + assert_equal t.to_f, unmarshalled.to_f + assert_equal t, unmarshalled end def test_last_quarter_on_31st |