From 7bf31995d3a36147d721ee46b24bf3c04321a489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Thu, 5 Nov 2020 15:51:20 +0200 Subject: [PATCH] Clean up --- app/models/concerns/domain/force_delete.rb | 2 +- app/models/mass_action.rb | 9 ++++++--- .../admin_area/mass_actions/mass_force_delete_test.rb | 4 ---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/models/concerns/domain/force_delete.rb b/app/models/concerns/domain/force_delete.rb index 05e1c5d5b..04689e01a 100644 --- a/app/models/concerns/domain/force_delete.rb +++ b/app/models/concerns/domain/force_delete.rb @@ -155,7 +155,7 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength end def notify_parties(reason) - ent = notification_template if reason == 'ENTITY_BURIED' + ent = notification_template if %w[ENTITY_BURIED EMAIL].include? reason ent ||= reason.downcase self.template_name = ent diff --git a/app/models/mass_action.rb b/app/models/mass_action.rb index 44e0dcc47..dbb6873c6 100644 --- a/app/models/mass_action.rb +++ b/app/models/mass_action.rb @@ -1,9 +1,12 @@ class MassAction def self.process(action_type, entries) - return false unless %w[force_delete].include?(action_type) - entries = CSV.read(entries, headers: true) - process_force_delete(entries) if action_type == force_delete + case action_type + when 'force_delete' + process_force_delete(entries) + else + false + end rescue StandardError false end diff --git a/test/system/admin_area/mass_actions/mass_force_delete_test.rb b/test/system/admin_area/mass_actions/mass_force_delete_test.rb index 57776e49f..d188b35fd 100644 --- a/test/system/admin_area/mass_actions/mass_force_delete_test.rb +++ b/test/system/admin_area/mass_actions/mass_force_delete_test.rb @@ -21,8 +21,4 @@ class AdminAreaMassActionsForceDeleteTest < ApplicationSystemTestCase click_link_or_button 'Start force delete process' assert_text 'Dataset integrity validation failed for force_delete' end - -def test_logs_failed_domains_to_response - -end end