FIX: log name changes only when the name is actually updated

discourse · Nov 30, 2018 · 059e36a · 059e36a · coding-horror · Nov 30, 2018
1 parent fc0b7c9
commit 059e36a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/services/user_updater.rb b/app/services/user_updater.rb
@@ -123,9 +123,9 @@ def update(attributes = {})
         update_muted_users(attributes[:muted_usernames])
       end
 
+      name_changed = user.name_changed?
       if (saved = (!save_options || user.user_option.save) && user_profile.save && user.save) &&
-         (attributes[:name].present? && old_user_name.casecmp(attributes.fetch(:name)) != 0) ||
-         (attributes[:name].blank? && old_user_name.present?)
+         (name_changed && old_user_name.casecmp(attributes.fetch(:name)) != 0)
 
         StaffActionLogger.new(@actor).log_name_change(
           user.id,

diff --git a/spec/services/user_updater_spec.rb b/spec/services/user_updater_spec.rb
@@ -308,6 +308,10 @@
         UserUpdater.new(acting_user, user).update(name: 'JiM TOm')
       end.to_not change { UserHistory.count }
 
+      expect do
+        UserUpdater.new(acting_user, user).update(bio_raw: 'foo bar')
+      end.to_not change { UserHistory.count }
+
       expect do
         UserUpdater.new(acting_user, user_without_name).update(bio_raw: 'foo bar')
       end.to_not change { UserHistory.count }