From eac7690345d464650aee91e77647477a094a6ea9 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Thu, 10 Nov 2016 01:36:23 +0200
Subject: [PATCH] Update "pending_update_request_for_old_registrant" mailer

#180
---
 app/presenters/registrant_presenter.rb        |  6 ++-
 ...update_request_for_old_registrant.html.erb | 14 +++----
 ...update_request_for_old_registrant.text.erb | 10 ++---
 spec/presenters/registrant_presenter_spec.rb  | 40 +++++++++----------
 ...equest_for_old_registrant.html.erb_spec.rb |  3 ++
 ...equest_for_old_registrant.text.erb_spec.rb |  3 ++
 6 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/app/presenters/registrant_presenter.rb b/app/presenters/registrant_presenter.rb
index 69dffddfc..f7fcb3094 100644
--- a/app/presenters/registrant_presenter.rb
+++ b/app/presenters/registrant_presenter.rb
@@ -1,11 +1,15 @@
 class RegistrantPresenter
-  delegate :name, :ident, :email, :priv?, to: :registrant
+  delegate :name, :ident, :email, :priv?, :street, :city, to: :registrant
 
   def initialize(registrant:, view:)
     @registrant = registrant
     @view = view
   end
 
+  def country
+
+  end
+
   private
 
   attr_reader :registrant
diff --git a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
index 37081076c..3c2527913 100644
--- a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
+++ b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb
@@ -19,7 +19,7 @@ Nimi: <%= @registrant.name %><br>
 <% end %>
 Tänav: <%= @registrant.street %><br>
 Linn: <%= @registrant.city %><br>
-Riik: <%= @params[:registrant_country] %>
+Riik: <%= @registrant.country %>
 <br><br>
 Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ei kinnita või tagasi lükka.
 <br><br>
@@ -46,14 +46,14 @@ Application for changing registrant of your domain <%= @domain.name %> has been
 <br><br>
 New registrant:<br>
 Name: <%= @registrant.name %><br>
-<% if @params[:registrant_priv] %>
-Personal code: <%= @registrant.ident %><br>
+<% if @registrant.priv? %>
+  Personal code: <%= @registrant.ident %><br>
 <% else %>
-Business Registry code: <%= @registrant.ident %><br>
+  Business Registry code: <%= @registrant.ident %><br>
 <% end %>
-Street: <%= @params[:registrant_street] %><br>
-City: <%= @params[:registrant_city] %><br>
-Country: <%= @params[:registrant_country] %>
+Street: <%= @registrant.street %><br>
+City: <%= @registrant.city %><br>
+Country: <%= @registrant.country %>
 <br><br>
 The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
 <br><br>
diff --git a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
index 5cbb47b7c..cf770bd6d 100644
--- a/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
+++ b/app/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb
@@ -16,7 +16,7 @@ Nimi: <%= @registrant.name %>
 <% end %>
 Tänav: <%= @registrant.street %>
 Linn: <%= @registrant.city %>
-Riik: <%= @params[:registrant_country] %>
+Riik: <%= @registrant.country %>
 
 Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatakse automaatselt tagasi kui te seda enne ei kinnita või tagasi lükka.
 Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
@@ -38,14 +38,14 @@ Website: <%= @registrar.url %>
 
 New registrant:
 Name: <%= @registrant.name %>
-<% if @params[:registrant_priv] %>
+<% if @registrant.priv? %>
   Personal code: <%= @registrant.ident %>
 <% else %>
   Business Registry code: <%= @registrant.ident %>
 <% end %>
-Street: <%= @params[:registrant_street] %>
-City: <%= @params[:registrant_city] %>
-Country: <%= @params[:registrant_country] %>
+Street: <%= @registrant.street %>
+City: <%= @registrant.city %>
+Country: <%= @registrant.country %>
 
 The application will remain in pending status for <%= Setting.expire_pending_confirmation %> hrs and will be automaticcally rejected if it is not approved nor rejected before.
 To confirm the update please visit this website, once again review the data and press approve:
diff --git a/spec/presenters/registrant_presenter_spec.rb b/spec/presenters/registrant_presenter_spec.rb
index 014dbd54d..894dd40d5 100644
--- a/spec/presenters/registrant_presenter_spec.rb
+++ b/spec/presenters/registrant_presenter_spec.rb
@@ -4,31 +4,27 @@ RSpec.describe RegistrantPresenter do
   let(:registrant) { instance_double(Registrant) }
   let(:presenter) { described_class.new(registrant: registrant, view: view) }
 
-  describe '#name' do
-    it 'returns name' do
-      expect(registrant).to receive(:name).and_return('test name')
-      expect(presenter.name).to eq('test name')
+  registrant_delegate_attributes = %i(
+    name
+    ident
+    email
+    priv?
+    street
+    city
+  )
+
+  registrant_delegate_attributes.each do |attribute_name|
+    describe "##{attribute_name}" do
+      it 'delegetes to registrant' do
+        expect(registrant).to receive(attribute_name).and_return('test')
+        expect(presenter.send(attribute_name)).to eq('test')
+      end
     end
   end
 
-  describe '#ident' do
-    it 'returns ident' do
-      expect(registrant).to receive(:ident).and_return('test ident')
-      expect(presenter.ident).to eq('test ident')
-    end
-  end
-
-  describe '#email' do
-    it 'returns email' do
-      expect(registrant).to receive(:email).and_return('test email')
-      expect(presenter.email).to eq('test email')
-    end
-  end
-
-  describe '#priv?' do
-    it 'delegates to registrant' do
-      expect(registrant).to receive(:priv?).and_return('test')
-      expect(presenter.priv?).to eq('test')
+  describe '#country' do
+    it 'returns country name' do
+      expect(presenter.country).to be_nil
     end
   end
 end
diff --git a/spec/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb_spec.rb b/spec/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb_spec.rb
index 36a426bac..3722d9093 100644
--- a/spec/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb_spec.rb
+++ b/spec/views/mailers/domain_mailer/pending_update_request_for_old_registrant.html.erb_spec.rb
@@ -49,6 +49,9 @@ RSpec.describe 'mailers/domain_mailer/pending_update_request_for_old_registrant.
   registrant_attributes = %i(
     name
     ident
+    street
+    city
+    country
   )
 
   registrant_attributes.each do |attr_name|
diff --git a/spec/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb_spec.rb b/spec/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb_spec.rb
index da9765873..9478e0238 100644
--- a/spec/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb_spec.rb
+++ b/spec/views/mailers/domain_mailer/pending_update_request_for_old_registrant.text.erb_spec.rb
@@ -49,6 +49,9 @@ RSpec.describe 'mailers/domain_mailer/pending_update_request_for_old_registrant.
   registrant_attributes = %i(
     name
     ident
+    street
+    city
+    country
   )
 
   registrant_attributes.each do |attr_name|