nocebo/diaspora_federation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

return 202 after receive

Browse source
This commit is contained in:
Benjamin Neff 2015-12-30 03:45:18 +01:00
parent 55f3c2dce0
commit 127b603558
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/diaspora_federation/receive_controller.rb
View file

@ -16,7 +16,7 @@ module DiasporaFederation
DiasporaFederation.callbacks.trigger(:queue_public_receive, xml) DiasporaFederation.callbacks.trigger(:queue_public_receive, xml)
render nothing: true, status: :ok render nothing: true, status: 202
end end
# receives private messages for a user # receives private messages for a user
@ -29,7 +29,7 @@ module DiasporaFederation
success = DiasporaFederation.callbacks.trigger(:queue_private_receive, params[:guid], xml) success = DiasporaFederation.callbacks.trigger(:queue_private_receive, params[:guid], xml)
render nothing: true, status: success ? :ok : 404 render nothing: true, status: success ? 202 : 404
end end
private private

8
spec/controllers/diaspora_federation/receive_controller_spec.rb
View file

@ -8,12 +8,12 @@ module DiasporaFederation
expect(response.code).to eq("422") expect(response.code).to eq("422")
end end
it "returns a 200 if queued correctly" do it "returns a 202 if queued correctly" do
expect(DiasporaFederation.callbacks).to receive(:trigger) expect(DiasporaFederation.callbacks).to receive(:trigger)
.with(:queue_public_receive, "<diaspora/>") .with(:queue_public_receive, "<diaspora/>")
post :public, xml: "<diaspora/>" post :public, xml: "<diaspora/>"
expect(response.code).to eq("200") expect(response.code).to eq("202")
end end
it "unescapes the xml before sending it to the callback" do it "unescapes the xml before sending it to the callback" do
@ -39,13 +39,13 @@ module DiasporaFederation
expect(response.code).to eq("422") expect(response.code).to eq("422")
end end
it "returns a 200 if the callback returned true" do it "returns a 202 if the callback returned true" do
expect(DiasporaFederation.callbacks).to receive(:trigger) expect(DiasporaFederation.callbacks).to receive(:trigger)
.with(:queue_private_receive, "any-guid", "<diaspora/>") .with(:queue_private_receive, "any-guid", "<diaspora/>")
.and_return(true) .and_return(true)
post :private, guid: "any-guid", xml: "<diaspora/>" post :private, guid: "any-guid", xml: "<diaspora/>"
expect(response.code).to eq("200") expect(response.code).to eq("202")
end end
it "unescapes the xml before sending it to the callback" do it "unescapes the xml before sending it to the callback" do