Skip to content

Improve compatibility with date versions 3.2.1, 3.1.2, 3.0.2 and 2.0.1 #43644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2021
Merged

Improve compatibility with date versions 3.2.1, 3.1.2, 3.0.2 and 2.0.1 #43644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions activesupport/lib/active_support/values/time_zone.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,8 @@ def at(*args)
# If the string is invalid then an +ArgumentError+ will be raised unlike +parse+
# which usually returns +nil+ when given an invalid date string.
def iso8601(str)
raise ArgumentError, "invalid date" if str.nil?

parts = Date._iso8601(str)

raise ArgumentError, "invalid date" if parts.empty?
Expand Down
10 changes: 10 additions & 0 deletions activesupport/test/time_zone_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,16 @@ def test_iso8601_with_zone
assert_equal zone, twz.time_zone
end

def test_iso8601_with_nil
zone = ActiveSupport::TimeZone["Eastern Time (US & Canada)"]

exception = assert_raises(ArgumentError) do
zone.iso8601(nil)
end

assert_equal "invalid date", exception.message
end

def test_iso8601_with_invalid_string
zone = ActiveSupport::TimeZone["Eastern Time (US & Canada)"]

Expand Down