Fix merge conflicts

test/system/admin_area/bounced_mail_addresses_test.rb

@@ -0,0 +1,40 @@
+require 'application_system_test_case'
+
+class AdminBouncedMailAddressesTest < ApplicationSystemTestCase
+  include ActionView::Helpers::NumberHelper
+
+  def setup
+    @bounced_mail = bounced_mail_addresses(:one)
+    @original_default_language = Setting.default_language
+    sign_in users(:admin)
+  end
+
+  def teardown
+    Setting.default_language = @original_default_language
+  end
+
+  def test_shows_bounced_emails
+    visit admin_bounced_mail_addresses_path
+    assert_text @bounced_mail.status
+    assert_text @bounced_mail.action
+    assert_text @bounced_mail.diagnostic
+    assert_text @bounced_mail.email
+  end
+
+  def test_shows_detailed_bounced_email
+    visit admin_bounced_mail_address_path(@bounced_mail)
+    assert_text @bounced_mail.status
+    assert_text @bounced_mail.action
+    assert_text @bounced_mail.diagnostic
+    assert_text @bounced_mail.email
+
+    assert_text @bounced_mail.message_id
+  end
+
+  def test_deletes_registrar
+    visit admin_bounced_mail_address_path(@bounced_mail)
+    click_on 'Destroy'
+
+    assert_text 'Bounced mail address was successfully destroyed.'
+  end
+end

test/system/admin_area/domains/force_delete_test.rb

@@ -44,7 +44,7 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
     end
 
     @domain.reload
-    assert_equal template_name, @domain.template_name
+    assert_equal @domain.notification_template, @domain.template_name
   end
 
   def test_uses_legal_template_if_registrant_org
@@ -57,7 +57,23 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
     end
 
     @domain.reload
-    assert_equal template_name, @domain.template_name
+    assert_equal @domain.notification_template, @domain.template_name
+  end
+
+  def test_uses_legal_template_if_invalid_email
+    verification = @domain.contacts.first.email_verification
+    verification.update(verified_at: Time.zone.now - 1.day, success: false)
+
+    assert_equal @domain.notification_template, 'invalid_email'
+
+    assert_emails 0 do
+      visit edit_admin_domain_url(@domain)
+      find(:css, '#soft_delete').set(true)
+      click_link_or_button 'Force delete domain'
+    end
+
+    @domain.reload
+    assert_equal @domain.notification_template, @domain.template_name
   end
 
   def test_allows_to_skip_notifying_registrant_and_admin_contacts_by_email
@@ -87,10 +103,4 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
     assert_no_button 'Schedule force delete'
     assert_no_link 'Schedule force delete'
   end
-
-  private
-
-  def template_name
-    @domain.registrant.org? ? 'legal_person' : 'private_person'
-  end
 end