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

spec/controllers/admin/badges_controller_spec.rb

@@ -8,7 +8,7 @@ describe Admin::BadgesController do
 
     context 'index' do
       it 'returns badge index' do
-        xhr :get, :index
+        get :index, format: :json
         expect(response).to be_success
       end
     end
@@ -16,13 +16,21 @@ describe Admin::BadgesController do
     context 'preview' do
       it 'allows preview enable_badge_sql is enabled' do
         SiteSetting.enable_badge_sql = true
-        result = xhr :get, :preview, sql: 'select id as user_id, created_at granted_at from users'
-        expect(JSON.parse(result.body)["grant_count"]).to be > 0
+
+        get :preview, params: {
+          sql: 'select id as user_id, created_at granted_at from users'
+        }, format: :json
+
+        expect(JSON.parse(response.body)["grant_count"]).to be > 0
       end
       it 'does not allow anything if enable_badge_sql is disabled' do
         SiteSetting.enable_badge_sql = false
-        result = xhr :get, :preview, sql: 'select id as user_id, created_at granted_at from users'
-        expect(result.status).to eq(403)
+
+        get :preview, params: {
+          sql: 'select id as user_id, created_at granted_at from users'
+        }, format: :json
+
+        expect(response.status).to eq(403)
       end
     end
 
@@ -31,9 +39,13 @@ describe Admin::BadgesController do
 
       it 'can create badges correctly' do
         SiteSetting.enable_badge_sql = true
-        result = xhr :post, :create, name: 'test', query: 'select 1 as user_id, null as granted_at', badge_type_id: 1
-        json = JSON.parse(result.body)
-        expect(result.status).to eq(200)
+
+        post :create, params: {
+          name: 'test', query: 'select 1 as user_id, null as granted_at', badge_type_id: 1
+        }, format: :json
+
+        json = JSON.parse(response.body)
+        expect(response.status).to eq(200)
         expect(json["badge"]["name"]).to eq('test')
         expect(json["badge"]["query"]).to eq('select 1 as user_id, null as granted_at')
       end
@@ -51,37 +63,33 @@ describe Admin::BadgesController do
         names = groupings.map { |g| g.name }
         ids = groupings.map { |g| g.id.to_s }
 
-        xhr :post, :save_badge_groupings, ids: ids, names: names
+        post :save_badge_groupings, params: { ids: ids, names: names }, format: :json
 
         groupings2 = BadgeGrouping.all.order(:position).to_a
 
         expect(groupings2.map { |g| g.name }).to eq(names)
         expect((groupings.map(&:id) - groupings2.map { |g| g.id }).compact).to be_blank
-
         expect(::JSON.parse(response.body)["badge_groupings"].length).to eq(groupings2.length)
       end
     end
 
     context '.badge_types' do
-      it 'returns success' do
-        xhr :get, :badge_types
-        expect(response).to be_success
-      end
-
       it 'returns JSON' do
-        xhr :get, :badge_types
+        get :badge_types, format: :json
+
+        expect(response).to be_success
         expect(::JSON.parse(response.body)["badge_types"]).to be_present
       end
     end
 
     context '.destroy' do
       it 'returns success' do
-        xhr :delete, :destroy, id: badge.id
+        delete :destroy, params: { id: badge.id }, format: :json
         expect(response).to be_success
       end
 
       it 'deletes the badge' do
-        xhr :delete, :destroy, id: badge.id
+        delete :destroy, params: { id: badge.id }, format: :json
         expect(Badge.where(id: badge.id).count).to eq(0)
       end
     end
@@ -92,9 +100,10 @@ describe Admin::BadgesController do
         editor_badge = Badge.find(Badge::Editor)
         editor_badge_name = editor_badge.name
 
-        xhr :put, :update,
-            id: editor_badge.id,
-            name: "123456"
+        put :update, params: {
+          id: editor_badge.id,
+          name: "123456"
+        }, format: :json
 
         expect(response).to be_success
         editor_badge.reload
@@ -107,14 +116,15 @@ describe Admin::BadgesController do
 
         SiteSetting.enable_badge_sql = false
 
-        xhr :put, :update,
-            id: badge.id,
-            name: "123456",
-            query: "select id user_id, created_at granted_at from users",
-            badge_type_id: badge.badge_type_id,
-            allow_title: false,
-            multiple_grant: false,
-            enabled: true
+        put :update, params: {
+          id: badge.id,
+          name: "123456",
+          query: "select id user_id, created_at granted_at from users",
+          badge_type_id: badge.badge_type_id,
+          allow_title: false,
+          multiple_grant: false,
+          enabled: true
+        }, format: :json
 
         expect(response).to be_success
         badge.reload
@@ -126,14 +136,15 @@ describe Admin::BadgesController do
         SiteSetting.enable_badge_sql = true
         sql = "select id user_id, created_at granted_at from users"
 
-        xhr :put, :update,
-            id: badge.id,
-            name: "123456",
-            query: sql,
-            badge_type_id: badge.badge_type_id,
-            allow_title: false,
-            multiple_grant: false,
-            enabled: true
+        put :update, params: {
+          id: badge.id,
+          name: "123456",
+          query: sql,
+          badge_type_id: badge.badge_type_id,
+          allow_title: false,
+          multiple_grant: false,
+          enabled: true
+        }, format: :json
 
         expect(response).to be_success
         badge.reload