From 4e735e8aabe2bd103d1d1d7fafe1a84cba058d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 27 Nov 2014 01:12:23 +0100 Subject: [PATCH] FIX: roll up staff action wasn't working --- app/services/staff_action_logger.rb | 4 ++-- spec/services/staff_action_logger_spec.rb | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/services/staff_action_logger.rb b/app/services/staff_action_logger.rb index 7e0ca21daec..75fb96efa2a 100644 --- a/app/services/staff_action_logger.rb +++ b/app/services/staff_action_logger.rb @@ -165,9 +165,9 @@ class StaffActionLogger })) end - def log_roll_up(subnets) + def log_roll_up(subnets, opts={}) UserHistory.create(params(opts).merge({ - action: UserHistory.action[:roll_up], + action: UserHistory.actions[:roll_up], details: subnets.join(", ") })) end diff --git a/spec/services/staff_action_logger_spec.rb b/spec/services/staff_action_logger_spec.rb index 937e5954499..be31523615e 100644 --- a/spec/services/staff_action_logger_spec.rb +++ b/spec/services/staff_action_logger_spec.rb @@ -220,4 +220,15 @@ describe StaffActionLogger do log_record.details.should == badge.name end end + + describe 'log_roll_up' do + let(:subnets) { ["1.2.3.0/24", "42.42.42.0/24"] } + subject(:log_roll_up) { described_class.new(admin).log_roll_up(subnets) } + + it 'creates a new UserHistory record' do + log_record = logger.log_roll_up(subnets) + log_record.should be_valid + log_record.details.should == subnets.join(", ") + end + end end