diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 3a5005d32..fe183f15f 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -71,7 +71,7 @@ module Admin DomainDeleteForcedEmailJob.enqueue(@domain.id, params[:template_name]) end - redirect_to edit_admin_domain_path(@domain), notice: t('.scheduled') + redirect_to edit_admin_domain_url(@domain), notice: t('.scheduled') end def cancel_force_delete @@ -81,7 +81,7 @@ module Admin flash.now[:alert] = I18n.t('failed_to_update_domain') end - redirect_to edit_admin_domain_path(@domain) + redirect_to edit_admin_domain_url(@domain) end def versions diff --git a/test/integration/admin/domains/force_delete_test.rb b/test/integration/admin/domains/force_delete_test.rb index 179acd3cb..150b98d1c 100644 --- a/test/integration/admin/domains/force_delete_test.rb +++ b/test/integration/admin/domains/force_delete_test.rb @@ -16,6 +16,7 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest assert @domain.force_delete_scheduled? assert_equal 1, ActionMailer::Base.deliveries.size + assert_current_path edit_admin_domain_path(@domain) assert_text 'Force delete procedure has been scheduled' end @@ -28,6 +29,7 @@ class AdminAreaDomainForceDeleteTest < ActionDispatch::IntegrationTest @domain.reload refute @domain.force_delete_scheduled? + assert_current_path edit_admin_domain_path(@domain) assert_text 'Force delete procedure has been cancelled' end end