Merge branch 'master' into registry-790

# Conflicts:
#	test/models/domain/force_delete_test.rb
#	test/system/admin_area/domains/force_delete_test.rb

app/models/concerns/domain/force_delete.rb

@@ -6,6 +6,10 @@ module Concerns::Domain::ForceDelete
   end
 
   def schedule_force_delete
+    if discarded?
+      raise StandardError, 'Force delete procedure cannot be scheduled while a domain is discarded'
+    end
+
     preserve_current_statuses_for_force_delete
     add_force_delete_statuses
     self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc
@@ -16,10 +20,6 @@ module Concerns::Domain::ForceDelete
   end
 
   def cancel_force_delete
-    if discarded?
-      raise StandardError, 'Force delete procedure cannot be cancelled while a domain is discarded'
-    end
-
     restore_statuses_before_force_delete
     remove_force_delete_statuses
     self.force_delete_at = nil

app/presenters/domain_presenter.rb

@@ -50,25 +50,12 @@ class DomainPresenter
   end
 
   def force_delete_toggle_btn
-    if !domain.force_delete_scheduled?
+    return inactive_schedule_force_delete_btn if domain.discarded?
-      view.content_tag(:a, view.t('admin.domains.force_delete_toggle_btn.schedule'),
+
-                       class: 'btn btn-default',
+    if domain.force_delete_scheduled?
-                       data: {
+      cancel_force_delete_btn
-                         toggle: 'modal',
-                         target: '.domain-edit-force-delete-dialog',
-                       }
-      )
-    elsif !domain.discarded?
-      view.link_to(view.t('admin.domains.force_delete_toggle_btn.cancel'),
-                   view.admin_domain_force_delete_path(domain),
-                   method: :delete,
-                   data: { confirm: view.t('admin.domains.force_delete_toggle_btn.cancel_confirm') },
-                   class: 'btn btn-primary')
     else
-      view.content_tag(:button, view.t('admin.domains.force_delete_toggle_btn.cancel'),
+      schedule_force_delete_btn
-                       class: 'btn btn-default ',
-                       title: view.t('admin.domains.force_delete_toggle_btn.unable_to_cancel'),
-                       disabled: true)
     end
   end
 
@@ -83,6 +70,32 @@ class DomainPresenter
 
   private
 
+  def schedule_force_delete_btn
+    view.content_tag(:a, view.t('admin.domains.force_delete_toggle_btn.schedule'),
+                     class: 'btn btn-default',
+                     data: {
+                         toggle: 'modal',
+                         target: '.domain-edit-force-delete-dialog',
+                     })
+  end
+
+  def cancel_force_delete_btn
+    view.link_to view.t('admin.domains.force_delete_toggle_btn.cancel'),
+                 view.admin_domain_force_delete_path(domain),
+                 method: :delete,
+                 data: {
+                     confirm: view.t('admin.domains.force_delete_toggle_btn.cancel_confirm'),
+                 },
+                 class: 'btn btn-primary'
+  end
+
+  def inactive_schedule_force_delete_btn
+    view.content_tag :button, view.t('admin.domains.force_delete_toggle_btn.schedule'),
+                     title: view.t('admin.domains.force_delete_toggle_btn.unable_to_schedule'),
+                     disabled: true,
+                     class: 'btn btn-default'
+  end
+
   attr_reader :domain
   attr_reader :view
 end

config/locales/admin/domains.en.yml

@@ -50,7 +50,7 @@ en:
 
       force_delete_toggle_btn:
         schedule: Schedule force delete
+        unable_to_schedule: >
+          Force delete procedure cannot be scheduled while a domain has deleteCandidate status
         cancel: Cancel force delete
-        cancel_confirm: Are you sure you want cancel force delete procedure?
+        cancel_confirm: Are you sure you want cancel force delete procedure?
-        unable_to_cancel: >
-          Force delete procedure cannot be cancelled while a domain has deleteCandidate status

test/models/domain/force_delete_test.rb

@@ -73,12 +73,10 @@ class DomainForceDeleteTest < ActiveSupport::TestCase
     assert @domain.force_delete_scheduled?
   end
 
-  def test_force_delete_cannot_be_cancelled_when_a_domain_is_discarded
+  def test_force_delete_cannot_be_scheduled_when_a_domain_is_discarded
-    @domain.delete_at = Time.zone.parse('2010-07-05 10:00')
     @domain.discard
-    @domain.schedule_force_delete
     assert_raises StandardError do
-      @domain.cancel_force_delete
+      @domain.schedule_force_delete
     end
   end
 

test/system/admin_area/domains/force_delete_test.rb

@@ -55,13 +55,11 @@ class AdminAreaDomainForceDeleteTest < ApplicationSystemTestCase
     assert_text 'Force delete procedure has been cancelled'
   end
 
-  def test_force_delete_cannot_be_cancelled_when_a_domain_is_discarded
+  def test_force_delete_procedure_cannot_be_scheduled_on_a_discarded_domain
-    @domain.delete_at = Time.zone.parse('2010-07-05 10:00')
     @domain.discard
-    @domain.schedule_force_delete
 
     visit edit_admin_domain_url(@domain)
-    assert_no_button 'Cancel force delete'
+    assert_no_button 'Schedule force delete'
-    assert_no_link 'Cancel force delete'
+    assert_no_link 'Schedule force delete'
   end
 end