Refactor BadgeGranter.update_trust_level_badges! -> update_badges.

app/models/user.rb

@@ -447,7 +447,7 @@ class User < ActiveRecord::Base
     transaction do
       self.save!
       Group.user_trust_level_change!(self.id, self.trust_level)
-      BadgeGranter.update_trust_level_badges!(self)
+      BadgeGranter.update_badges(self, trust_level: trust_level)
     end
   end
 

app/services/badge_granter.rb

@@ -56,17 +56,20 @@ class BadgeGranter
     end
   end
 
-
+  def self.update_badges(user, opts={})
-  def self.update_trust_level_badges!(user)
+    if opts.has_key?(:trust_level)
-    Badge.trust_level_badge_ids.each do |badge_id|
+      # Update trust level badges.
-      user_badge = UserBadge.where(user_id: user.id, badge_id: badge_id).first
+      trust_level = opts[:trust_level]
-      if user_badge
+      Badge.trust_level_badge_ids.each do |badge_id|
-        # Revoke the badge if the user is not supposed to have it.
+        user_badge = UserBadge.find_by(user_id: user.id, badge_id: badge_id)
-        BadgeGranter.revoke(user_badge) if user.trust_level < badge_id
+        if user_badge
-      else
+          # Revoke the badge if trust level was lowered.
-        # Grant the badge if the user is supposed to have it.
+          BadgeGranter.revoke(user_badge) if trust_level < badge_id
-        badge = Badge.find(badge_id)
+        else
-        BadgeGranter.grant(badge, user) if user.trust_level >= badge_id
+          # Grant the badge if trust level was increased.
+          badge = Badge.find(badge_id)
+          BadgeGranter.grant(badge, user) if trust_level >= badge_id
+        end
       end
     end
   end

lib/boost_trust_level.rb

@@ -18,7 +18,7 @@ class BoostTrustLevel
                 @user.update_attributes!(trust_level: @level)
               end
     @logger.log_trust_level_change(@user, previous_level, @level)
-    BadgeGranter.update_trust_level_badges!(@user)
+    BadgeGranter.update_badges(@user, trust_level: @level)
     success
   end
 

spec/services/badge_granter_spec.rb

@@ -76,12 +76,12 @@ describe BadgeGranter do
     let(:logger) { StaffActionLogger.new(Fabricate(:admin)) }
 
     it "is called by User#change_trust_level!" do
-      BadgeGranter.expects(:update_trust_level_badges!)
+      BadgeGranter.expects(:update_badges)
       user.change_trust_level!(:basic)
     end
 
     it "is called by BoostTrustLevel#save!" do
-      BadgeGranter.expects(:update_trust_level_badges!)
+      BadgeGranter.expects(:update_badges)
       BoostTrustLevel.new(user: user, level: 1, logger: logger).save!
     end