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

Rename xml_order to signature_order

Browse source
This commit is contained in:
Benjamin Neff 2017-05-01 21:38:55 +02:00
parent 0f551c7b19
commit 3ab674552f
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -257,7 +257,7 @@ module Diaspora
klass.reflect_on_association(:signature).klass.new(
author_signature: entity.author_signature,
additional_data: entity.additional_data,
signature_order: SignatureOrder.find_or_create_by!(order: entity.xml_order.join(" "))
signature_order: SignatureOrder.find_or_create_by!(order: entity.signature_order.join(" "))
)
end

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

@ -18,7 +18,6 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.parent_guid).to eq(diaspora_entity.post.guid)
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_data).to be_empty
end
@ -32,7 +31,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.parent_guid).to eq(diaspora_entity.post.guid)
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.signature_order.map(&:to_s)).to eq(diaspora_entity.signature.signature_order.order.split)
expect(federation_entity.additional_data).to eq(diaspora_entity.signature.additional_data)
end
@ -87,7 +86,6 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.parent_guid).to eq(diaspora_entity.target.guid)
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_data).to be_empty
end
@ -101,7 +99,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.parent_guid).to eq(diaspora_entity.target.guid)
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.signature_order.map(&:to_s)).to eq(diaspora_entity.signature.signature_order.order.split)
expect(federation_entity.additional_data).to eq(diaspora_entity.signature.additional_data)
end
@ -154,7 +152,6 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.parent_guid).to eq(diaspora_entity.poll_answer.poll.guid)
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_data).to be_empty
end
@ -169,7 +166,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.parent_guid).to eq(diaspora_entity.poll_answer.poll.guid)
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.signature_order.map(&:to_s)).to eq(signature.signature_order.order.split)
expect(federation_entity.additional_data).to eq(signature.additional_data)
end

2
spec/lib/diaspora/federation/receive_spec.rb
View file

@ -55,7 +55,7 @@ describe Diaspora::Federation::Receive do
expect(comment.signature).not_to be_nil
expect(comment.signature.author_signature).to eq("aa")
expect(comment.signature.additional_data).to eq("new_property" => "data")
expect(comment.signature.order).to eq(comment_entity.xml_order.map(&:to_s))
expect(comment.signature.order).to eq(comment_entity.signature_order.map(&:to_s))
end
let(:entity) { comment_entity }