Clean up api/salmon controller (#3449)

app/controllers/api/salmon_controller.rb

@@ -5,10 +5,8 @@ class Api::SalmonController < ApiController
   respond_to :txt
 
   def update
-    payload = request.body.read
+    if verify_payload?
-
+      process_salmon
-    if !payload.nil? && verify?(payload)
-      SalmonWorker.perform_async(@account.id, payload.force_encoding('UTF-8'))
       head 201
     else
       head 202
@@ -21,7 +19,15 @@ class Api::SalmonController < ApiController
     @account = Account.find(params[:id])
   end
 
-  def verify?(payload)
+  def payload
-    VerifySalmonService.new.call(payload)
+    @_payload ||= request.body.read
+  end
+
+  def verify_payload?
+    payload.present? && VerifySalmonService.new.call(payload)
+  end
+
+  def process_salmon
+    SalmonWorker.perform_async(@account.id, payload.force_encoding('UTF-8'))
   end
 end

spec/controllers/api/salmon_controller_spec.rb

@@ -13,29 +13,42 @@ RSpec.describe Api::SalmonController, type: :controller do
   end
 
   describe 'POST #update' do
-    before do
+    context 'with valid post data' do
-      request.env['RAW_POST_DATA'] = File.read(File.join(Rails.root, 'spec', 'fixtures', 'salmon', 'mention.xml'))
+      before do
-      post :update, params: { id: account.id }
+        request.env['RAW_POST_DATA'] = File.read(File.join(Rails.root, 'spec', 'fixtures', 'salmon', 'mention.xml'))
+        post :update, params: { id: account.id }
+      end
+
+      it 'contains XML in the request body' do
+        expect(request.body.read).to be_a String
+      end
+
+      it 'returns http success' do
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'creates remote account' do
+        expect(Account.find_by(username: 'gargron', domain: 'quitter.no')).to_not be_nil
+      end
+
+      it 'creates status' do
+        expect(Status.find_by(uri: 'tag:quitter.no,2016-03-20:noticeId=1276923:objectType=note')).to_not be_nil
+      end
+
+      it 'creates mention for target account' do
+        expect(account.mentions.count).to eq 1
+      end
     end
 
-    it 'contains XML in the request body' do
+    context 'with invalid post data' do
-      expect(request.body.read).to be_a String
+      before do
-    end
+        request.env['RAW_POST_DATA'] = ''
+        post :update, params: { id: account.id }
+      end
 
-    it 'returns http success' do
+      it 'returns http success' do
-      expect(response).to have_http_status(:success)
+        expect(response).to have_http_status(202)
-    end
+      end
-
-    it 'creates remote account' do
-      expect(Account.find_by(username: 'gargron', domain: 'quitter.no')).to_not be_nil
-    end
-
-    it 'creates status' do
-      expect(Status.find_by(uri: 'tag:quitter.no,2016-03-20:noticeId=1276923:objectType=note')).to_not be_nil
-    end
-
-    it 'creates mention for target account' do
-      expect(account.mentions.count).to eq 1
     end
   end
 end