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

spec/controllers/user_avatars_controller_spec.rb

@@ -5,12 +5,19 @@ describe UserAvatarsController do
   context 'show_proxy_letter' do
     it 'returns not found if external avatar is set somewhere else' do
       SiteSetting.external_system_avatars_url = "https://somewhere.else.com/avatar.png"
-      response = get :show_proxy_letter, version: 'v2', letter: 'a', color: 'aaaaaa', size: 20
+
+      get :show_proxy_letter, params: {
+        version: 'v2', letter: 'a', color: 'aaaaaa', size: 20
+      }, format: :json
+
       expect(response.status).to eq(404)
     end
 
     it 'returns an avatar if we are allowing the proxy' do
-      response = get :show_proxy_letter, version: 'v2', letter: 'a', color: 'aaaaaa', size: 360
+      get :show_proxy_letter, params: {
+        version: 'v2', letter: 'a', color: 'aaaaaa', size: 360
+      }, format: :json
+
       expect(response.status).to eq(200)
     end
   end
@@ -30,23 +37,30 @@ describe UserAvatarsController do
       GlobalSetting.expects(:cdn_url).returns("http://awesome.com/boom")
 
       upload = Fabricate(:upload, url: "//test.s3.amazonaws.com/something")
+
       Fabricate(:optimized_image,
-                              sha1: SecureRandom.hex << "A" * 8,
-                              upload: upload,
-                              width: 98,
-                              height: 98,
-                              url: "//test.s3.amazonaws.com/something/else")
+        sha1: SecureRandom.hex << "A" * 8,
+        upload: upload,
+        width: 98,
+        height: 98,
+        url: "//test.s3.amazonaws.com/something/else"
+      )
 
       user = Fabricate(:user, uploaded_avatar_id: upload.id)
 
-      get :show, size: 97, username: user.username, version: upload.id, hostname: 'default'
+      get :show, params: {
+        size: 97, username: user.username, version: upload.id, hostname: 'default'
+      }, format: :json
 
       # 98 is closest which is 49 * 2 for retina
       expect(response).to redirect_to("http://awesome.com/boom/user_avatar/default/#{user.username_lower}/98/#{upload.id}_#{OptimizedImage::VERSION}.png")
 
-      get :show, size: 98, username: user.username, version: upload.id, hostname: 'default'
+      get :show, params: {
+        size: 98, username: user.username, version: upload.id, hostname: 'default'
+      }, format: :json
+
       expect(response.body).to eq("image")
-      expect(response.headers["Cache-Control"]).to eq('max-age=31557600, public, immutable')
+      expect(response.headers["Cache-Control"]).to eq('max-age=31556952, public, immutable')
     end
 
     it 'serves image even if size missing and its in local mode' do
@@ -55,7 +69,10 @@ describe UserAvatarsController do
       upload = Fabricate(:upload)
       user = Fabricate(:user, uploaded_avatar_id: upload.id)
 
-      get :show, size: 51, username: user.username, version: upload.id, hostname: 'default'
+      get :show, params: {
+        size: 51, username: user.username, version: upload.id, hostname: 'default'
+      }, format: :json
+
       expect(response).to be_success
     end
   end