From 449a37252fa31fe3d05970ff5527a51ed7ee0135 Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Wed, 25 Apr 2018 16:59:07 +0300 Subject: [PATCH] Add disclaimer to UNIX template --- app/views/for_models/whois.erb | 2 ++ test/models/whois_record_test.rb | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/views/for_models/whois.erb b/app/views/for_models/whois.erb index 390511031..2d8db1d59 100644 --- a/app/views/for_models/whois.erb +++ b/app/views/for_models/whois.erb @@ -1,3 +1,5 @@ +<%= json['disclaimer'].scan(/\S.{0,72}\S(?=\s|$)|\S+/).join('\n') %> + Estonia .ee Top Level Domain WHOIS server Domain: diff --git a/test/models/whois_record_test.rb b/test/models/whois_record_test.rb index ed9a087f7..83822d37e 100644 --- a/test/models/whois_record_test.rb +++ b/test/models/whois_record_test.rb @@ -9,7 +9,6 @@ class WhoisRecordTest < ActiveSupport::TestCase end def test_generated_json_has_expected_values - expected_disclaimer_text = <<-TEXT.squish Search results may not be used for commercial, advertising, recompilation, repackaging, redistribution, reuse, obscuring or other similar activities. @@ -31,4 +30,17 @@ class WhoisRecordTest < ActiveSupport::TestCase assert_equal(value, @record.generated_json[key]) end end + + def test_generated_body_has_justified_disclaimer + expected_disclaimer_first_line = begin + "Search results may not be used for commercial, advertising, recompilation," + end + expected_disclaimer_second_line = begin + "repackaging, redistribution, reuse, obscuring or other similar activities" + end + @record.populate + + assert_match(expected_disclaimer_first_line, @record.body) + assert_match(expected_disclaimer_second_line, @record.body) + end end