mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Only log admin actions when change actually happened
This commit is contained in:
parent
71918091e6
commit
1a66aaaeb6
2 changed files with 20 additions and 4 deletions
|
@ -4,6 +4,8 @@ module AccountableConcern
|
||||||
extend ActiveSupport::Concern
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
def log_action(action, target)
|
def log_action(action, target)
|
||||||
|
return unless target.previous_changes.any?
|
||||||
|
|
||||||
Admin::ActionLog.create(
|
Admin::ActionLog.create(
|
||||||
account: current_account,
|
account: current_account,
|
||||||
action: action,
|
action: action,
|
||||||
|
|
|
@ -19,10 +19,24 @@ RSpec.describe AccountableConcern do
|
||||||
let(:hoge) { hoge_class.new(user) }
|
let(:hoge) { hoge_class.new(user) }
|
||||||
|
|
||||||
describe '#log_action' do
|
describe '#log_action' do
|
||||||
it 'creates Admin::ActionLog' do
|
subject { hoge.log_action(:create, target) }
|
||||||
expect do
|
|
||||||
hoge.log_action(:create, target)
|
before { target.reload } # Ensure changes from creation cleared
|
||||||
end.to change(Admin::ActionLog, :count).by(1)
|
|
||||||
|
context 'when target has changed' do
|
||||||
|
before { target.update!(username: 'new_value') }
|
||||||
|
|
||||||
|
it 'creates Admin::ActionLog' do
|
||||||
|
expect { subject }
|
||||||
|
.to change(Admin::ActionLog, :count).by(1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when target has not changed' do
|
||||||
|
it 'does not create Admin::ActionLog' do
|
||||||
|
expect { subject }
|
||||||
|
.to_not change(Admin::ActionLog, :count)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue