Merge branch 'registry-791' into registry-790

# Conflicts:
#	app/views/admin/domains/edit.html.erb
#	config/locales/admin/domains.en.yml

test/models/domain/force_delete_test.rb

@@ -73,16 +73,8 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
     assert @domain.force_delete_scheduled?
   end
 
-  def test_cancelling_force_delete_on_a_discarded_domain
+  def test_force_delete_cannot_be_cancelled_when_a_domain_is_discarded
     @domain.discard
-    @domain.schedule_force_delete
-    @domain.cancel_force_delete
-    @domain.reload
-    assert_not @domain.force_delete_scheduled?
-    assert_nil @domain.force_delete_at
-  end
-
-  def test_cancelling_force_delete_requires_a_domain_to_be_discarded
     @domain.schedule_force_delete
     assert_raises StandardError do
       @domain.cancel_force_delete
@@ -91,7 +83,6 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
 
   def test_cancelling_force_delete_bypasses_validation
     @domain = domains(:invalid)
-    @domain.discard
     @domain.schedule_force_delete
     @domain.cancel_force_delete
     assert_not @domain.force_delete_scheduled?
@@ -106,7 +97,6 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
       DomainStatus::PENDING_DELETE,
       DomainStatus::SERVER_MANUAL_INZONE
     ]
-    @domain.discard
     @domain.statuses = @domain.statuses + statuses
     @domain.schedule_force_delete
 
@@ -117,7 +107,6 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
   end
 
   def test_cancelling_force_delete_restores_statuses_that_a_domain_had_before_force_delete
-    @domain.discard
     @domain.statuses_before_force_delete = ['test1', DomainStatus::DELETE_CANDIDATE]
 
     @domain.cancel_force_delete

test/system/admin_area/domains/force_delete_test.rb

@@ -44,7 +44,6 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
   end
 
   def test_cancels_scheduled_domain_force_delete
-    @domain.discard
     @domain.schedule_force_delete
 
     visit edit_admin_domain_url(@domain)
@@ -55,4 +54,13 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
     assert_current_path edit_admin_domain_path(@domain)
     assert_text 'Force delete procedure has been cancelled'
   end
-end
+
+  def test_force_delete_cannot_be_cancelled_when_a_domain_is_discarded
+    @domain.discard
+    @domain.schedule_force_delete
+
+    visit edit_admin_domain_url(@domain)
+    assert_no_button 'Cancel force delete'
+    assert_no_link 'Cancel force delete'
+  end
+end