From b2e2a99898796d5a66283b38f9f05b0d918eaa9c Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 15 Dec 2014 14:14:12 -0500 Subject: [PATCH] FIX: Don't raise an error when trying to log nothing --- app/services/staff_action_logger.rb | 2 ++ spec/services/staff_action_logger_spec.rb | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index 75fb96efa2a..9dbe38e17c2 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -144,6 +144,8 @@ class StaffActionLogger end def log_show_emails(users) + return if users.blank? + values = [] users.each do |user| diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb index be31523615e..83bbae7e4f5 100644 --- a/spec/services/staff_action_logger_spec.rb +++ b/spec/services/staff_action_logger_spec.rb @@ -33,6 +33,20 @@ describe StaffActionLogger do end end + describe "log_show_emails" do + it "logs the user history" do + -> { logger.log_show_emails([admin]) }.should change(UserHistory, :count).by(1) + end + + it "doesn't raise an exception with nothing to log" do + -> { logger.log_show_emails([]) }.should_not raise_error + end + + it "doesn't raise an exception with nil input" do + -> { logger.log_show_emails(nil) }.should_not raise_error + end + end + describe 'log_post_deletion' do let(:deleted_post) { Fabricate(:post) }