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

Replace additional_xml_elements with additional_data for relayables

Browse source
This commit is contained in:
Benjamin Neff 2017-04-25 01:12:57 +02:00
parent 78c7156e72
commit 5e3ea249a9
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/diaspora/federation/receive.rb
View file

@ -263,7 +263,7 @@ module Diaspora
private_class_method def self.build_signature(klass, entity)
klass.reflect_on_association(:signature).klass.new(
author_signature: entity.author_signature,
additional_data: entity.additional_xml_elements,
additional_data: entity.additional_data,
signature_order: SignatureOrder.find_or_create_by!(order: entity.xml_order.join(" "))
)
end

4
spec/helper_methods.rb
View file

@ -51,11 +51,11 @@ module HelperMethods
}.join(" ")
end
def build_relayable_federation_entity(type, data={}, additional_xml_elements={})
def build_relayable_federation_entity(type, data={}, additional_data={})
attributes = Fabricate.attributes_for("#{type}_entity".to_sym, data)
entity_class = "DiasporaFederation::Entities::#{type.capitalize}".constantize
signable_fields = attributes.keys - [:author_signature]
entity_class.new(attributes, [*signable_fields, *additional_xml_elements.keys], additional_xml_elements)
entity_class.new(attributes, [*signable_fields, *additional_data.keys], additional_data)
end
end

12
spec/lib/diaspora/federation/entities_spec.rb
View file

@ -19,7 +19,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.text).to eq(diaspora_entity.text)
expect(federation_entity.author_signature).to be_nil
expect(federation_entity.xml_order).to be_nil
expect(federation_entity.additional_xml_elements).to be_empty
expect(federation_entity.additional_data).to be_empty
end
it "builds a comment with signature" do
@ -33,7 +33,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.text).to eq(diaspora_entity.text)
expect(federation_entity.author_signature).to eq(diaspora_entity.signature.author_signature)
expect(federation_entity.xml_order).to eq(diaspora_entity.signature.signature_order.order.split)
expect(federation_entity.additional_xml_elements).to eq(diaspora_entity.signature.additional_data)
expect(federation_entity.additional_data).to eq(diaspora_entity.signature.additional_data)
end
it "builds a contact (request)" do
@ -86,7 +86,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.positive).to eq(diaspora_entity.positive)
expect(federation_entity.author_signature).to be_nil
expect(federation_entity.xml_order).to be_nil
expect(federation_entity.additional_xml_elements).to be_empty
expect(federation_entity.additional_data).to be_empty
end
it "builds a like with signature" do
@ -100,7 +100,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.positive).to eq(diaspora_entity.positive)
expect(federation_entity.author_signature).to eq(diaspora_entity.signature.author_signature)
expect(federation_entity.xml_order).to eq(diaspora_entity.signature.signature_order.order.split)
expect(federation_entity.additional_xml_elements).to eq(diaspora_entity.signature.additional_data)
expect(federation_entity.additional_data).to eq(diaspora_entity.signature.additional_data)
end
it "builds a message" do
@ -154,7 +154,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.poll_answer_guid).to eq(diaspora_entity.poll_answer.guid)
expect(federation_entity.author_signature).to be_nil
expect(federation_entity.xml_order).to be_nil
expect(federation_entity.additional_xml_elements).to be_empty
expect(federation_entity.additional_data).to be_empty
end
it "builds a poll participation with signature" do
@ -169,7 +169,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.poll_answer_guid).to eq(diaspora_entity.poll_answer.guid)
expect(federation_entity.author_signature).to eq(signature.author_signature)
expect(federation_entity.xml_order).to eq(signature.signature_order.order.split)
expect(federation_entity.additional_xml_elements).to eq(signature.additional_data)
expect(federation_entity.additional_data).to eq(signature.additional_data)
end
it "builds a profile" do