From 255706fb4530d9692b5891f7c0d8a0d853c4d40f Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej.szlosarczyk@eestiinternet.ee>
Date: Thu, 26 Apr 2018 12:30:17 +0300
Subject: [PATCH 1/3] Remove unecessary handling of newlines in contact views

---
 app/helpers/contact_helper.rb                        | 5 -----
 app/views/admin/contact_versions/show.haml           | 2 +-
 app/views/registrant/contacts/partials/_address.haml | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 app/helpers/contact_helper.rb

diff --git a/app/helpers/contact_helper.rb b/app/helpers/contact_helper.rb
deleted file mode 100644
index 6b15e3da4..000000000
--- a/app/helpers/contact_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module ContactHelper
-  def printable_street(street)
-    street.to_s.gsub("\n", '<br>').html_safe
-  end
-end
diff --git a/app/views/admin/contact_versions/show.haml b/app/views/admin/contact_versions/show.haml
index 38139b455..a412b4312 100644
--- a/app/views/admin/contact_versions/show.haml
+++ b/app/views/admin/contact_versions/show.haml
@@ -62,7 +62,7 @@
 
           - if contact.street.present?
             %dt= t(:street)
-            %dd{class: changing_css_class(@version,"street")}= printable_street(contact.street)
+            %dd{class: changing_css_class(@version,"street")}= contact.street
 
           - if contact.city.present?
             %dt= t(:city)
diff --git a/app/views/registrant/contacts/partials/_address.haml b/app/views/registrant/contacts/partials/_address.haml
index fffef581f..fe57bd393 100644
--- a/app/views/registrant/contacts/partials/_address.haml
+++ b/app/views/registrant/contacts/partials/_address.haml
@@ -8,7 +8,7 @@
         %dd= @contact.org_name
 
       %dt= t(:street)
-      %dd= printable_street(@contact.street)
+      %dd= @contact.street
 
       %dt= t(:city)
       %dd= @contact.city

From a6a99df58e37311dfc0af8860f737431aba62d79 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej.szlosarczyk@eestiinternet.ee>
Date: Fri, 27 Apr 2018 10:35:42 +0300
Subject: [PATCH 2/3] Create AdminContactsTest

---
 spec/features/admin/contacts/list_spec.rb | 12 ----------
 test/integration/admin/contacts_test.rb   | 29 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 12 deletions(-)
 delete mode 100644 spec/features/admin/contacts/list_spec.rb
 create mode 100644 test/integration/admin/contacts_test.rb

diff --git a/spec/features/admin/contacts/list_spec.rb b/spec/features/admin/contacts/list_spec.rb
deleted file mode 100644
index 80312fb17..000000000
--- a/spec/features/admin/contacts/list_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'rails_helper'
-
-RSpec.feature 'Contact list', settings: false do
-  background do
-    sign_in_to_admin_area
-  end
-
-  it 'is visible' do
-    visit admin_contacts_path
-    expect(page).to have_css('.contacts')
-  end
-end
diff --git a/test/integration/admin/contacts_test.rb b/test/integration/admin/contacts_test.rb
new file mode 100644
index 000000000..52abd7bb0
--- /dev/null
+++ b/test/integration/admin/contacts_test.rb
@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class AdminContactsTest < ActionDispatch::IntegrationTest
+  def setup
+    super
+
+    @contact = contacts(:william)
+    login_as users(:admin)
+  end
+
+  def teardown
+    super
+  end
+
+  def test_display_list
+    visit admin_contacts_path
+
+    assert_text('william-001')
+    assert_text('william-002')
+    assert_text('acme-ltd-001')
+  end
+
+  def test_display_details
+    visit admin_contact_path(@contact)
+
+    assert_text('Street Main Street City New York Postcode 12345 ' \
+                'State New York Country United States of America')
+  end
+end

From cecb60623cd99b383778f73ec87fd8433ca1fd6c Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej.szlosarczyk@eestiinternet.ee>
Date: Fri, 27 Apr 2018 10:41:43 +0300
Subject: [PATCH 3/3] Remove unecessary teardown block

---
 test/integration/admin/contacts_test.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/integration/admin/contacts_test.rb b/test/integration/admin/contacts_test.rb
index 52abd7bb0..1f517e8cb 100644
--- a/test/integration/admin/contacts_test.rb
+++ b/test/integration/admin/contacts_test.rb
@@ -8,10 +8,6 @@ class AdminContactsTest < ActionDispatch::IntegrationTest
     login_as users(:admin)
   end
 
-  def teardown
-    super
-  end
-
   def test_display_list
     visit admin_contacts_path