From 1fb3a51f45921fc1f074e005424b2c3640313986 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 5 Apr 2019 19:51:03 +0300 Subject: [PATCH 1/5] Add mailer preview --- .../registrant_change_mailer_preview.rb | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 test/mailers/previews/registrant_change_mailer_preview.rb diff --git a/test/mailers/previews/registrant_change_mailer_preview.rb b/test/mailers/previews/registrant_change_mailer_preview.rb new file mode 100644 index 000000000..0a8f25716 --- /dev/null +++ b/test/mailers/previews/registrant_change_mailer_preview.rb @@ -0,0 +1,38 @@ +class RegistrantChangeMailerPreview < ActionMailer::Preview + def initialize + @domain = Domain.first + @new_registrant = Registrant.where.not(email: nil, country_code: nil).first + super + end + + def confirmation_request + RegistrantChangeMailer.confirm(domain: @domain, + registrar: @domain.registrar, + current_registrant: @domain.registrant, + new_registrant: @new_registrant) + end + + def notification + RegistrantChangeMailer.notice(domain: @domain, + registrar: @domain.registrar, + current_registrant: @domain.registrant, + new_registrant: @new_registrant) + end + + def confirmation_accepted + RegistrantChangeMailer.confirmed(domain: @domain, + old_registrant: @domain.registrar) + end + + def confirmation_rejected + RegistrantChangeMailer.rejected(domain: @domain, + registrar: @domain.registrar, + registrant: @domain.registrant) + end + + def confirmation_expired + RegistrantChangeMailer.expired(domain: @domain, + registrar: @domain.registrar, + registrant: @domain.registrant) + end +end \ No newline at end of file From ffe11685ff5b39938f34aab784d811087480d296 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 5 Apr 2019 20:19:28 +0300 Subject: [PATCH 2/5] Remove useless specs --- .../confirm.html.erb_spec.rb | 11 ---- .../confirm.text.erb_spec.rb | 11 ---- .../domain_delete_mailer/confirm_shared.rb | 35 ------------- .../confirm.html.erb_spec.rb | 13 ----- .../confirm.text.erb_spec.rb | 13 ----- .../confirm_shared.rb | 51 ------------------- .../expired.html.erb_spec.rb | 11 ---- .../expired.text.erb_spec.rb | 11 ---- .../expired_shared.rb | 50 ------------------ .../notice.html.erb_spec.rb | 13 ----- .../notice.text.erb_spec.rb | 13 ----- .../registrant_change_mailer/notice_shared.rb | 47 ----------------- .../rejected.html.erb_spec.rb | 11 ---- .../rejected.text.erb_spec.rb | 11 ---- .../rejected_shared.rb | 48 ----------------- 15 files changed, 349 deletions(-) delete mode 100644 spec/views/mailers/domain_delete_mailer/confirm.html.erb_spec.rb delete mode 100644 spec/views/mailers/domain_delete_mailer/confirm.text.erb_spec.rb delete mode 100644 spec/views/mailers/domain_delete_mailer/confirm_shared.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/confirm.html.erb_spec.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/confirm.text.erb_spec.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/confirm_shared.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/expired.html.erb_spec.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/expired.text.erb_spec.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/expired_shared.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/notice.html.erb_spec.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/notice.text.erb_spec.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/notice_shared.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/rejected.html.erb_spec.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/rejected.text.erb_spec.rb delete mode 100644 spec/views/mailers/registrant_change_mailer/rejected_shared.rb diff --git a/spec/views/mailers/domain_delete_mailer/confirm.html.erb_spec.rb b/spec/views/mailers/domain_delete_mailer/confirm.html.erb_spec.rb deleted file mode 100644 index 7d7776d0a..000000000 --- a/spec/views/mailers/domain_delete_mailer/confirm.html.erb_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'rails_helper' -require_relative 'confirm_shared' - -RSpec.describe 'mailers/domain_delete_mailer/confirm.html.erb' do - before :example do - stub_template 'mailers/shared/registrar/_registrar.et.html' => 'test registrar estonian' - stub_template 'mailers/shared/registrar/_registrar.en.html' => 'test registrar english' - end - - include_examples 'domain delete mailer confirm' -end diff --git a/spec/views/mailers/domain_delete_mailer/confirm.text.erb_spec.rb b/spec/views/mailers/domain_delete_mailer/confirm.text.erb_spec.rb deleted file mode 100644 index b5f257b86..000000000 --- a/spec/views/mailers/domain_delete_mailer/confirm.text.erb_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'rails_helper' -require_relative 'confirm_shared' - -RSpec.describe 'mailers/domain_delete_mailer/confirm.text.erb' do - before :example do - stub_template 'mailers/shared/registrar/_registrar.et.text' => 'test registrar estonian' - stub_template 'mailers/shared/registrar/_registrar.en.text' => 'test registrar english' - end - - include_examples 'domain delete mailer confirm' -end diff --git a/spec/views/mailers/domain_delete_mailer/confirm_shared.rb b/spec/views/mailers/domain_delete_mailer/confirm_shared.rb deleted file mode 100644 index 960e5cf42..000000000 --- a/spec/views/mailers/domain_delete_mailer/confirm_shared.rb +++ /dev/null @@ -1,35 +0,0 @@ -require 'rails_helper' - -RSpec.shared_examples 'domain delete mailer confirm' do - let(:domain) { instance_spy(DomainPresenter) } - let(:lang_count) { 2 } - - before :example do - assign(:domain, domain) - assign(:registrar, nil) - assign(:confirm_url, 'test confirm url') - end - - it 'has registrar info in estonian' do - render - expect(rendered).to have_text('test registrar estonian') - end - - it 'has registrar info in english' do - render - expect(rendered).to have_text('test registrar english') - end - - it 'has domain name' do - mention_count = 1 * lang_count - expect(domain).to receive(:name).exactly(mention_count).times.and_return('test domain name') - render - expect(rendered).to have_text('test domain name', count: mention_count) - end - - it 'has confirm url' do - mention_count = 1 * lang_count - render - expect(rendered).to have_text('test confirm url', count: mention_count) - end -end diff --git a/spec/views/mailers/registrant_change_mailer/confirm.html.erb_spec.rb b/spec/views/mailers/registrant_change_mailer/confirm.html.erb_spec.rb deleted file mode 100644 index e8aa20326..000000000 --- a/spec/views/mailers/registrant_change_mailer/confirm.html.erb_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'rails_helper' -require_relative 'confirm_shared' - -RSpec.describe 'mailers/registrant_change_mailer/confirm.html.erb' do - before :example do - stub_template 'mailers/shared/registrar/_registrar.et.html' => 'test registrar estonian' - stub_template 'mailers/shared/registrar/_registrar.en.html' => 'test registrar english' - stub_template 'mailers/shared/registrant/_registrant.et.html' => 'test new registrant estonian' - stub_template 'mailers/shared/registrant/_registrant.en.html' => 'test new registrant english' - end - - include_examples 'registrant change mailer confirm' -end diff --git a/spec/views/mailers/registrant_change_mailer/confirm.text.erb_spec.rb b/spec/views/mailers/registrant_change_mailer/confirm.text.erb_spec.rb deleted file mode 100644 index f98f4ec32..000000000 --- a/spec/views/mailers/registrant_change_mailer/confirm.text.erb_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'rails_helper' -require_relative 'confirm_shared' - -RSpec.describe 'mailers/registrant_change_mailer/confirm.text.erb' do - before :example do - stub_template 'mailers/shared/registrar/_registrar.et.text' => 'test registrar estonian' - stub_template 'mailers/shared/registrar/_registrar.en.text' => 'test registrar english' - stub_template 'mailers/shared/registrant/_registrant.et.text' => 'test new registrant estonian' - stub_template 'mailers/shared/registrant/_registrant.en.text' => 'test new registrant english' - end - - include_examples 'registrant change mailer confirm' -end diff --git a/spec/views/mailers/registrant_change_mailer/confirm_shared.rb b/spec/views/mailers/registrant_change_mailer/confirm_shared.rb deleted file mode 100644 index 8949b5070..000000000 --- a/spec/views/mailers/registrant_change_mailer/confirm_shared.rb +++ /dev/null @@ -1,51 +0,0 @@ -require 'rails_helper' - -RSpec.shared_examples 'registrant change mailer confirm' do - let(:domain) { instance_spy(DomainPresenter) } - let(:lang_count) { 2 } - - before :example do - assign(:domain, domain) - assign(:registrar, nil) - assign(:new_registrant, nil) - assign(:confirm_url, 'test confirm url') - end - - it 'has registrar info in estonian' do - render - expect(rendered).to have_text('test registrar estonian') - end - - it 'has registrar info in english' do - render - expect(rendered).to have_text('test registrar english') - end - - it 'has new registrant info in estonian' do - render - expect(rendered).to have_text('test new registrant estonian') - end - - it 'has new registrant info in english' do - render - expect(rendered).to have_text('test new registrant english') - end - - it 'has confirm url' do - mention_count = 1 * lang_count - render - expect(rendered).to have_text('test confirm url', count: mention_count) - end - - domain_attributes = %i( - name - ) - - domain_attributes.each do |attr_name| - it "has domain #{attr_name}" do - expect(domain).to receive(attr_name).exactly(lang_count).times.and_return(attr_name.to_s) - render - expect(rendered).to have_text(attr_name.to_s, count: lang_count) - end - end -end diff --git a/spec/views/mailers/registrant_change_mailer/expired.html.erb_spec.rb b/spec/views/mailers/registrant_change_mailer/expired.html.erb_spec.rb deleted file mode 100644 index 581fae654..000000000 --- a/spec/views/mailers/registrant_change_mailer/expired.html.erb_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'rails_helper' -require_relative 'expired_shared' - -RSpec.describe 'mailers/registrant_change_mailer/expired.html.erb' do - before :example do - stub_template 'mailers/shared/registrar/_registrar.et.html' => 'test registrar estonian' - stub_template 'mailers/shared/registrar/_registrar.en.html' => 'test registrar english' - end - - include_examples 'registrant change mailer expired' -end diff --git a/spec/views/mailers/registrant_change_mailer/expired.text.erb_spec.rb b/spec/views/mailers/registrant_change_mailer/expired.text.erb_spec.rb deleted file mode 100644 index 6f02fd795..000000000 --- a/spec/views/mailers/registrant_change_mailer/expired.text.erb_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'rails_helper' -require_relative 'expired_shared' - -RSpec.describe 'mailers/registrant_change_mailer/expired.text.erb' do - before :example do - stub_template 'mailers/shared/registrar/_registrar.et.text' => 'test registrar estonian' - stub_template 'mailers/shared/registrar/_registrar.en.text' => 'test registrar english' - end - - include_examples 'registrant change mailer expired' -end diff --git a/spec/views/mailers/registrant_change_mailer/expired_shared.rb b/spec/views/mailers/registrant_change_mailer/expired_shared.rb deleted file mode 100644 index bcb82f008..000000000 --- a/spec/views/mailers/registrant_change_mailer/expired_shared.rb +++ /dev/null @@ -1,50 +0,0 @@ -require 'rails_helper' - -RSpec.shared_examples 'registrant change mailer expired' do - let(:domain) { instance_spy(DomainPresenter) } - let(:registrar) { instance_spy(RegistrarPresenter) } - let(:registrant) { instance_spy(RegistrantPresenter) } - let(:lang_count) { 2 } - - before :example do - assign(:domain, domain) - assign(:registrar, registrar) - assign(:registrant, registrant) - end - - it 'has registrar info in estonian' do - render - expect(rendered).to have_text('test registrar estonian') - end - - it 'has registrar info in english' do - render - expect(rendered).to have_text('test registrar english') - end - - domain_attributes = %i( - name - ) - - domain_attributes.each do |attr_name| - it "has domain #{attr_name}" do - mention_count = 3 - expect(domain).to receive(attr_name).exactly(mention_count).times.and_return("test domain #{attr_name}") - render - expect(rendered).to have_text("test domain #{attr_name}", count: mention_count) - end - end - - registrant_attributes = %i( - name - ) - - registrant_attributes.each do |attr_name| - it "has registrant #{attr_name}" do - mention_count = 1 - expect(registrant).to receive(attr_name).exactly(mention_count).times.and_return("test registrant #{attr_name}") - render - expect(rendered).to have_text("test registrant #{attr_name}", count: mention_count) - end - end -end diff --git a/spec/views/mailers/registrant_change_mailer/notice.html.erb_spec.rb b/spec/views/mailers/registrant_change_mailer/notice.html.erb_spec.rb deleted file mode 100644 index c5d4f2974..000000000 --- a/spec/views/mailers/registrant_change_mailer/notice.html.erb_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'rails_helper' -require_relative 'notice_shared' - -RSpec.describe 'mailers/registrant_change_mailer/notice.html.erb' do - before :example do - stub_template 'mailers/shared/registrar/_registrar.et.html' => 'test registrar estonian' - stub_template 'mailers/shared/registrar/_registrar.en.html' => 'test registrar english' - stub_template 'mailers/shared/registrant/_registrant.et.html' => 'test new registrant estonian' - stub_template 'mailers/shared/registrant/_registrant.en.html' => 'test new registrant english' - end - - include_examples 'registrant change mailer notice' -end diff --git a/spec/views/mailers/registrant_change_mailer/notice.text.erb_spec.rb b/spec/views/mailers/registrant_change_mailer/notice.text.erb_spec.rb deleted file mode 100644 index ab685b12f..000000000 --- a/spec/views/mailers/registrant_change_mailer/notice.text.erb_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'rails_helper' -require_relative 'notice_shared' - -RSpec.describe 'mailers/registrant_change_mailer/notice.text.erb' do - before :example do - stub_template 'mailers/shared/registrar/_registrar.et.text' => 'test registrar estonian' - stub_template 'mailers/shared/registrar/_registrar.en.text' => 'test registrar english' - stub_template 'mailers/shared/registrant/_registrant.et.text' => 'test new registrant estonian' - stub_template 'mailers/shared/registrant/_registrant.en.text' => 'test new registrant english' - end - - include_examples 'registrant change mailer notice' -end diff --git a/spec/views/mailers/registrant_change_mailer/notice_shared.rb b/spec/views/mailers/registrant_change_mailer/notice_shared.rb deleted file mode 100644 index 40d42cd1c..000000000 --- a/spec/views/mailers/registrant_change_mailer/notice_shared.rb +++ /dev/null @@ -1,47 +0,0 @@ -require 'rails_helper' - -RSpec.shared_examples 'registrant change mailer notice' do - let(:domain) { instance_spy(DomainPresenter) } - let(:registrar) { instance_spy(RegistrarPresenter) } - let(:registrant) { instance_spy(RegistrantPresenter) } - let(:lang_count) { 2 } - - before :example do - assign(:domain, domain) - assign(:registrar, registrar) - assign(:current_registrant, registrant) - assign(:new_registrant, registrant) - end - - it 'has registrar info in estonian' do - render - expect(rendered).to have_text('test registrar estonian') - end - - it 'has registrar info in english' do - render - expect(rendered).to have_text('test registrar english') - end - - it 'has new registrant info in estonian' do - render - expect(rendered).to have_text('test new registrant estonian') - end - - it 'has new registrant info in english' do - render - expect(rendered).to have_text('test new registrant english') - end - - domain_attributes = %i( - name - ) - - domain_attributes.each do |attr_name| - it "has domain #{attr_name}" do - expect(domain).to receive(attr_name).exactly(lang_count).times.and_return("test domain #{attr_name}") - render - expect(rendered).to have_text("test domain #{attr_name}", count: lang_count) - end - end -end diff --git a/spec/views/mailers/registrant_change_mailer/rejected.html.erb_spec.rb b/spec/views/mailers/registrant_change_mailer/rejected.html.erb_spec.rb deleted file mode 100644 index be37545c6..000000000 --- a/spec/views/mailers/registrant_change_mailer/rejected.html.erb_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'rails_helper' -require_relative 'rejected_shared' - -RSpec.describe 'mailers/registrant_change_mailer/rejected.html.erb' do - before :example do - stub_template 'mailers/shared/registrar/_registrar.et.html' => 'test registrar estonian' - stub_template 'mailers/shared/registrar/_registrar.en.html' => 'test registrar english' - end - - include_examples 'registrant change mailer rejected' -end diff --git a/spec/views/mailers/registrant_change_mailer/rejected.text.erb_spec.rb b/spec/views/mailers/registrant_change_mailer/rejected.text.erb_spec.rb deleted file mode 100644 index af9d78a69..000000000 --- a/spec/views/mailers/registrant_change_mailer/rejected.text.erb_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'rails_helper' -require_relative 'rejected_shared' - -RSpec.describe 'mailers/registrant_change_mailer/rejected.text.erb' do - before :example do - stub_template 'mailers/shared/registrar/_registrar.et.text' => 'test registrar estonian' - stub_template 'mailers/shared/registrar/_registrar.en.text' => 'test registrar english' - end - - include_examples 'registrant change mailer rejected' -end diff --git a/spec/views/mailers/registrant_change_mailer/rejected_shared.rb b/spec/views/mailers/registrant_change_mailer/rejected_shared.rb deleted file mode 100644 index f6e21d57a..000000000 --- a/spec/views/mailers/registrant_change_mailer/rejected_shared.rb +++ /dev/null @@ -1,48 +0,0 @@ -require 'rails_helper' - -RSpec.shared_examples 'registrant change mailer rejected' do - let(:domain) { instance_spy(DomainPresenter) } - let(:registrar) { instance_spy(RegistrarPresenter) } - let(:registrant) { instance_spy(RegistrantPresenter) } - let(:lang_count) { 2 } - - before :example do - assign(:domain, domain) - assign(:registrar, registrar) - assign(:registrant, registrant) - end - - it 'has registrar info in estonian' do - render - expect(rendered).to have_text('test registrar estonian') - end - - it 'has registrar info in english' do - render - expect(rendered).to have_text('test registrar english') - end - - domain_attributes = %i( - name - ) - - domain_attributes.each do |attr_name| - it "has domain #{attr_name}" do - expect(domain).to receive(attr_name).exactly(lang_count).times.and_return("test domain #{attr_name}") - render - expect(rendered).to have_text("test domain #{attr_name}", count: lang_count) - end - end - - registrant_attributes = %i( - name - ) - - registrant_attributes.each do |attr_name| - it "has registrant #{attr_name}" do - expect(registrant).to receive(attr_name).exactly(lang_count).times.and_return("test registrant #{attr_name}") - render - expect(rendered).to have_text("test registrant #{attr_name}", count: lang_count) - end - end -end From eb1ee426ca7277a79ea564179575d7f5c71abb3a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 5 Apr 2019 20:22:01 +0300 Subject: [PATCH 3/5] Improve readability --- .../registrant_change_confirm_email_job.rb | 8 +++--- .../registrant_change_notice_email_job.rb | 8 +++--- app/mailers/registrant_change_mailer.rb | 10 +++---- app/services/registrant_change.rb | 2 +- .../{confirmed.html.erb => accepted.html.erb} | 0 .../{confirmed.text.erb => accepted.text.erb} | 0 ...html.erb => confirmation_request.html.erb} | 4 +-- ...text.erb => confirmation_request.text.erb} | 4 +-- ...{notice.html.erb => notification.html.erb} | 0 ...{notice.text.erb => notification.text.erb} | 0 .../locales/mailers/registrant_change.en.yml | 10 +++---- spec/services/registrant_change_spec.rb | 2 +- .../registrant_change_mailer_preview.rb | 26 +++++++++---------- test/mailers/registrant_change_mailer_test.rb | 21 ++++++++------- 14 files changed, 48 insertions(+), 47 deletions(-) rename app/views/mailers/registrant_change_mailer/{confirmed.html.erb => accepted.html.erb} (100%) rename app/views/mailers/registrant_change_mailer/{confirmed.text.erb => accepted.text.erb} (100%) rename app/views/mailers/registrant_change_mailer/{confirm.html.erb => confirmation_request.html.erb} (93%) rename app/views/mailers/registrant_change_mailer/{confirm.text.erb => confirmation_request.text.erb} (96%) rename app/views/mailers/registrant_change_mailer/{notice.html.erb => notification.html.erb} (100%) rename app/views/mailers/registrant_change_mailer/{notice.text.erb => notification.text.erb} (100%) diff --git a/app/jobs/registrant_change_confirm_email_job.rb b/app/jobs/registrant_change_confirm_email_job.rb index 0fced48d8..2883c10a6 100644 --- a/app/jobs/registrant_change_confirm_email_job.rb +++ b/app/jobs/registrant_change_confirm_email_job.rb @@ -4,10 +4,10 @@ class RegistrantChangeConfirmEmailJob < Que::Job new_registrant = Registrant.find(new_registrant_id) log(domain) - RegistrantChangeMailer.confirm(domain: domain, - registrar: domain.registrar, - current_registrant: domain.registrant, - new_registrant: new_registrant).deliver_now + RegistrantChangeMailer.confirmation_request(domain: domain, + registrar: domain.registrar, + current_registrant: domain.registrant, + new_registrant: new_registrant).deliver_now end private diff --git a/app/jobs/registrant_change_notice_email_job.rb b/app/jobs/registrant_change_notice_email_job.rb index a0bf26c52..cabd1db7f 100644 --- a/app/jobs/registrant_change_notice_email_job.rb +++ b/app/jobs/registrant_change_notice_email_job.rb @@ -3,10 +3,10 @@ class RegistrantChangeNoticeEmailJob < Que::Job domain = Domain.find(domain_id) new_registrant = Registrant.find(new_registrant_id) log(domain, new_registrant) - RegistrantChangeMailer.notice(domain: domain, - registrar: domain.registrar, - current_registrant: domain.registrant, - new_registrant: new_registrant).deliver_now + RegistrantChangeMailer.notification(domain: domain, + registrar: domain.registrar, + current_registrant: domain.registrant, + new_registrant: new_registrant).deliver_now end private diff --git a/app/mailers/registrant_change_mailer.rb b/app/mailers/registrant_change_mailer.rb index 2ba7e497e..ff3cfa18e 100644 --- a/app/mailers/registrant_change_mailer.rb +++ b/app/mailers/registrant_change_mailer.rb @@ -1,17 +1,17 @@ class RegistrantChangeMailer < ApplicationMailer helper_method :address_processing - def confirm(domain:, registrar:, current_registrant:, new_registrant:) + def confirmation_request(domain:, registrar:, current_registrant:, new_registrant:) @domain = DomainPresenter.new(domain: domain, view: view_context) @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context) @new_registrant = RegistrantPresenter.new(registrant: new_registrant, view: view_context) - @confirm_url = confirm_url(domain) + @confirmation_url = confirmation_url(domain) subject = default_i18n_subject(domain_name: domain.name) mail(to: current_registrant.email, subject: subject) end - def notice(domain:, registrar:, current_registrant:, new_registrant:) + def notification(domain:, registrar:, current_registrant:, new_registrant:) @domain = DomainPresenter.new(domain: domain, view: view_context) @registrar = RegistrarPresenter.new(registrar: registrar, view: view_context) @current_registrant = RegistrantPresenter.new(registrant: current_registrant, view: view_context) @@ -21,7 +21,7 @@ class RegistrantChangeMailer < ApplicationMailer mail(to: new_registrant.email, subject: subject) end - def confirmed(domain:, old_registrant:) + def accepted(domain:, old_registrant:) @domain = domain recipients = [domain.registrant.email, old_registrant.email] subject = default_i18n_subject(domain_name: domain.name) @@ -49,7 +49,7 @@ class RegistrantChangeMailer < ApplicationMailer private - def confirm_url(domain) + def confirmation_url(domain) registrant_domain_update_confirm_url(domain, token: domain.registrant_verification_token) end diff --git a/app/services/registrant_change.rb b/app/services/registrant_change.rb index a820dbe8d..35b631fb6 100644 --- a/app/services/registrant_change.rb +++ b/app/services/registrant_change.rb @@ -11,7 +11,7 @@ class RegistrantChange private def notify_registrant - RegistrantChangeMailer.confirmed(domain: domain, old_registrant: old_registrant).deliver_now + RegistrantChangeMailer.accepted(domain: domain, old_registrant: old_registrant).deliver_now end attr_reader :domain diff --git a/app/views/mailers/registrant_change_mailer/confirmed.html.erb b/app/views/mailers/registrant_change_mailer/accepted.html.erb similarity index 100% rename from app/views/mailers/registrant_change_mailer/confirmed.html.erb rename to app/views/mailers/registrant_change_mailer/accepted.html.erb diff --git a/app/views/mailers/registrant_change_mailer/confirmed.text.erb b/app/views/mailers/registrant_change_mailer/accepted.text.erb similarity index 100% rename from app/views/mailers/registrant_change_mailer/confirmed.text.erb rename to app/views/mailers/registrant_change_mailer/accepted.text.erb diff --git a/app/views/mailers/registrant_change_mailer/confirm.html.erb b/app/views/mailers/registrant_change_mailer/confirmation_request.html.erb similarity index 93% rename from app/views/mailers/registrant_change_mailer/confirm.html.erb rename to app/views/mailers/registrant_change_mailer/confirmation_request.html.erb index a2e889dc6..a867ffe3d 100644 --- a/app/views/mailers/registrant_change_mailer/confirm.html.erb +++ b/app/views/mailers/registrant_change_mailer/confirmation_request.html.erb @@ -12,7 +12,7 @@ Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatak

Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
-<%= link_to @confirm_url, @confirm_url %> +<%= link_to @confirmation_url, @confirmation_url %>

Lugupidamisega
Eesti Interneti Sihtasutus @@ -32,7 +32,7 @@ New registrant:
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:
-<%= link_to @confirm_url, @confirm_url %> +<%= link_to @confirmation_url, @confirmation_url %>

Best Regards,
Estonian Internet Foundation diff --git a/app/views/mailers/registrant_change_mailer/confirm.text.erb b/app/views/mailers/registrant_change_mailer/confirmation_request.text.erb similarity index 96% rename from app/views/mailers/registrant_change_mailer/confirm.text.erb rename to app/views/mailers/registrant_change_mailer/confirmation_request.text.erb index 2af2381fc..6bcc0322b 100644 --- a/app/views/mailers/registrant_change_mailer/confirm.text.erb +++ b/app/views/mailers/registrant_change_mailer/confirmation_request.text.erb @@ -9,7 +9,7 @@ Uue registreerija andmed: 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: -<%= @confirm_url %> +<%= @confirmation_url %> Lugupidamisega Eesti Interneti Sihtasutus @@ -27,7 +27,7 @@ New registrant: 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: -<%= @confirm_url %> +<%= @confirmation_url %> Best Regards, Estonian Internet Foundation diff --git a/app/views/mailers/registrant_change_mailer/notice.html.erb b/app/views/mailers/registrant_change_mailer/notification.html.erb similarity index 100% rename from app/views/mailers/registrant_change_mailer/notice.html.erb rename to app/views/mailers/registrant_change_mailer/notification.html.erb diff --git a/app/views/mailers/registrant_change_mailer/notice.text.erb b/app/views/mailers/registrant_change_mailer/notification.text.erb similarity index 100% rename from app/views/mailers/registrant_change_mailer/notice.text.erb rename to app/views/mailers/registrant_change_mailer/notification.text.erb diff --git a/config/locales/mailers/registrant_change.en.yml b/config/locales/mailers/registrant_change.en.yml index 87a7cc492..a78991f0c 100644 --- a/config/locales/mailers/registrant_change.en.yml +++ b/config/locales/mailers/registrant_change.en.yml @@ -1,14 +1,14 @@ en: registrant_change_mailer: - confirm: + confirmation_request: subject: Kinnitustaotlus domeeni %{domain_name} registreerija vahetuseks / Application for approval for registrant change of %{domain_name} - notice: + notification: subject: Domeeni %{domain_name} registreerija vahetus protseduur on algatatud / %{domain_name} registrant change - rejected: - subject: Domeeni %{domain_name} registreerija vahetuse taotlus tagasi lükatud / %{domain_name} registrant change declined - confirmed: + accepted: subject: >- Domeeni %{domain_name} registreerija vahetus teostatud / Registrant change of %{domain_name} has been finished + rejected: + subject: Domeeni %{domain_name} registreerija vahetuse taotlus tagasi lükatud / %{domain_name} registrant change declined expired: subject: Domeeni %{domain_name} registreerija vahetuse taotlus on tühistatud / %{domain_name} registrant change cancelled diff --git a/spec/services/registrant_change_spec.rb b/spec/services/registrant_change_spec.rb index fb1762557..598874109 100644 --- a/spec/services/registrant_change_spec.rb +++ b/spec/services/registrant_change_spec.rb @@ -7,7 +7,7 @@ RSpec.describe RegistrantChange do let(:message) { instance_spy(ActionMailer::MessageDelivery) } before :example do - allow(RegistrantChangeMailer).to receive(:confirmed) + allow(RegistrantChangeMailer).to receive(:accepted) .with(domain: domain, old_registrant: old_registrant) .and_return(message) described_class.new(domain: domain, old_registrant: old_registrant).confirm diff --git a/test/mailers/previews/registrant_change_mailer_preview.rb b/test/mailers/previews/registrant_change_mailer_preview.rb index 0a8f25716..dec948fe6 100644 --- a/test/mailers/previews/registrant_change_mailer_preview.rb +++ b/test/mailers/previews/registrant_change_mailer_preview.rb @@ -6,31 +6,31 @@ class RegistrantChangeMailerPreview < ActionMailer::Preview end def confirmation_request - RegistrantChangeMailer.confirm(domain: @domain, - registrar: @domain.registrar, - current_registrant: @domain.registrant, - new_registrant: @new_registrant) + RegistrantChangeMailer.confirmation_request(domain: @domain, + registrar: @domain.registrar, + current_registrant: @domain.registrant, + new_registrant: @new_registrant) end def notification - RegistrantChangeMailer.notice(domain: @domain, - registrar: @domain.registrar, - current_registrant: @domain.registrant, - new_registrant: @new_registrant) + RegistrantChangeMailer.notification(domain: @domain, + registrar: @domain.registrar, + current_registrant: @domain.registrant, + new_registrant: @new_registrant) end - def confirmation_accepted - RegistrantChangeMailer.confirmed(domain: @domain, - old_registrant: @domain.registrar) + def accepted + RegistrantChangeMailer.accepted(domain: @domain, + old_registrant: @domain.registrar) end - def confirmation_rejected + def rejected RegistrantChangeMailer.rejected(domain: @domain, registrar: @domain.registrar, registrant: @domain.registrant) end - def confirmation_expired + def expired RegistrantChangeMailer.expired(domain: @domain, registrar: @domain.registrar, registrant: @domain.registrant) diff --git a/test/mailers/registrant_change_mailer_test.rb b/test/mailers/registrant_change_mailer_test.rb index ebe5847d6..a4b35499c 100644 --- a/test/mailers/registrant_change_mailer_test.rb +++ b/test/mailers/registrant_change_mailer_test.rb @@ -12,10 +12,11 @@ class RegistrantChangeMailerTest < ActiveSupport::TestCase assert_equal 'shop.test', @domain.name assert_equal 'john@inbox.test', @domain.registrant.email - email = RegistrantChangeMailer.confirm(domain: @domain, - registrar: @domain.registrar, - current_registrant: @domain.registrant, - new_registrant: @domain.registrant).deliver_now + email = RegistrantChangeMailer.confirmation_request(domain: @domain, + registrar: @domain.registrar, + current_registrant: @domain.registrant, + new_registrant: @domain.registrant) + .deliver_now assert_emails 1 assert_equal ['john@inbox.test'], email.to @@ -28,10 +29,10 @@ class RegistrantChangeMailerTest < ActiveSupport::TestCase assert_equal 'shop.test', @domain.name assert_equal 'william@inbox.test', new_registrant.email - email = RegistrantChangeMailer.notice(domain: @domain, - registrar: @domain.registrar, - current_registrant: @domain.registrant, - new_registrant: new_registrant).deliver_now + email = RegistrantChangeMailer.notification(domain: @domain, + registrar: @domain.registrar, + current_registrant: @domain.registrant, + new_registrant: new_registrant).deliver_now assert_emails 1 assert_equal ['william@inbox.test'], email.to @@ -45,8 +46,8 @@ class RegistrantChangeMailerTest < ActiveSupport::TestCase assert_equal 'john@inbox.test', @domain.registrant.email assert_equal 'william@inbox.test', new_registrant.email - email = RegistrantChangeMailer.confirmed(domain: @domain, - old_registrant: new_registrant).deliver_now + email = RegistrantChangeMailer.accepted(domain: @domain, + old_registrant: new_registrant).deliver_now assert_emails 1 assert_equal %w[john@inbox.test william@inbox.test], email.to From 43da9e97e2a1a1754f74ab9f9127de9ffcdaab2c Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 5 Apr 2019 20:44:33 +0300 Subject: [PATCH 4/5] Reformat --- config/locales/mailers/registrant_change.en.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/config/locales/mailers/registrant_change.en.yml b/config/locales/mailers/registrant_change.en.yml index a78991f0c..744715807 100644 --- a/config/locales/mailers/registrant_change.en.yml +++ b/config/locales/mailers/registrant_change.en.yml @@ -1,14 +1,22 @@ en: registrant_change_mailer: confirmation_request: - subject: Kinnitustaotlus domeeni %{domain_name} registreerija vahetuseks / Application for approval for registrant change of %{domain_name} + subject: >- + Kinnitustaotlus domeeni %{domain_name} registreerija vahetuseks + / Application for approval for registrant change of %{domain_name} notification: - subject: Domeeni %{domain_name} registreerija vahetus protseduur on algatatud / %{domain_name} registrant change + subject: >- + Domeeni %{domain_name} registreerija vahetus protseduur on algatatud + / %{domain_name} registrant change accepted: subject: >- Domeeni %{domain_name} registreerija vahetus teostatud / Registrant change of %{domain_name} has been finished rejected: - subject: Domeeni %{domain_name} registreerija vahetuse taotlus tagasi lükatud / %{domain_name} registrant change declined + subject: >- + Domeeni %{domain_name} registreerija vahetuse taotlus tagasi lükatud + / %{domain_name} registrant change declined expired: - subject: Domeeni %{domain_name} registreerija vahetuse taotlus on tühistatud / %{domain_name} registrant change cancelled + subject: >- + Domeeni %{domain_name} registreerija vahetuse taotlus on tühistatud + / %{domain_name} registrant change cancelled \ No newline at end of file From d25c9b4ac2d359cf1a44dd2eda72b7f6e1471081 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 5 Apr 2019 20:57:39 +0300 Subject: [PATCH 5/5] Use template --- .../registrant_change_mailer/accepted.html.erb | 9 ++------- .../registrant_change_mailer/accepted.text.erb | 7 ++----- .../confirmation_request.html.erb | 9 ++------- .../confirmation_request.text.erb | 6 ++---- .../mailers/registrant_change_mailer/expired.html.erb | 11 ++--------- .../mailers/registrant_change_mailer/expired.text.erb | 7 ++----- .../registrant_change_mailer/notification.html.erb | 8 ++------ .../registrant_change_mailer/notification.text.erb | 6 ++---- .../registrant_change_mailer/rejected.html.erb | 11 ++--------- .../registrant_change_mailer/rejected.text.erb | 6 ++---- 10 files changed, 20 insertions(+), 60 deletions(-) diff --git a/app/views/mailers/registrant_change_mailer/accepted.html.erb b/app/views/mailers/registrant_change_mailer/accepted.html.erb index b56aae53c..0652beb6e 100644 --- a/app/views/mailers/registrant_change_mailer/accepted.html.erb +++ b/app/views/mailers/registrant_change_mailer/accepted.html.erb @@ -8,10 +8,7 @@ Domeeni <%= domain.name %> registreerija vahetuse taotlus on kinnitatud ning and

Uue registreerija andmed:
<%= render 'mailers/shared/registrant/registrant.et.html', registrant: new_registrant %> -

-Lugupidamisega
-Eesti Interneti Sihtasutus -

+<%= render 'mailers/shared/signatures/signature.et.html' %>


Hi, @@ -20,6 +17,4 @@ Process for changing registrant of the domain <%= domain.name %> has been approv

New registrant:
<%= render 'mailers/shared/registrant/registrant.en.html', registrant: new_registrant %> -

-Best Regards,
-Estonian Internet Foundation +<%= render 'mailers/shared/signatures/signature.en.html' %> \ No newline at end of file diff --git a/app/views/mailers/registrant_change_mailer/accepted.text.erb b/app/views/mailers/registrant_change_mailer/accepted.text.erb index 2bab1f4c2..44cb7a2cc 100644 --- a/app/views/mailers/registrant_change_mailer/accepted.text.erb +++ b/app/views/mailers/registrant_change_mailer/accepted.text.erb @@ -9,9 +9,7 @@ Domeeni <%= domain.name %> registreerija vahetuse taotlus on kinnitatud ning and Uue registreerija andmed: <%= render 'mailers/shared/registrant/registrant.et.text', registrant: new_registrant %> -Lugupidamisega -Eesti Interneti Sihtasutus - +<%= render 'mailers/shared/signatures/signature.et.text' %> -------------------------------------- Hi, @@ -21,5 +19,4 @@ Process for changing registrant of the domain <%= domain.name %> has been approv New registrant: <%= render 'mailers/shared/registrant/registrant.en.text', registrant: new_registrant %> -Best Regards, -Estonian Internet Foundation +<%= render 'mailers/shared/signatures/signature.en.text' %> diff --git a/app/views/mailers/registrant_change_mailer/confirmation_request.html.erb b/app/views/mailers/registrant_change_mailer/confirmation_request.html.erb index a867ffe3d..3371b03d5 100644 --- a/app/views/mailers/registrant_change_mailer/confirmation_request.html.erb +++ b/app/views/mailers/registrant_change_mailer/confirmation_request.html.erb @@ -13,10 +13,7 @@ Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatak Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan:
<%= link_to @confirmation_url, @confirmation_url %> -

-Lugupidamisega
-Eesti Interneti Sihtasutus -

+<%= render 'mailers/shared/signatures/signature.et.html' %>


Hi, @@ -33,6 +30,4 @@ The application will remain in pending status for <%= Setting.expire_pending_con

To confirm the update please visit this website, once again review the data and press approve:
<%= link_to @confirmation_url, @confirmation_url %> -

-Best Regards,
-Estonian Internet Foundation +<%= render 'mailers/shared/signatures/signature.en.html' %> \ No newline at end of file diff --git a/app/views/mailers/registrant_change_mailer/confirmation_request.text.erb b/app/views/mailers/registrant_change_mailer/confirmation_request.text.erb index 6bcc0322b..174527488 100644 --- a/app/views/mailers/registrant_change_mailer/confirmation_request.text.erb +++ b/app/views/mailers/registrant_change_mailer/confirmation_request.text.erb @@ -11,8 +11,7 @@ Taotlus on aktiivne <%= Setting.expire_pending_confirmation %> tundi ja lükatak Muudatuse kinnitamiseks külastage palun allolevat lehekülge, kontrollige uuesti üle muudatuse andmed ning vajutage nuppu kinnitan: <%= @confirmation_url %> -Lugupidamisega -Eesti Interneti Sihtasutus +<%= render 'mailers/shared/signatures/signature.et.text' %> -------------------------------------- @@ -29,5 +28,4 @@ The application will remain in pending status for <%= Setting.expire_pending_con To confirm the update please visit this website, once again review the data and press approve: <%= @confirmation_url %> -Best Regards, -Estonian Internet Foundation +<%= render 'mailers/shared/signatures/signature.en.text' %> \ No newline at end of file diff --git a/app/views/mailers/registrant_change_mailer/expired.html.erb b/app/views/mailers/registrant_change_mailer/expired.html.erb index 0d369a970..84cf60e91 100644 --- a/app/views/mailers/registrant_change_mailer/expired.html.erb +++ b/app/views/mailers/registrant_change_mailer/expired.html.erb @@ -5,11 +5,7 @@ Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> ei kinnitanud Küsimuste korral palun võtke ühendust oma registripidajaga: <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %> - -

-Lugupidamisega
-Eesti Interneti Sihtasutus -

+<%= render 'mailers/shared/signatures/signature.et.html' %>


Hi, @@ -19,7 +15,4 @@ Domain registrant change request has been expired for the domain <%= @domain.nam Please contact to your registrar if you have any questions: <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %> - -

-Best Regards,
-Estonian Internet Foundation +<%= render 'mailers/shared/signatures/signature.en.html' %> \ No newline at end of file diff --git a/app/views/mailers/registrant_change_mailer/expired.text.erb b/app/views/mailers/registrant_change_mailer/expired.text.erb index 7ec3fecbd..9b0dac3a6 100644 --- a/app/views/mailers/registrant_change_mailer/expired.text.erb +++ b/app/views/mailers/registrant_change_mailer/expired.text.erb @@ -5,9 +5,7 @@ Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> ei kinnitanud Küsimuste korral palun võtke ühendust oma registripidajaga: <%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %> - -Lugupidamisega -Eesti Interneti Sihtasutus +<%= render 'mailers/shared/signatures/signature.et.text' %> -------------------------------------- @@ -19,5 +17,4 @@ Please contact to your registrar if you have any questions: <%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %> -Best Regards, -Estonian Internet Foundation +<%= render 'mailers/shared/signatures/signature.en.text' %> \ No newline at end of file diff --git a/app/views/mailers/registrant_change_mailer/notification.html.erb b/app/views/mailers/registrant_change_mailer/notification.html.erb index 6aecaf0b3..0af7a468d 100644 --- a/app/views/mailers/registrant_change_mailer/notification.html.erb +++ b/app/views/mailers/registrant_change_mailer/notification.html.erb @@ -14,9 +14,7 @@ Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiakse lõpule

Juhul kui <%= @current_registrant.name %> lükkab omanikuvahetuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse.

-Lugupidamisega
-Eesti Interneti Sihtasutus -

+<%= render 'mailers/shared/signatures/signature.et.html' %>


Hi, @@ -34,6 +32,4 @@ New registrant:
The registrant change procedure will be completed only after the current registrant <%= @current_registrant.name %> has approved it.

Change request will be cancelled in case <%= @current_registrant.name %> rejects or does not approve it in <%= Setting.expire_pending_confirmation %> hours. -

-Best Regards,
-Estonian Internet Foundation +<%= render 'mailers/shared/signatures/signature.en.html' %> \ No newline at end of file diff --git a/app/views/mailers/registrant_change_mailer/notification.text.erb b/app/views/mailers/registrant_change_mailer/notification.text.erb index bd1fb5d0f..724777a59 100644 --- a/app/views/mailers/registrant_change_mailer/notification.text.erb +++ b/app/views/mailers/registrant_change_mailer/notification.text.erb @@ -13,8 +13,7 @@ Juhime Teie tähelepanu asjaolule, et omanikuvahetuse protseduur viiakse lõpule Juhul kui <%= @current_registrant.name %> lükkab omanikuvahetuse taotluse tagasi või ei anna kinnitust enne <%= Setting.expire_pending_confirmation %> tundi, omanikuvahetuse protseduur tühistatakse. -Lugupidamisega -Eesti Interneti Sihtasutus +<%= render 'mailers/shared/signatures/signature.et.text' %> -------------------------------------- @@ -33,5 +32,4 @@ The registrant change procedure will be completed only after the current registr Change request will be cancelled in case <%= @current_registrant.name %> rejects or does not approve it in <%= Setting.expire_pending_confirmation %> hours. -Best Regards, -Estonian Internet Foundation +<%= render 'mailers/shared/signatures/signature.en.text' %> diff --git a/app/views/mailers/registrant_change_mailer/rejected.html.erb b/app/views/mailers/registrant_change_mailer/rejected.html.erb index 2521dd52a..ee679daa7 100644 --- a/app/views/mailers/registrant_change_mailer/rejected.html.erb +++ b/app/views/mailers/registrant_change_mailer/rejected.html.erb @@ -5,11 +5,7 @@ Domeeni <%= @domain.name %> registreerija <%= @registrant.name %> on domeeni reg Küsimuste korral võtke palun ühendust oma registripidajaga: <%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %> - -

-Lugupidamisega
-Eesti Interneti Sihtasutus -

+<%= render 'mailers/shared/signatures/signature.et.html' %>


Hi, @@ -19,7 +15,4 @@ Registrant change for the domain <%= @domain.name %> was rejected by the registr Please contact your registrar if you have any questions: <%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %> - -

-Best Regards,
-Estonian Internet Foundation +<%= render 'mailers/shared/signatures/signature.en.html' %> \ No newline at end of file diff --git a/app/views/mailers/registrant_change_mailer/rejected.text.erb b/app/views/mailers/registrant_change_mailer/rejected.text.erb index 166f6f394..7728b5a4c 100644 --- a/app/views/mailers/registrant_change_mailer/rejected.text.erb +++ b/app/views/mailers/registrant_change_mailer/rejected.text.erb @@ -6,8 +6,7 @@ Küsimuste korral võtke palun ühendust oma registripidajaga: <%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %> -Lugupidamisega -Eesti Interneti Sihtasutus +<%= render 'mailers/shared/signatures/signature.et.text' %> -------------------------------------- @@ -19,5 +18,4 @@ Please contact your registrar if you have any questions: <%= render 'mailers/shared/registrar/registrar.en.text', registrar: @registrar %> -Best Regards, -Estonian Internet Foundation +<%= render 'mailers/shared/signatures/signature.en.text' %>