From 3ab674552fc1ff041c0b39dd401b99d765b681f5 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Mon, 1 May 2017 21:38:55 +0200
Subject: [PATCH] Rename xml_order to signature_order

---
 lib/diaspora/federation/receive.rb            | 2 +-
 spec/lib/diaspora/federation/entities_spec.rb | 9 +++------
 spec/lib/diaspora/federation/receive_spec.rb  | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/diaspora/federation/receive.rb b/lib/diaspora/federation/receive.rb
index 6fd7f34bc..3a33a0d74 100644
--- a/lib/diaspora/federation/receive.rb
+++ b/lib/diaspora/federation/receive.rb
@@ -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
 
diff --git a/spec/lib/diaspora/federation/entities_spec.rb b/spec/lib/diaspora/federation/entities_spec.rb
index 5263ff599..c94f023e1 100644
--- a/spec/lib/diaspora/federation/entities_spec.rb
+++ b/spec/lib/diaspora/federation/entities_spec.rb
@@ -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
 
diff --git a/spec/lib/diaspora/federation/receive_spec.rb b/spec/lib/diaspora/federation/receive_spec.rb
index 1bff8ddad..06b3bef92 100644
--- a/spec/lib/diaspora/federation/receive_spec.rb
+++ b/spec/lib/diaspora/federation/receive_spec.rb
@@ -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 }