Fix all the errors to get our tests green on Rails 5.1.

spec/controllers/user_badges_controller_spec.rb

@@ -10,7 +10,7 @@ describe UserBadgesController do
       p = create_post
       UserBadge.create(badge: badge, user: user, post_id: p.id, granted_by_id: -1, granted_at: Time.now)
 
-      xhr :get, :index, badge_id: badge.id
+      get :index, params: { badge_id: badge.id }, format: :json
       expect(response.status).to eq(200)
 
       parsed = JSON.parse(response.body)
@@ -24,11 +24,13 @@ describe UserBadgesController do
     let!(:user_badge) { UserBadge.create(badge: badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now) }
 
     it 'requires username or badge_id to be specified' do
-      expect { xhr :get, :index }.to raise_error(ActionController::ParameterMissing)
+      expect do
+        get :index, format: :json
+      end.to raise_error(ActionController::ParameterMissing)
     end
 
     it 'returns user_badges for a user' do
-      xhr :get, :username, username: user.username
+      get :username, params: { username: user.username }, format: :json
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -36,7 +38,7 @@ describe UserBadgesController do
     end
 
     it 'returns user_badges for a badge' do
-      xhr :get, :index, badge_id: badge.id
+      get :index, params: { badge_id: badge.id }, format: :json
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -44,7 +46,9 @@ describe UserBadgesController do
     end
 
     it 'includes counts when passed the aggregate argument' do
-      xhr :get, :username, username: user.username, grouped: true
+      get :username, params: {
+        username: user.username, grouped: true
+      }, format: :json
 
       expect(response.status).to eq(200)
       parsed = JSON.parse(response.body)
@@ -54,26 +58,34 @@ describe UserBadgesController do
 
   context 'create' do
     it 'requires username to be specified' do
-      expect { xhr :post, :create, badge_id: badge.id }.to raise_error(ActionController::ParameterMissing)
+      expect do
+        post :create, params: { badge_id: badge.id }, format: :json
+      end.to raise_error(ActionController::ParameterMissing)
     end
 
     it 'does not allow regular users to grant badges' do
       log_in_user Fabricate(:user)
-      xhr :post, :create, badge_id: badge.id, username: user.username
+
+      post :create, params: {
+        badge_id: badge.id, username: user.username
+      }, format: :json
+
       expect(response.status).to eq(403)
     end
 
     it 'grants badges from staff' do
       admin = Fabricate(:admin)
-      post = create_post
+      post_1 = create_post
 
       log_in_user admin
 
       StaffActionLogger.any_instance.expects(:log_badge_grant).once
 
-      xhr :post, :create, badge_id: badge.id,
-                          username: user.username,
-                          reason: Discourse.base_url + post.url
+      post :create, params: {
+        badge_id: badge.id,
+        username: user.username,
+        reason: Discourse.base_url + post_1.url
+      }, format: :json
 
       expect(response.status).to eq(200)
 
@@ -81,19 +93,27 @@ describe UserBadgesController do
 
       expect(user_badge).to be_present
       expect(user_badge.granted_by).to eq(admin)
-      expect(user_badge.post_id).to eq(post.id)
+      expect(user_badge.post_id).to eq(post_1.id)
     end
 
     it 'does not grant badges from regular api calls' do
       Fabricate(:api_key, user: user)
-      xhr :post, :create, badge_id: badge.id, username: user.username, api_key: user.api_key.key
+
+      post :create, params: {
+        badge_id: badge.id, username: user.username, api_key: user.api_key.key
+      }, format: :json
+
       expect(response.status).to eq(403)
     end
 
     it 'grants badges from master api calls' do
       api_key = Fabricate(:api_key)
       StaffActionLogger.any_instance.expects(:log_badge_grant).never
-      xhr :post, :create, badge_id: badge.id, username: user.username, api_key: api_key.key, api_username: "system"
+
+      post :create, params: {
+        badge_id: badge.id, username: user.username, api_key: api_key.key, api_username: "system"
+      }, format: :json
+
       expect(response.status).to eq(200)
       user_badge = UserBadge.find_by(user: user, badge: badge)
       expect(user_badge).to be_present
@@ -105,7 +125,9 @@ describe UserBadgesController do
       user
 
       event = DiscourseEvent.track_events do
-        xhr :post, :create, badge_id: badge.id, username: user.username
+        post :create, params: {
+          badge_id: badge.id, username: user.username
+        }, format: :json
       end.first
 
       expect(event[:event_name]).to eq(:user_badge_granted)
@@ -116,14 +138,14 @@ describe UserBadgesController do
     let!(:user_badge) { UserBadge.create(badge: badge, user: user, granted_by: Discourse.system_user, granted_at: Time.now) }
 
     it 'checks that the user is authorized to revoke a badge' do
-      xhr :delete, :destroy, id: user_badge.id
+      delete :destroy, params: { id: user_badge.id }, format: :json
       expect(response.status).to eq(403)
     end
 
     it 'revokes the badge' do
       log_in :admin
       StaffActionLogger.any_instance.expects(:log_badge_revoke).once
-      xhr :delete, :destroy, id: user_badge.id
+      delete :destroy, params: { id: user_badge.id }, format: :json
       expect(response.status).to eq(200)
       expect(UserBadge.find_by(id: user_badge.id)).to eq(nil)
     end
@@ -132,7 +154,7 @@ describe UserBadgesController do
       log_in :admin
 
       event = DiscourseEvent.track_events do
-        xhr :delete, :destroy, id: user_badge.id
+        delete :destroy, params: { id: user_badge.id }, format: :json
       end.first
 
       expect(event[:event_name]).to eq(:user_badge_removed)