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

spec/controllers/onebox_controller_spec.rb

@@ -5,7 +5,9 @@ describe OneboxController do
   let(:url) { "http://google.com" }
 
   it "requires the user to be logged in" do
-    expect { xhr :get, :show, url: url }.to raise_error(Discourse::NotLoggedIn)
+    expect do
+      get :show, params: { url: url }, format: :json
+    end.to raise_error(Discourse::NotLoggedIn)
   end
 
   describe "logged in" do
@@ -14,7 +16,7 @@ describe OneboxController do
 
     it 'invalidates the cache if refresh is passed' do
       Oneboxer.expects(:preview).with(url, invalidate_oneboxes: true)
-      xhr :get, :show, url: url, refresh: 'true', user_id: @user.id
+      get :show, params: { url: url, refresh: 'true', user_id: @user.id }, format: :json
     end
 
     describe "cached onebox" do
@@ -24,14 +26,11 @@ describe OneboxController do
       before do
         Oneboxer.expects(:cached_preview).with(url).returns(body)
         Oneboxer.expects(:preview).never
-        xhr :get, :show, url: url, user_id: @user.id
-      end
-
-      it "returns success" do
-        expect(response).to be_success
+        get :show, params: { url: url, user_id: @user.id }, format: :json
       end
 
       it "returns the cached onebox response in the body" do
+        expect(response).to be_success
         expect(response.body).to eq(body)
       end
 
@@ -41,7 +40,7 @@ describe OneboxController do
 
       it "returns 429" do
         Oneboxer.expects(:is_previewing?).returns(true)
-        xhr :get, :show, url: url, user_id: @user.id
+        get :show, params: { url: url, user_id: @user.id }, format: :json
         expect(response.status).to eq(429)
       end
 
@@ -53,14 +52,11 @@ describe OneboxController do
 
       before do
         Oneboxer.expects(:preview).with(url, invalidate_oneboxes: false).returns(body)
-        xhr :get, :show, url: url, user_id: @user.id
-      end
-
-      it 'returns success' do
-        expect(response).to be_success
+        get :show, params: { url: url, user_id: @user.id }, format: :json
       end
 
       it 'returns the onebox response in the body' do
+        expect(response).to be_success
         expect(response.body).to eq(body)
       end
 
@@ -70,13 +66,13 @@ describe OneboxController do
 
       it "returns 404 if the onebox is nil" do
         Oneboxer.expects(:preview).with(url, invalidate_oneboxes: false).returns(nil)
-        xhr :get, :show, url: url, user_id: @user.id
+        get :show, params: { url: url, user_id: @user.id }, format: :json
         expect(response.response_code).to eq(404)
       end
 
       it "returns 404 if the onebox is an empty string" do
         Oneboxer.expects(:preview).with(url, invalidate_oneboxes: false).returns(" \t ")
-        xhr :get, :show, url: url, user_id: @user.id
+        get :show, params: { url: url, user_id: @user.id }, format: :json
         expect(response.response_code).to eq(404)
       end