From 565ef542a43d3e3ed4a7b190dfdb21d052809ff4 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Wed, 3 Jun 2020 13:08:42 +0500 Subject: [PATCH] Fix date format --- app/models/whois_record.rb | 4 +++- test/models/whois_record_test.rb | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/models/whois_record.rb b/app/models/whois_record.rb index 2ce6427c..65f6d92f 100644 --- a/app/models/whois_record.rb +++ b/app/models/whois_record.rb @@ -48,7 +48,9 @@ def deserialize_domain expire: json['expire'], outzone: json['outzone'], delete: json['delete'], - registration_deadline: json['registration_deadline'].try(:to_s, :iso8601)) + registration_deadline: json['registration_deadline'] + .try(:to_datetime) + .try(:to_s, :iso8601)) end # rubocop:enable Metrics/AbcSize diff --git a/test/models/whois_record_test.rb b/test/models/whois_record_test.rb index 81c300c7..6ff43a5f 100644 --- a/test/models/whois_record_test.rb +++ b/test/models/whois_record_test.rb @@ -60,6 +60,22 @@ def test_deserializes_domain assert_equal Time.zone.parse('2010-07-09'), whois_record.domain.registration_deadline end + def test_deserializes_domain_with_old_reg_deadline_format + whois_record = WhoisRecord.new(json: { name: 'shop.test', + status: %w[active], + registered: '2010-07-05T00:00:00+00:00', + changed: '2010-07-06T00:00:00+00:00', + expire: '2010-07-07T00:00:00+00:00', + outzone: '2010-07-08T00:00:00+00:00', + delete: '2010-07-09T00:00:00+00:00', + registration_deadline: '2020-06-09 23:59:59 +0300'}) + + assert_equal 'shop.test', whois_record.domain.name + assert_equal %w[active], whois_record.domain.statuses + assert_equal Time.parse('2020-06-09 23:59:59 +0300').try(:to_datetime).try(:to_s, :iso8601), + whois_record.domain.registration_deadline + end + def test_deserializes_registrar whois_record = WhoisRecord.new(json: { registrar: 'Bestnames', registrar_website: 'https://bestnames.test',